Mailing List Archive

[xen staging] serial: drop serial_[rt]x_interrupt()'s regs parameter
commit b31e753fe799b226b5e9d500f96588a8657d4a66
Author: Jan Beulich <jbeulich@suse.com>
AuthorDate: Thu Feb 22 12:14:19 2024 +0100
Commit: Jan Beulich <jbeulich@suse.com>
CommitDate: Thu Feb 22 12:14:19 2024 +0100

serial: drop serial_[rt]x_interrupt()'s regs parameter

They're simply not needed anymore.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
Acked-by: Julien Grall <jgrall@amazon.com>
---
xen/drivers/char/cadence-uart.c | 2 +-
xen/drivers/char/ehci-dbgp.c | 4 ++--
xen/drivers/char/exynos4210-uart.c | 4 ++--
xen/drivers/char/imx-lpuart.c | 4 ++--
xen/drivers/char/meson-uart.c | 4 ++--
xen/drivers/char/mvebu-uart.c | 4 ++--
xen/drivers/char/ns16550.c | 8 ++++----
xen/drivers/char/omap-uart.c | 4 ++--
xen/drivers/char/pl011.c | 4 ++--
xen/drivers/char/scif-uart.c | 4 ++--
xen/drivers/char/serial.c | 4 ++--
xen/drivers/char/xhci-dbc.c | 5 +++--
xen/include/xen/serial.h | 6 ++----
13 files changed, 28 insertions(+), 29 deletions(-)

diff --git a/xen/drivers/char/cadence-uart.c b/xen/drivers/char/cadence-uart.c
index c38d7ed143..0b670c64ed 100644
--- a/xen/drivers/char/cadence-uart.c
+++ b/xen/drivers/char/cadence-uart.c
@@ -51,7 +51,7 @@ static void cuart_interrupt(int irq, void *data, struct cpu_user_regs *regs)
/* ACK. */
if ( status & UART_SR_INTR_RTRIG )
{
- serial_rx_interrupt(port, regs);
+ serial_rx_interrupt(port);
cuart_write(uart, R_UART_CISR, UART_SR_INTR_RTRIG);
}
} while ( status & UART_SR_INTR_RTRIG );
diff --git a/xen/drivers/char/ehci-dbgp.c b/xen/drivers/char/ehci-dbgp.c
index 1497fe7c84..2bb55418a7 100644
--- a/xen/drivers/char/ehci-dbgp.c
+++ b/xen/drivers/char/ehci-dbgp.c
@@ -1273,10 +1273,10 @@ static void cf_check _ehci_dbgp_poll(struct cpu_user_regs *regs)
old_regs = set_irq_regs(regs);

if ( dbgp->in.chunk )
- serial_rx_interrupt(port, regs);
+ serial_rx_interrupt(port);

if ( empty )
- serial_tx_interrupt(port, regs);
+ serial_tx_interrupt(port);

set_irq_regs(old_regs);

diff --git a/xen/drivers/char/exynos4210-uart.c b/xen/drivers/char/exynos4210-uart.c
index 2503392ccd..5c53860df6 100644
--- a/xen/drivers/char/exynos4210-uart.c
+++ b/xen/drivers/char/exynos4210-uart.c
@@ -81,7 +81,7 @@ static void exynos4210_uart_interrupt(int irq, void *data, struct cpu_user_regs
if ( status & (UINTM_RXD | UINTM_ERROR) )
{
/* uart->regs[UINTM] |= RXD|ERROR; */
- serial_rx_interrupt(port, regs);
+ serial_rx_interrupt(port);
/* uart->regs[UINTM] &= ~(RXD|ERROR); */
exynos4210_write(uart, UINTP, UINTM_RXD | UINTM_ERROR);
}
@@ -89,7 +89,7 @@ static void exynos4210_uart_interrupt(int irq, void *data, struct cpu_user_regs
if ( status & (UINTM_TXD | UINTM_MODEM) )
{
/* uart->regs[UINTM] |= TXD|MODEM; */
- serial_tx_interrupt(port, regs);
+ serial_tx_interrupt(port);
/* uart->regs[UINTM] &= ~(TXD|MODEM); */
exynos4210_write(uart, UINTP, UINTM_TXD | UINTM_MODEM);
}
diff --git a/xen/drivers/char/imx-lpuart.c b/xen/drivers/char/imx-lpuart.c
index 77f70c2719..f5b341e20b 100644
--- a/xen/drivers/char/imx-lpuart.c
+++ b/xen/drivers/char/imx-lpuart.c
@@ -48,10 +48,10 @@ static void imx_lpuart_interrupt(int irq, void *data,
rxcnt = imx_lpuart_read(uart, UARTWATER) >> UARTWATER_RXCNT_OFF;

if ( (sts & UARTSTAT_RDRF) || (rxcnt > 0) )
- serial_rx_interrupt(port, regs);
+ serial_rx_interrupt(port);

if ( sts & UARTSTAT_TDRE )
- serial_tx_interrupt(port, regs);
+ serial_tx_interrupt(port);

imx_lpuart_write(uart, UARTSTAT, sts);
}
diff --git a/xen/drivers/char/meson-uart.c b/xen/drivers/char/meson-uart.c
index c627328122..640c29dd05 100644
--- a/xen/drivers/char/meson-uart.c
+++ b/xen/drivers/char/meson-uart.c
@@ -69,10 +69,10 @@ static void meson_uart_interrupt(int irq, void *data,
uint32_t st = readl(uart->regs + AML_UART_STATUS_REG);

if ( !(st & AML_UART_RX_FIFO_EMPTY) )
- serial_rx_interrupt(port, regs);
+ serial_rx_interrupt(port);

if ( !(st & AML_UART_TX_FIFO_FULL) )
- serial_tx_interrupt(port, regs);
+ serial_tx_interrupt(port);
}

static void __init meson_uart_init_preirq(struct serial_port *port)
diff --git a/xen/drivers/char/mvebu-uart.c b/xen/drivers/char/mvebu-uart.c
index cc55173513..57c1259224 100644
--- a/xen/drivers/char/mvebu-uart.c
+++ b/xen/drivers/char/mvebu-uart.c
@@ -76,10 +76,10 @@ static void mvebu3700_uart_interrupt(int irq, void *data,

if ( st & (STATUS_RX_RDY | STATUS_OVR_ERR | STATUS_FRM_ERR |
STATUS_BRK_DET) )
- serial_rx_interrupt(port, regs);
+ serial_rx_interrupt(port);

if ( st & STATUS_TX_RDY )
- serial_tx_interrupt(port, regs);
+ serial_tx_interrupt(port);
}

static void __init mvebu3700_uart_init_preirq(struct serial_port *port)
diff --git a/xen/drivers/char/ns16550.c b/xen/drivers/char/ns16550.c
index 664d490571..91f0624d74 100644
--- a/xen/drivers/char/ns16550.c
+++ b/xen/drivers/char/ns16550.c
@@ -188,9 +188,9 @@ static void cf_check ns16550_interrupt(
u8 lsr = ns_read_reg(uart, UART_LSR);

if ( (lsr & uart->lsr_mask) == uart->lsr_mask )
- serial_tx_interrupt(port, regs);
+ serial_tx_interrupt(port);
if ( lsr & UART_LSR_DR )
- serial_rx_interrupt(port, regs);
+ serial_rx_interrupt(port);

/* A "busy-detect" condition is observed on Allwinner/sunxi UART
* after LCR is written during setup. It needs to be cleared at
@@ -224,11 +224,11 @@ static void cf_check __ns16550_poll(struct cpu_user_regs *regs)
if ( ns16550_ioport_invalid(uart) )
goto out;

- serial_rx_interrupt(port, regs);
+ serial_rx_interrupt(port);
}

if ( ( ns_read_reg(uart, UART_LSR) & uart->lsr_mask ) == uart->lsr_mask )
- serial_tx_interrupt(port, regs);
+ serial_tx_interrupt(port);

out:
set_irq_regs(old_regs);
diff --git a/xen/drivers/char/omap-uart.c b/xen/drivers/char/omap-uart.c
index 8e643cb039..fb842b1707 100644
--- a/xen/drivers/char/omap-uart.c
+++ b/xen/drivers/char/omap-uart.c
@@ -70,9 +70,9 @@ static void omap_uart_interrupt(int irq, void *data, struct cpu_user_regs *regs)
{
lsr = omap_read(uart, UART_LSR) & 0xff;
if ( lsr & UART_LSR_THRE )
- serial_tx_interrupt(port, regs);
+ serial_tx_interrupt(port);
if ( lsr & UART_LSR_DR )
- serial_rx_interrupt(port, regs);
+ serial_rx_interrupt(port);

if ( port->txbufc == port->txbufp ) {
reg = omap_read(uart, UART_IER);
diff --git a/xen/drivers/char/pl011.c b/xen/drivers/char/pl011.c
index 513b373b2e..cb7c4affa5 100644
--- a/xen/drivers/char/pl011.c
+++ b/xen/drivers/char/pl011.c
@@ -95,7 +95,7 @@ static void pl011_interrupt(int irq, void *data, struct cpu_user_regs *regs)
pl011_write(uart, ICR, status & ~(TXI|RTI|RXI));

if ( status & (RTI|RXI) )
- serial_rx_interrupt(port, regs);
+ serial_rx_interrupt(port);

/* TODO
if ( status & (DSRMI|DCDMI|CTSMI|RIMI) )
@@ -103,7 +103,7 @@ static void pl011_interrupt(int irq, void *data, struct cpu_user_regs *regs)
*/

if ( status & (TXI) )
- serial_tx_interrupt(port, regs);
+ serial_tx_interrupt(port);

status = pl011_intr_status(uart);
} while (status != 0);
diff --git a/xen/drivers/char/scif-uart.c b/xen/drivers/char/scif-uart.c
index 1b28ba90e9..d5de8931b2 100644
--- a/xen/drivers/char/scif-uart.c
+++ b/xen/drivers/char/scif-uart.c
@@ -119,11 +119,11 @@ static void scif_uart_interrupt(int irq, void *data, struct cpu_user_regs *regs)
{
/* TX Interrupt */
if ( status & SCFSR_TDFE )
- serial_tx_interrupt(port, regs);
+ serial_tx_interrupt(port);

/* RX Interrupt */
if ( status & (SCFSR_RDF | SCFSR_DR) )
- serial_rx_interrupt(port, regs);
+ serial_rx_interrupt(port);

/* Error Interrupt */
if ( status & params->error_mask )
diff --git a/xen/drivers/char/serial.c b/xen/drivers/char/serial.c
index 0b30326843..f28d8557c0 100644
--- a/xen/drivers/char/serial.c
+++ b/xen/drivers/char/serial.c
@@ -45,7 +45,7 @@ static inline void serial_stop_tx(struct serial_port *port)
port->driver->stop_tx(port);
}

-void serial_rx_interrupt(struct serial_port *port, struct cpu_user_regs *regs)
+void serial_rx_interrupt(struct serial_port *port)
{
char c;
serial_rx_fn fn = NULL;
@@ -71,7 +71,7 @@ void serial_rx_interrupt(struct serial_port *port, struct cpu_user_regs *regs)
fn(c & 0x7f);
}

-void serial_tx_interrupt(struct serial_port *port, struct cpu_user_regs *regs)
+void serial_tx_interrupt(struct serial_port *port)
{
int i, n;
unsigned long flags;
diff --git a/xen/drivers/char/xhci-dbc.c b/xen/drivers/char/xhci-dbc.c
index 60b781f872..3bf389be7d 100644
--- a/xen/drivers/char/xhci-dbc.c
+++ b/xen/drivers/char/xhci-dbc.c
@@ -1176,9 +1176,10 @@ static void cf_check dbc_uart_poll(void *data)
}

while ( dbc_work_ring_size(&dbc->dbc_iwork) )
- serial_rx_interrupt(port, guest_cpu_user_regs());
+ serial_rx_interrupt(port);
+
+ serial_tx_interrupt(port);

- serial_tx_interrupt(port, guest_cpu_user_regs());
set_timer(&uart->timer, NOW() + MICROSECS(DBC_POLL_INTERVAL));
}

diff --git a/xen/include/xen/serial.h b/xen/include/xen/serial.h
index 92979e37e2..3d21207a3d 100644
--- a/xen/include/xen/serial.h
+++ b/xen/include/xen/serial.h
@@ -12,8 +12,6 @@
#include <xen/init.h>
#include <xen/spinlock.h>

-struct cpu_user_regs;
-
/* Register a character-receive hook on the specified COM port. */
typedef void (*serial_rx_fn)(char c);
void serial_set_rx_handler(int handle, serial_rx_fn fn);
@@ -145,8 +143,8 @@ void serial_register_uart(int idx, struct uart_driver *driver, void *uart);
/* Place the serial port into asynchronous transmit mode. */
void serial_async_transmit(struct serial_port *port);
/* Process work in interrupt context. */
-void serial_rx_interrupt(struct serial_port *port, struct cpu_user_regs *regs);
-void serial_tx_interrupt(struct serial_port *port, struct cpu_user_regs *regs);
+void serial_rx_interrupt(struct serial_port *port);
+void serial_tx_interrupt(struct serial_port *port);

/*
* Initialisers for individual uart drivers.
--
generated by git-patchbot for /home/xen/git/xen.git#staging