serial: A few cleanups
Subsystems (8)
v3 cover serial: A few cleanups
Here are a few cleanup to semi-random things I've come across while reading the code.
The series had initially only patches 3-6 but then msm_serial exploded during build because of redefining UART_SCR so I had to resolve the namespace conflict. It would have probably being avoided if there would have been linux/serial_reg.h but it was recently ruled out:
https://lore.kernel.org/lkml/CAPDyKFqHLQ8YTc3wzaFOdAA7Ay9RBEfdQC5uN574=oMavi6iCQ@mail.gmail.com/t/
(Now there would 3 items already in serial_reg.h already but it would leave only async_icount into serial.h so the same problem in other file).
v3:
- Remove one useless comment
- Improve changelog texts
v2:
- Fix commit summary line prefix
Ilpo Järvinen (6):
serial: msm: Convert container_of UART_TO_MSM to static inline
serial: msm: Rename UART_* defines to MSM_UART_*
serial: Use bits for UART_LSR_BRK_ERROR_BITS/MSR_ANY_DELTA
serial: 8250: Use C99 array initializer & define UART_REG_UNMAPPED
serial: Convert SERIAL_XMIT_SIZE to UART_XMIT_SIZE
serial: Consolidate BOTH_EMPTY use
arch/mips/ath79/early_printk.c | 9 +- drivers/accessibility/speakup/serialio.h | 3 +- drivers/tty/amiserial.c | 18 +- drivers/tty/mips_ejtag_fdc.c | 2 +- drivers/tty/serial/8250/8250_early.c | 4 +- drivers/tty/serial/8250/8250_port.c | 50 +-- drivers/tty/serial/meson_uart.c | 2 +- drivers/tty/serial/msm_serial.c | 550 ++++++++++++----------- drivers/tty/serial/omap-serial.c | 7 +- drivers/tty/serial/owl-uart.c | 2 +- drivers/tty/serial/pch_uart.c | 7 +- drivers/tty/serial/pxa.c | 5 +- drivers/tty/serial/rda-uart.c | 2 +- drivers/tty/serial/sunsu.c | 4 +- drivers/tty/serial/vr41xx_siu.c | 4 +- include/linux/serial.h | 15 +- include/uapi/linux/serial_reg.h | 4 +- 17 files changed, 342 insertions(+), 346 deletions(-)
Signature · 1 line
2.30.2
PATCH v3 1/6 serial: msm: Convert container_of UART_TO_MSM to static inline
Create static inline instead of define as it provides type safety and is safer wrt. macros expansion.
--- drivers/tty/serial/msm_serial.c | 49 +++++++++++++++++---------------- 1 file changed, 26 insertions(+), 23 deletions(-)
drivers/tty/serial/msm_serial.c +26 -23
@@ -181,7 +181,10 @@ struct msm_port {struct msm_dma rx_dma; }; -#define UART_TO_MSM (uart_port) container_of(uart_port, struct msm_port, uart) +static inline struct msm_port *to_msm_port (struct uart_port *up) +{ + return container_of(up, struct msm_port, uart); +}static void msm_write (struct uart_port *port,unsigned int val,unsigned int off)
@@ -221,7 +224,7 @@ static void msm_serial_set_mnd_regs_tcxoby4(struct uart_port *port)static void msm_serial_set_mnd_regs (struct uart_port *port) { -struct msm_port *msm_port =UART_TO_MSM (port); +struct msm_port *msm_port =to_msm_port (port);/* * These registers don't exist so we change the clk input rate
@@ -404,7 +407,7 @@ static inline void msm_wait_for_xmitr(struct uart_port *port)static void msm_stop_tx (struct uart_port *port) { -struct msm_port *msm_port =UART_TO_MSM (port); +struct msm_port *msm_port =to_msm_port (port); msm_port->imr &= ~UART_IMR_TXLEV ;msm_write (port, msm_port->imr,UART_IMR );
@@ -412,7 +415,7 @@ static void msm_stop_tx(struct uart_port *port)static void msm_start_tx (struct uart_port *port) { -struct msm_port *msm_port =UART_TO_MSM (port); +struct msm_port *msm_port =to_msm_port (port);struct msm_dma *dma = &msm_port->tx_dma;/* Already started in DMA mode */
@@ -690,7 +693,7 @@ static void msm_start_rx_dma(struct msm_port *msm_port)static void msm_stop_rx (struct uart_port *port) { -struct msm_port *msm_port =UART_TO_MSM (port); +struct msm_port *msm_port =to_msm_port (port);struct msm_dma *dma = &msm_port->rx_dma; msm_port->imr &= ~(UART_IMR_RXLEV |UART_IMR_RXSTALE );
@@ -702,7 +705,7 @@ static void msm_stop_rx(struct uart_port *port)static void msm_enable_ms (struct uart_port *port) { -struct msm_port *msm_port =UART_TO_MSM (port); +struct msm_port *msm_port =to_msm_port (port); msm_port->imr |=UART_IMR_DELTA_CTS ;msm_write (port, msm_port->imr,UART_IMR );
@@ -714,7 +717,7 @@ static void msm_handle_rx_dm(struct uart_port *port, unsigned int misr)struct tty_port *tport = &port->state->port;unsigned int sr;int count =0 ; -struct msm_port *msm_port =UART_TO_MSM (port); +struct msm_port *msm_port =to_msm_port (port);if ((msm_read (port,UART_SR ) &UART_SR_OVERRUN )) { port->icount.overrun++;
@@ -837,7 +840,7 @@ static void msm_handle_rx(struct uart_port *port)static void msm_handle_tx_pio (struct uart_port *port,unsigned int tx_count) {struct circ_buf *xmit = &port->state->xmit; -struct msm_port *msm_port =UART_TO_MSM (port); +struct msm_port *msm_port =to_msm_port (port);unsigned int num_chars;unsigned int tf_pointer =0 ;void __iomem *tf;
@@ -883,7 +886,7 @@ static void msm_handle_tx_pio(struct uart_port *port, unsigned int tx_count)static void msm_handle_tx (struct uart_port *port) { -struct msm_port *msm_port =UART_TO_MSM (port); +struct msm_port *msm_port =to_msm_port (port);struct circ_buf *xmit = &msm_port->uart.state->xmit;struct msm_dma *dma = &msm_port->tx_dma;unsigned int pio_count, dma_count, dma_min;
@@ -947,7 +950,7 @@ static void msm_handle_delta_cts(struct uart_port *port)static irqreturn_t msm_uart_irq (int irq,void *dev_id) {struct uart_port *port = dev_id; -struct msm_port *msm_port =UART_TO_MSM (port); +struct msm_port *msm_port =to_msm_port (port);struct msm_dma *dma = &msm_port->rx_dma;unsigned long flags;unsigned int misr;
@@ -1002,7 +1005,7 @@ static unsigned int msm_get_mctrl(struct uart_port *port)static void msm_reset (struct uart_port *port) { -struct msm_port *msm_port =UART_TO_MSM (port); +struct msm_port *msm_port =to_msm_port (port);unsigned int mr;/* reset everything */
@@ -1055,7 +1058,7 @@ static const struct msm_baud_map * msm_find_best_baud(struct uart_port *port, unsigned int baud, unsigned long *rate) { - struct msm_port *msm_port = UART_TO_MSM(port); + struct msm_port *msm_port = to_msm_port(port);unsigned int divisor, result;unsigned long target, old, best_rate =0 , diff, best_diff =ULONG_MAX ;const struct msm_baud_map *entry, *end, *best;
@@ -1124,7 +1127,7 @@ static int msm_set_baud_rate(struct uart_port *port, unsigned int baud, unsigned long *saved_flags) {unsigned int rxstale, watermark, mask; -struct msm_port *msm_port =UART_TO_MSM (port); +struct msm_port *msm_port =to_msm_port (port);const struct msm_baud_map *entry;unsigned long flags, rate;
@@ -1185,7 +1188,7 @@ static int msm_set_baud_rate(struct uart_port *port, unsigned int baud,static void msm_init_clock (struct uart_port *port) { -struct msm_port *msm_port =UART_TO_MSM (port); +struct msm_port *msm_port =to_msm_port (port);clk_prepare_enable (msm_port->clk);clk_prepare_enable (msm_port->pclk);
@@ -1194,7 +1197,7 @@ static void msm_init_clock(struct uart_port *port)static int msm_startup (struct uart_port *port) { -struct msm_port *msm_port =UART_TO_MSM (port); +struct msm_port *msm_port =to_msm_port (port);unsigned int data, rfr_level, mask;int ret;
@@ -1246,7 +1249,7 @@ static int msm_startup(struct uart_port *port)static void msm_shutdown (struct uart_port *port) { -struct msm_port *msm_port =UART_TO_MSM (port); +struct msm_port *msm_port =to_msm_port (port); msm_port->imr =0 ;msm_write (port,0 ,UART_IMR );/* disable interrupts */
@@ -1262,7 +1265,7 @@ static void msm_shutdown(struct uart_port *port)static void msm_set_termios (struct uart_port *port,struct ktermios *termios,struct ktermios *old) { -struct msm_port *msm_port =UART_TO_MSM (port); +struct msm_port *msm_port =to_msm_port (port);struct msm_dma *dma = &msm_port->rx_dma;unsigned long flags;unsigned int baud, mr;
@@ -1416,7 +1419,7 @@ static int msm_verify_port(struct uart_port *port, struct serial_struct *ser)static void msm_power (struct uart_port *port,unsigned int state,unsigned int oldstate) { -struct msm_port *msm_port =UART_TO_MSM (port); +struct msm_port *msm_port =to_msm_port (port);switch (state) {case 0 :
@@ -1435,7 +1438,7 @@ static void msm_power(struct uart_port *port, unsigned int state,#ifdef CONFIG_CONSOLE_POLL static int msm_poll_get_char_single (struct uart_port *port) { -struct msm_port *msm_port =UART_TO_MSM (port); +struct msm_port *msm_port =to_msm_port (port);unsigned int rf_reg = msm_port->is_uartdm ?UARTDM_RF :UART_RF ;if (!(msm_read (port,UART_SR ) &UART_SR_RX_READY ))
@@ -1489,7 +1492,7 @@ static int msm_poll_get_char(struct uart_port *port) {u32 imr;int c; -struct msm_port *msm_port =UART_TO_MSM (port); +struct msm_port *msm_port =to_msm_port (port);/* Disable all interrupts */ imr =msm_read (port,UART_IMR );
@@ -1509,7 +1512,7 @@ static int msm_poll_get_char(struct uart_port *port)static void msm_poll_put_char (struct uart_port *port,unsigned char c) {u32 imr; -struct msm_port *msm_port =UART_TO_MSM (port); +struct msm_port *msm_port =to_msm_port (port);/* Disable all interrupts */ imr =msm_read (port,UART_IMR );
@@ -1677,7 +1680,7 @@ static void msm_console_write(struct console *co, const char *s,BUG_ON (co->index <0 || co->index >=UART_NR ); port =msm_get_port_from_line (co->index); - msm_port =UART_TO_MSM (port); + msm_port =to_msm_port (port);__msm_console_write (port, s, count, msm_port->is_uartdm); }
@@ -1808,7 +1811,7 @@ static int msm_serial_probe(struct platform_device *pdev) port =msm_get_port_from_line (line); port->dev = &pdev->dev; - msm_port =UART_TO_MSM (port); + msm_port =to_msm_port (port); id =of_match_device (msm_uartdm_table, &pdev->dev);if (id)
Signature · 1 line
2.30.2
PATCH v3 2/6 serial: msm: Rename UART_* defines to MSM_UART_*
In reply to Ilpo JärvinenUsing UART_* to name defines is a bit problematic. When trying to do unrelated cleanup which also involved tweaking header inclusion logic, caused UART_CSR from serial_reg.h to leak into msm's namespace which is also among msm defines. Thus, rename all UART_* ones to MSM_UART_* to eliminate possibility of collisions.
--- drivers/tty/serial/msm_serial.c | 501 ++++++++++++++++---------------- 1 file changed, 250 insertions(+), 251 deletions(-)
drivers/tty/serial/msm_serial.c +250 -251
@@ -29,103 +29,103 @@#include <linux/of_device.h> #include <linux/wait.h> -#define UART_MR1 0x0000 - -#define UART_MR1_AUTO_RFR_LEVEL0 0x3F -#define UART_MR1_AUTO_RFR_LEVEL1 0x3FF00 -#define UART_DM_MR1_AUTO_RFR_LEVEL1 0xFFFFFF00 -#define UART_MR1_RX_RDY_CTL BIT(7) -#define UART_MR1_CTS_CTL BIT(6) - -#define UART_MR2 0x0004 -#define UART_MR2_ERROR_MODE BIT(6) -#define UART_MR2_BITS_PER_CHAR 0x30 -#define UART_MR2_BITS_PER_CHAR_5 (0x0 << 4) -#define UART_MR2_BITS_PER_CHAR_6 (0x1 << 4) -#define UART_MR2_BITS_PER_CHAR_7 (0x2 << 4) -#define UART_MR2_BITS_PER_CHAR_8 (0x3 << 4) -#define UART_MR2_STOP_BIT_LEN_ONE (0x1 << 2) -#define UART_MR2_STOP_BIT_LEN_TWO (0x3 << 2) -#define UART_MR2_PARITY_MODE_NONE 0x0 -#define UART_MR2_PARITY_MODE_ODD 0x1 -#define UART_MR2_PARITY_MODE_EVEN 0x2 -#define UART_MR2_PARITY_MODE_SPACE 0x3 -#define UART_MR2_PARITY_MODE 0x3 - -#define UART_CSR 0x0008 - -#define UART_TF 0x000C +#define MSM_UART_MR1 0x0000 + +#define MSM_UART_MR1_AUTO_RFR_LEVEL0 0x3F +#define MSM_UART_MR1_AUTO_RFR_LEVEL1 0x3FF00 +#define MSM_UART_DM_MR1_AUTO_RFR_LEVEL1 0xFFFFFF00 +#define MSM_UART_MR1_RX_RDY_CTL BIT(7) +#define MSM_UART_MR1_CTS_CTL BIT(6) + +#define MSM_UART_MR2 0x0004 +#define MSM_UART_MR2_ERROR_MODE BIT(6) +#define MSM_UART_MR2_BITS_PER_CHAR 0x30 +#define MSM_UART_MR2_BITS_PER_CHAR_5 (0x0 << 4) +#define MSM_UART_MR2_BITS_PER_CHAR_6 (0x1 << 4) +#define MSM_UART_MR2_BITS_PER_CHAR_7 (0x2 << 4) +#define MSM_UART_MR2_BITS_PER_CHAR_8 (0x3 << 4) +#define MSM_UART_MR2_STOP_BIT_LEN_ONE (0x1 << 2) +#define MSM_UART_MR2_STOP_BIT_LEN_TWO (0x3 << 2) +#define MSM_UART_MR2_PARITY_MODE_NONE 0x0 +#define MSM_UART_MR2_PARITY_MODE_ODD 0x1 +#define MSM_UART_MR2_PARITY_MODE_EVEN 0x2 +#define MSM_UART_MR2_PARITY_MODE_SPACE 0x3 +#define MSM_UART_MR2_PARITY_MODE 0x3 + +#define MSM_UART_CSR 0x0008 + +#define MSM_UART_TF 0x000C#define UARTDM_TF 0x0070 -#define UART_CR 0x0010 -#define UART_CR_CMD_NULL (0 << 4) -#define UART_CR_CMD_RESET_RX (1 << 4) -#define UART_CR_CMD_RESET_TX (2 << 4) -#define UART_CR_CMD_RESET_ERR (3 << 4) -#define UART_CR_CMD_RESET_BREAK_INT (4 << 4) -#define UART_CR_CMD_START_BREAK (5 << 4) -#define UART_CR_CMD_STOP_BREAK (6 << 4) -#define UART_CR_CMD_RESET_CTS (7 << 4) -#define UART_CR_CMD_RESET_STALE_INT (8 << 4) -#define UART_CR_CMD_PACKET_MODE (9 << 4) -#define UART_CR_CMD_MODE_RESET (12 << 4) -#define UART_CR_CMD_SET_RFR (13 << 4) -#define UART_CR_CMD_RESET_RFR (14 << 4) -#define UART_CR_CMD_PROTECTION_EN (16 << 4) -#define UART_CR_CMD_STALE_EVENT_DISABLE (6 << 8) -#define UART_CR_CMD_STALE_EVENT_ENABLE (80 << 4) -#define UART_CR_CMD_FORCE_STALE (4 << 8) -#define UART_CR_CMD_RESET_TX_READY (3 << 8) -#define UART_CR_TX_DISABLE BIT(3) -#define UART_CR_TX_ENABLE BIT(2) -#define UART_CR_RX_DISABLE BIT(1) -#define UART_CR_RX_ENABLE BIT(0) -#define UART_CR_CMD_RESET_RXBREAK_START ((1 << 11) | (2 << 4)) - -#define UART_IMR 0x0014 -#define UART_IMR_TXLEV BIT(0) -#define UART_IMR_RXSTALE BIT(3) -#define UART_IMR_RXLEV BIT(4) -#define UART_IMR_DELTA_CTS BIT(5) -#define UART_IMR_CURRENT_CTS BIT(6) -#define UART_IMR_RXBREAK_START BIT(10) - -#define UART_IPR_RXSTALE_LAST 0x20 -#define UART_IPR_STALE_LSB 0x1F -#define UART_IPR_STALE_TIMEOUT_MSB 0x3FF80 -#define UART_DM_IPR_STALE_TIMEOUT_MSB 0xFFFFFF80 - -#define UART_IPR 0x0018 -#define UART_TFWR 0x001C -#define UART_RFWR 0x0020 -#define UART_HCR 0x0024 - -#define UART_MREG 0x0028 -#define UART_NREG 0x002C -#define UART_DREG 0x0030 -#define UART_MNDREG 0x0034 -#define UART_IRDA 0x0038 -#define UART_MISR_MODE 0x0040 -#define UART_MISR_RESET 0x0044 -#define UART_MISR_EXPORT 0x0048 -#define UART_MISR_VAL 0x004C -#define UART_TEST_CTRL 0x0050 - -#define UART_SR 0x0008 -#define UART_SR_HUNT_CHAR BIT(7) -#define UART_SR_RX_BREAK BIT(6) -#define UART_SR_PAR_FRAME_ERR BIT(5) -#define UART_SR_OVERRUN BIT(4) -#define UART_SR_TX_EMPTY BIT(3) -#define UART_SR_TX_READY BIT(2) -#define UART_SR_RX_FULL BIT(1) -#define UART_SR_RX_READY BIT(0) - -#define UART_RF 0x000C +#define MSM_UART_CR 0x0010 +#define MSM_UART_CR_CMD_NULL (0 << 4) +#define MSM_UART_CR_CMD_RESET_RX (1 << 4) +#define MSM_UART_CR_CMD_RESET_TX (2 << 4) +#define MSM_UART_CR_CMD_RESET_ERR (3 << 4) +#define MSM_UART_CR_CMD_RESET_BREAK_INT (4 << 4) +#define MSM_UART_CR_CMD_START_BREAK (5 << 4) +#define MSM_UART_CR_CMD_STOP_BREAK (6 << 4) +#define MSM_UART_CR_CMD_RESET_CTS (7 << 4) +#define MSM_UART_CR_CMD_RESET_STALE_INT (8 << 4) +#define MSM_UART_CR_CMD_PACKET_MODE (9 << 4) +#define MSM_UART_CR_CMD_MODE_RESET (12 << 4) +#define MSM_UART_CR_CMD_SET_RFR (13 << 4) +#define MSM_UART_CR_CMD_RESET_RFR (14 << 4) +#define MSM_UART_CR_CMD_PROTECTION_EN (16 << 4) +#define MSM_UART_CR_CMD_STALE_EVENT_DISABLE (6 << 8) +#define MSM_UART_CR_CMD_STALE_EVENT_ENABLE (80 << 4) +#define MSM_UART_CR_CMD_FORCE_STALE (4 << 8) +#define MSM_UART_CR_CMD_RESET_TX_READY (3 << 8) +#define MSM_UART_CR_TX_DISABLE BIT(3) +#define MSM_UART_CR_TX_ENABLE BIT(2) +#define MSM_UART_CR_RX_DISABLE BIT(1) +#define MSM_UART_CR_RX_ENABLE BIT(0) +#define MSM_UART_CR_CMD_RESET_RXBREAK_START ((1 << 11) | (2 << 4)) + +#define MSM_UART_IMR 0x0014 +#define MSM_UART_IMR_TXLEV BIT(0) +#define MSM_UART_IMR_RXSTALE BIT(3) +#define MSM_UART_IMR_RXLEV BIT(4) +#define MSM_UART_IMR_DELTA_CTS BIT(5) +#define MSM_UART_IMR_CURRENT_CTS BIT(6) +#define MSM_UART_IMR_RXBREAK_START BIT(10) + +#define MSM_UART_IPR_RXSTALE_LAST 0x20 +#define MSM_UART_IPR_STALE_LSB 0x1F +#define MSM_UART_IPR_STALE_TIMEOUT_MSB 0x3FF80 +#define MSM_UART_DM_IPR_STALE_TIMEOUT_MSB 0xFFFFFF80 + +#define MSM_UART_IPR 0x0018 +#define MSM_UART_TFWR 0x001C +#define MSM_UART_RFWR 0x0020 +#define MSM_UART_HCR 0x0024 + +#define MSM_UART_MREG 0x0028 +#define MSM_UART_NREG 0x002C +#define MSM_UART_DREG 0x0030 +#define MSM_UART_MNDREG 0x0034 +#define MSM_UART_IRDA 0x0038 +#define MSM_UART_MISR_MODE 0x0040 +#define MSM_UART_MISR_RESET 0x0044 +#define MSM_UART_MISR_EXPORT 0x0048 +#define MSM_UART_MISR_VAL 0x004C +#define MSM_UART_TEST_CTRL 0x0050 + +#define MSM_UART_SR 0x0008 +#define MSM_UART_SR_HUNT_CHAR BIT(7) +#define MSM_UART_SR_RX_BREAK BIT(6) +#define MSM_UART_SR_PAR_FRAME_ERR BIT(5) +#define MSM_UART_SR_OVERRUN BIT(4) +#define MSM_UART_SR_TX_EMPTY BIT(3) +#define MSM_UART_SR_TX_READY BIT(2) +#define MSM_UART_SR_RX_FULL BIT(1) +#define MSM_UART_SR_RX_READY BIT(0) + +#define MSM_UART_RF 0x000C#define UARTDM_RF 0x0070 -#define UART_MISR 0x0010 -#define UART_ISR 0x0014 -#define UART_ISR_TX_READY BIT(7) +#define MSM_UART_MISR 0x0010 +#define MSM_UART_ISR 0x0014 +#define MSM_UART_ISR_TX_READY BIT(7)#define UARTDM_RXFS 0x50#define UARTDM_RXFS_BUF_SHIFT 0x7
@@ -203,10 +203,10 @@ unsigned int msm_read(struct uart_port *port, unsigned int off)*/ static void msm_serial_set_mnd_regs_tcxo (struct uart_port *port) { -msm_write (port,0x06 ,UART_MREG ); -msm_write (port,0xF1 ,UART_NREG ); -msm_write (port,0x0F ,UART_DREG ); -msm_write (port,0x1A ,UART_MNDREG ); +msm_write (port,0x06 ,MSM_UART_MREG ); +msm_write (port,0xF1 ,MSM_UART_NREG ); +msm_write (port,0x0F ,MSM_UART_DREG ); +msm_write (port,0x1A ,MSM_UART_MNDREG ); port->uartclk =1843200 ; }
@@ -215,10 +215,10 @@ static void msm_serial_set_mnd_regs_tcxo(struct uart_port *port)*/ static void msm_serial_set_mnd_regs_tcxoby4 (struct uart_port *port) { -msm_write (port,0x18 ,UART_MREG ); -msm_write (port,0xF6 ,UART_NREG ); -msm_write (port,0x0F ,UART_DREG ); -msm_write (port,0x0A ,UART_MNDREG ); +msm_write (port,0x18 ,MSM_UART_MREG ); +msm_write (port,0xF6 ,MSM_UART_NREG ); +msm_write (port,0x0F ,MSM_UART_DREG ); +msm_write (port,0x0A ,MSM_UART_MNDREG ); port->uartclk =1843200 ; }
@@ -395,22 +395,22 @@ static inline void msm_wait_for_xmitr(struct uart_port *port) {unsigned int timeout =500000 ; -while (!(msm_read (port,UART_SR ) &UART_SR_TX_EMPTY )) { -if (msm_read (port,UART_ISR ) &UART_ISR_TX_READY ) +while (!(msm_read (port,MSM_UART_SR ) &MSM_UART_SR_TX_EMPTY )) { +if (msm_read (port,MSM_UART_ISR ) &MSM_UART_ISR_TX_READY )break ;udelay (1 );if (!timeout--)break ; } -msm_write (port,UART_CR_CMD_RESET_TX_READY ,UART_CR ); +msm_write (port,MSM_UART_CR_CMD_RESET_TX_READY ,MSM_UART_CR ); }static void msm_stop_tx (struct uart_port *port) {struct msm_port *msm_port =to_msm_port (port); - msm_port->imr &= ~UART_IMR_TXLEV ; -msm_write (port, msm_port->imr,UART_IMR ); + msm_port->imr &= ~MSM_UART_IMR_TXLEV ; +msm_write (port, msm_port->imr,MSM_UART_IMR ); }static void msm_start_tx (struct uart_port *port)
@@ -422,8 +422,8 @@ static void msm_start_tx(struct uart_port *port)if (dma->count)return ; - msm_port->imr |=UART_IMR_TXLEV ; -msm_write (port, msm_port->imr,UART_IMR ); + msm_port->imr |=MSM_UART_IMR_TXLEV ; +msm_write (port, msm_port->imr,MSM_UART_IMR ); }static void msm_reset_dm_count (struct uart_port *port,int count)
@@ -459,8 +459,8 @@ static void msm_complete_tx_dma(void *args)msm_write (port, val,UARTDM_DMEN );if (msm_port->is_uartdm >UARTDM_1P3 ) { -msm_write (port,UART_CR_CMD_RESET_TX ,UART_CR ); -msm_write (port,UART_CR_TX_ENABLE ,UART_CR ); +msm_write (port,MSM_UART_CR_CMD_RESET_TX ,MSM_UART_CR ); +msm_write (port,MSM_UART_CR_TX_ENABLE ,MSM_UART_CR ); } count = dma->count - state.residue;
@@ -471,8 +471,8 @@ static void msm_complete_tx_dma(void *args) xmit->tail &=UART_XMIT_SIZE -1 ;/* Restore "Tx FIFO below watermark" interrupt */ - msm_port->imr |=UART_IMR_TXLEV ; -msm_write (port, msm_port->imr,UART_IMR ); + msm_port->imr |=MSM_UART_IMR_TXLEV ; +msm_write (port, msm_port->imr,MSM_UART_IMR );if (uart_circ_chars_pending (xmit) <WAKEUP_CHARS )uart_write_wakeup (port);
@@ -519,8 +519,8 @@ static int msm_handle_tx_dma(struct msm_port *msm_port, unsigned int count)* Using DMA complete for Tx FIFO reload, no need for * "Tx FIFO below watermark" one, disable it */ - msm_port->imr &= ~UART_IMR_TXLEV ; -msm_write (port, msm_port->imr,UART_IMR ); + msm_port->imr &= ~MSM_UART_IMR_TXLEV ; +msm_write (port, msm_port->imr,MSM_UART_IMR ); dma->count = count;
@@ -562,10 +562,10 @@ static void msm_complete_rx_dma(void *args) val &= ~dma->enable_bit;msm_write (port, val,UARTDM_DMEN ); -if (msm_read (port,UART_SR ) &UART_SR_OVERRUN ) { +if (msm_read (port,MSM_UART_SR ) &MSM_UART_SR_OVERRUN ) { port->icount.overrun++;tty_insert_flip_char (tport,0 ,TTY_OVERRUN ); -msm_write (port,UART_CR_CMD_RESET_ERR ,UART_CR ); +msm_write (port,MSM_UART_CR_CMD_RESET_ERR ,MSM_UART_CR ); } count =msm_read (port,UARTDM_RX_TOTAL_SNAP );
@@ -587,7 +587,7 @@ static void msm_complete_rx_dma(void *args)continue ; } -if (!(port->read_status_mask &UART_SR_RX_BREAK )) +if (!(port->read_status_mask &MSM_UART_SR_RX_BREAK )) flag =TTY_NORMAL ;spin_unlock_irqrestore (&port->lock, flags);
@@ -641,23 +641,23 @@ static void msm_start_rx_dma(struct msm_port *msm_port)* Using DMA for FIFO off-load, no need for "Rx FIFO over * watermark" or "stale" interrupts, disable them */ - msm_port->imr &= ~(UART_IMR_RXLEV |UART_IMR_RXSTALE ); + msm_port->imr &= ~(MSM_UART_IMR_RXLEV |MSM_UART_IMR_RXSTALE );/* * Well, when DMA is ADM3 engine(implied by <= UARTDM v1.3), * we need RXSTALE to flush input DMA fifo to memory */ if (msm_port->is_uartdm <UARTDM_1P4 ) - msm_port->imr |=UART_IMR_RXSTALE ; + msm_port->imr |=MSM_UART_IMR_RXSTALE ; -msm_write (uart, msm_port->imr,UART_IMR ); +msm_write (uart, msm_port->imr,MSM_UART_IMR ); dma->count =UARTDM_RX_SIZE ;dma_async_issue_pending (dma->chan); -msm_write (uart,UART_CR_CMD_RESET_STALE_INT ,UART_CR ); -msm_write (uart,UART_CR_CMD_STALE_EVENT_ENABLE ,UART_CR ); +msm_write (uart,MSM_UART_CR_CMD_RESET_STALE_INT ,MSM_UART_CR ); +msm_write (uart,MSM_UART_CR_CMD_STALE_EVENT_ENABLE ,MSM_UART_CR ); val =msm_read (uart,UARTDM_DMEN ); val |= dma->enable_bit;
@@ -679,16 +679,16 @@ static void msm_start_rx_dma(struct msm_port *msm_port)* Switch from DMA to SW/FIFO mode. After clearing Rx BAM (UARTDM_DMEN), * receiver must be reset. */ -msm_write (uart,UART_CR_CMD_RESET_RX ,UART_CR ); -msm_write (uart,UART_CR_RX_ENABLE ,UART_CR ); +msm_write (uart,MSM_UART_CR_CMD_RESET_RX ,MSM_UART_CR ); +msm_write (uart,MSM_UART_CR_RX_ENABLE ,MSM_UART_CR ); -msm_write (uart,UART_CR_CMD_RESET_STALE_INT ,UART_CR ); +msm_write (uart,MSM_UART_CR_CMD_RESET_STALE_INT ,MSM_UART_CR );msm_write (uart,0xFFFFFF ,UARTDM_DMRX ); -msm_write (uart,UART_CR_CMD_STALE_EVENT_ENABLE ,UART_CR ); +msm_write (uart,MSM_UART_CR_CMD_STALE_EVENT_ENABLE ,MSM_UART_CR );/* Re-enable RX interrupts */ - msm_port->imr |= (UART_IMR_RXLEV |UART_IMR_RXSTALE ); -msm_write (uart, msm_port->imr,UART_IMR ); + msm_port->imr |=MSM_UART_IMR_RXLEV |MSM_UART_IMR_RXSTALE ; +msm_write (uart, msm_port->imr,MSM_UART_IMR ); }static void msm_stop_rx (struct uart_port *port)
@@ -696,8 +696,8 @@ static void msm_stop_rx(struct uart_port *port)struct msm_port *msm_port =to_msm_port (port);struct msm_dma *dma = &msm_port->rx_dma; - msm_port->imr &= ~(UART_IMR_RXLEV |UART_IMR_RXSTALE ); -msm_write (port, msm_port->imr,UART_IMR ); + msm_port->imr &= ~(MSM_UART_IMR_RXLEV |MSM_UART_IMR_RXSTALE ); +msm_write (port, msm_port->imr,MSM_UART_IMR );if (dma->chan)msm_stop_dma (port, dma);
@@ -707,8 +707,8 @@ static void msm_enable_ms(struct uart_port *port) {struct msm_port *msm_port =to_msm_port (port); - msm_port->imr |=UART_IMR_DELTA_CTS ; -msm_write (port, msm_port->imr,UART_IMR ); + msm_port->imr |=MSM_UART_IMR_DELTA_CTS ; +msm_write (port, msm_port->imr,MSM_UART_IMR ); }static void msm_handle_rx_dm (struct uart_port *port,unsigned int misr)
@@ -719,18 +719,18 @@ static void msm_handle_rx_dm(struct uart_port *port, unsigned int misr)int count =0 ;struct msm_port *msm_port =to_msm_port (port); -if ((msm_read (port,UART_SR ) &UART_SR_OVERRUN )) { +if ((msm_read (port,MSM_UART_SR ) &MSM_UART_SR_OVERRUN )) { port->icount.overrun++;tty_insert_flip_char (tport,0 ,TTY_OVERRUN ); -msm_write (port,UART_CR_CMD_RESET_ERR ,UART_CR ); +msm_write (port,MSM_UART_CR_CMD_RESET_ERR ,MSM_UART_CR ); } -if (misr &UART_IMR_RXSTALE ) { +if (misr &MSM_UART_IMR_RXSTALE ) { count =msm_read (port,UARTDM_RX_TOTAL_SNAP ) - msm_port->old_snap_state; msm_port->old_snap_state =0 ; }else { - count =4 * (msm_read (port,UART_RFWR )); + count =4 * (msm_read (port,MSM_UART_RFWR )); msm_port->old_snap_state += count; }
@@ -742,8 +742,8 @@ static void msm_handle_rx_dm(struct uart_port *port, unsigned int misr)unsigned char buf[4 ];int sysrq, r_count, i; - sr =msm_read (port,UART_SR ); -if ((sr &UART_SR_RX_READY ) ==0 ) { + sr =msm_read (port,MSM_UART_SR ); +if ((sr &MSM_UART_SR_RX_READY ) ==0 ) { msm_port->old_snap_state -= count;break ; }
@@ -762,7 +762,7 @@ static void msm_handle_rx_dm(struct uart_port *port, unsigned int misr)continue ; } -if (!(port->read_status_mask &UART_SR_RX_BREAK )) +if (!(port->read_status_mask &MSM_UART_SR_RX_BREAK )) flag =TTY_NORMAL ;spin_unlock (&port->lock);
@@ -776,10 +776,10 @@ static void msm_handle_rx_dm(struct uart_port *port, unsigned int misr)tty_flip_buffer_push (tport); -if (misr & (UART_IMR_RXSTALE )) -msm_write (port,UART_CR_CMD_RESET_STALE_INT ,UART_CR ); +if (misr & (MSM_UART_IMR_RXSTALE )) +msm_write (port,MSM_UART_CR_CMD_RESET_STALE_INT ,MSM_UART_CR );msm_write (port,0xFFFFFF ,UARTDM_DMRX ); -msm_write (port,UART_CR_CMD_STALE_EVENT_ENABLE ,UART_CR ); +msm_write (port,MSM_UART_CR_CMD_STALE_EVENT_ENABLE ,MSM_UART_CR );/* Try to use DMA */ msm_start_rx_dma (msm_port);
@@ -795,25 +795,25 @@ static void msm_handle_rx(struct uart_port *port)* Handle overrun. My understanding of the hardware is that overrun * is not tied to the RX buffer, so we handle the case out of band. */ -if ((msm_read (port,UART_SR ) &UART_SR_OVERRUN )) { +if ((msm_read (port,MSM_UART_SR ) &MSM_UART_SR_OVERRUN )) { port->icount.overrun++;tty_insert_flip_char (tport,0 ,TTY_OVERRUN ); -msm_write (port,UART_CR_CMD_RESET_ERR ,UART_CR ); +msm_write (port,MSM_UART_CR_CMD_RESET_ERR ,MSM_UART_CR ); }/* and now the main RX loop */ -while ((sr =msm_read (port,UART_SR )) &UART_SR_RX_READY ) { +while ((sr =msm_read (port,MSM_UART_SR )) &MSM_UART_SR_RX_READY ) {unsigned int c;char flag =TTY_NORMAL ;int sysrq; - c =msm_read (port,UART_RF ); + c =msm_read (port,MSM_UART_RF ); -if (sr &UART_SR_RX_BREAK ) { +if (sr &MSM_UART_SR_RX_BREAK ) { port->icount.brk++;if (uart_handle_break (port))continue ; - }else if (sr &UART_SR_PAR_FRAME_ERR ) { + }else if (sr &MSM_UART_SR_PAR_FRAME_ERR ) { port->icount.frame++; }else { port->icount.rx++;
@@ -822,9 +822,9 @@ static void msm_handle_rx(struct uart_port *port)/* Mask conditions we're ignorning. */ sr &= port->read_status_mask; -if (sr &UART_SR_RX_BREAK ) +if (sr &MSM_UART_SR_RX_BREAK ) flag =TTY_BREAK ; -else if (sr &UART_SR_PAR_FRAME_ERR ) +else if (sr &MSM_UART_SR_PAR_FRAME_ERR ) flag =TTY_FRAME ;spin_unlock (&port->lock);
@@ -848,7 +848,7 @@ static void msm_handle_tx_pio(struct uart_port *port, unsigned int tx_count)if (msm_port->is_uartdm) tf = port->membase +UARTDM_TF ;else - tf = port->membase +UART_TF ; + tf = port->membase +MSM_UART_TF ;if (tx_count && msm_port->is_uartdm)msm_reset_dm_count (port, tx_count);
@@ -857,7 +857,7 @@ static void msm_handle_tx_pio(struct uart_port *port, unsigned int tx_count)int i;char buf[4 ] = {0 }; -if (!(msm_read (port,UART_SR ) &UART_SR_TX_READY )) +if (!(msm_read (port,MSM_UART_SR ) &MSM_UART_SR_TX_READY ))break ;if (msm_port->is_uartdm)
@@ -898,7 +898,7 @@ static void msm_handle_tx(struct uart_port *port)if (msm_port->is_uartdm) tf = port->membase +UARTDM_TF ;else - tf = port->membase +UART_TF ; + tf = port->membase +MSM_UART_TF ; buf[0 ] = port->x_char;
@@ -942,7 +942,7 @@ static void msm_handle_tx(struct uart_port *port)static void msm_handle_delta_cts (struct uart_port *port) { -msm_write (port,UART_CR_CMD_RESET_CTS ,UART_CR ); +msm_write (port,MSM_UART_CR_CMD_RESET_CTS ,MSM_UART_CR ); port->icount.cts++;wake_up_interruptible (&port->state->port.delta_msr_wait); }
@@ -957,20 +957,20 @@ static irqreturn_t msm_uart_irq(int irq, void *dev_id)u32 val;spin_lock_irqsave (&port->lock, flags); - misr =msm_read (port,UART_MISR ); -msm_write (port,0 ,UART_IMR );/* disable interrupt */ + misr =msm_read (port,MSM_UART_MISR ); +msm_write (port,0 ,MSM_UART_IMR );/* disable interrupt */ -if (misr &UART_IMR_RXBREAK_START ) { +if (misr &MSM_UART_IMR_RXBREAK_START ) { msm_port->break_detected = true; -msm_write (port,UART_CR_CMD_RESET_RXBREAK_START ,UART_CR ); +msm_write (port,MSM_UART_CR_CMD_RESET_RXBREAK_START ,MSM_UART_CR ); } -if (misr & (UART_IMR_RXLEV |UART_IMR_RXSTALE )) { +if (misr & (MSM_UART_IMR_RXLEV |MSM_UART_IMR_RXSTALE )) {if (dma->count) { - val =UART_CR_CMD_STALE_EVENT_DISABLE ; -msm_write (port, val,UART_CR ); - val =UART_CR_CMD_RESET_STALE_INT ; -msm_write (port, val,UART_CR ); + val =MSM_UART_CR_CMD_STALE_EVENT_DISABLE ; +msm_write (port, val,MSM_UART_CR ); + val =MSM_UART_CR_CMD_RESET_STALE_INT ; +msm_write (port, val,MSM_UART_CR );/* * Flush DMA input fifo to memory, this will also * trigger DMA RX completion
@@ -982,12 +982,12 @@ static irqreturn_t msm_uart_irq(int irq, void *dev_id)msm_handle_rx (port); } } -if (misr &UART_IMR_TXLEV ) +if (misr &MSM_UART_IMR_TXLEV )msm_handle_tx (port); -if (misr &UART_IMR_DELTA_CTS ) +if (misr &MSM_UART_IMR_DELTA_CTS )msm_handle_delta_cts (port); -msm_write (port, msm_port->imr,UART_IMR );/* restore interrupt */ +msm_write (port, msm_port->imr,MSM_UART_IMR );/* restore interrupt */ spin_unlock_irqrestore (&port->lock, flags);return IRQ_HANDLED ;
@@ -995,7 +995,7 @@ static irqreturn_t msm_uart_irq(int irq, void *dev_id)static unsigned int msm_tx_empty (struct uart_port *port) { -return (msm_read (port,UART_SR ) &UART_SR_TX_EMPTY ) ?TIOCSER_TEMT :0 ; +return (msm_read (port,MSM_UART_SR ) &MSM_UART_SR_TX_EMPTY ) ?TIOCSER_TEMT :0 ; }static unsigned int msm_get_mctrl (struct uart_port *port)
@@ -1009,15 +1009,15 @@ static void msm_reset(struct uart_port *port)unsigned int mr;/* reset everything */ -msm_write (port,UART_CR_CMD_RESET_RX ,UART_CR ); -msm_write (port,UART_CR_CMD_RESET_TX ,UART_CR ); -msm_write (port,UART_CR_CMD_RESET_ERR ,UART_CR ); -msm_write (port,UART_CR_CMD_RESET_BREAK_INT ,UART_CR ); -msm_write (port,UART_CR_CMD_RESET_CTS ,UART_CR ); -msm_write (port,UART_CR_CMD_RESET_RFR ,UART_CR ); - mr =msm_read (port,UART_MR1 ); - mr &= ~UART_MR1_RX_RDY_CTL ; -msm_write (port, mr,UART_MR1 ); +msm_write (port,MSM_UART_CR_CMD_RESET_RX ,MSM_UART_CR ); +msm_write (port,MSM_UART_CR_CMD_RESET_TX ,MSM_UART_CR ); +msm_write (port,MSM_UART_CR_CMD_RESET_ERR ,MSM_UART_CR ); +msm_write (port,MSM_UART_CR_CMD_RESET_BREAK_INT ,MSM_UART_CR ); +msm_write (port,MSM_UART_CR_CMD_RESET_CTS ,MSM_UART_CR ); +msm_write (port,MSM_UART_CR_CMD_RESET_RFR ,MSM_UART_CR ); + mr =msm_read (port,MSM_UART_MR1 ); + mr &= ~MSM_UART_MR1_RX_RDY_CTL ; +msm_write (port, mr,MSM_UART_MR1 );/* Disable DM modes */ if (msm_port->is_uartdm)
@@ -1028,24 +1028,24 @@ static void msm_set_mctrl(struct uart_port *port, unsigned int mctrl) {unsigned int mr; - mr =msm_read (port,UART_MR1 ); + mr =msm_read (port,MSM_UART_MR1 );if (!(mctrl &TIOCM_RTS )) { - mr &= ~UART_MR1_RX_RDY_CTL ; -msm_write (port, mr,UART_MR1 ); -msm_write (port,UART_CR_CMD_RESET_RFR ,UART_CR ); + mr &= ~MSM_UART_MR1_RX_RDY_CTL ; +msm_write (port, mr,MSM_UART_MR1 ); +msm_write (port,MSM_UART_CR_CMD_RESET_RFR ,MSM_UART_CR ); }else { - mr |=UART_MR1_RX_RDY_CTL ; -msm_write (port, mr,UART_MR1 ); + mr |=MSM_UART_MR1_RX_RDY_CTL ; +msm_write (port, mr,MSM_UART_MR1 ); } }static void msm_break_ctl (struct uart_port *port,int break_ctl) {if (break_ctl) -msm_write (port,UART_CR_CMD_START_BREAK ,UART_CR ); +msm_write (port,MSM_UART_CR_CMD_START_BREAK ,MSM_UART_CR );else -msm_write (port,UART_CR_CMD_STOP_BREAK ,UART_CR ); +msm_write (port,MSM_UART_CR_CMD_STOP_BREAK ,MSM_UART_CR ); }struct msm_baud_map {
@@ -1142,45 +1142,45 @@ static int msm_set_baud_rate(struct uart_port *port, unsigned int baud, *saved_flags = flags; port->uartclk = rate; -msm_write (port, entry->code,UART_CSR ); +msm_write (port, entry->code,MSM_UART_CSR );/* RX stale watermark */ rxstale = entry->rxstale; - watermark =UART_IPR_STALE_LSB & rxstale; + watermark =MSM_UART_IPR_STALE_LSB & rxstale;if (msm_port->is_uartdm) { - mask =UART_DM_IPR_STALE_TIMEOUT_MSB ; + mask =MSM_UART_DM_IPR_STALE_TIMEOUT_MSB ; }else { - watermark |=UART_IPR_RXSTALE_LAST ; - mask =UART_IPR_STALE_TIMEOUT_MSB ; + watermark |=MSM_UART_IPR_RXSTALE_LAST ; + mask =MSM_UART_IPR_STALE_TIMEOUT_MSB ; } watermark |= mask & (rxstale <<2 ); -msm_write (port, watermark,UART_IPR ); +msm_write (port, watermark,MSM_UART_IPR );/* set RX watermark */ watermark = (port->fifosize *3 ) /4 ; -msm_write (port, watermark,UART_RFWR ); +msm_write (port, watermark,MSM_UART_RFWR );/* set TX watermark */ -msm_write (port,10 ,UART_TFWR ); +msm_write (port,10 ,MSM_UART_TFWR ); -msm_write (port,UART_CR_CMD_PROTECTION_EN ,UART_CR ); +msm_write (port,MSM_UART_CR_CMD_PROTECTION_EN ,MSM_UART_CR );msm_reset (port);/* Enable RX and TX */ -msm_write (port,UART_CR_TX_ENABLE |UART_CR_RX_ENABLE ,UART_CR ); +msm_write (port,MSM_UART_CR_TX_ENABLE |MSM_UART_CR_RX_ENABLE ,MSM_UART_CR );/* turn on RX and CTS interrupts */ - msm_port->imr =UART_IMR_RXLEV |UART_IMR_RXSTALE | -UART_IMR_CURRENT_CTS |UART_IMR_RXBREAK_START ; + msm_port->imr =MSM_UART_IMR_RXLEV |MSM_UART_IMR_RXSTALE | +MSM_UART_IMR_CURRENT_CTS |MSM_UART_IMR_RXBREAK_START ; -msm_write (port, msm_port->imr,UART_IMR ); +msm_write (port, msm_port->imr,MSM_UART_IMR );if (msm_port->is_uartdm) { -msm_write (port,UART_CR_CMD_RESET_STALE_INT ,UART_CR ); +msm_write (port,MSM_UART_CR_CMD_RESET_STALE_INT ,MSM_UART_CR );msm_write (port,0xFFFFFF ,UARTDM_DMRX ); -msm_write (port,UART_CR_CMD_STALE_EVENT_ENABLE ,UART_CR ); +msm_write (port,MSM_UART_CR_CMD_STALE_EVENT_ENABLE ,MSM_UART_CR ); }return baud;
@@ -1212,18 +1212,18 @@ static int msm_startup(struct uart_port *port) rfr_level = port->fifosize;/* set automatic RFR level */ - data =msm_read (port,UART_MR1 ); + data =msm_read (port,MSM_UART_MR1 );if (msm_port->is_uartdm) - mask =UART_DM_MR1_AUTO_RFR_LEVEL1 ; + mask =MSM_UART_DM_MR1_AUTO_RFR_LEVEL1 ;else - mask =UART_MR1_AUTO_RFR_LEVEL1 ; + mask =MSM_UART_MR1_AUTO_RFR_LEVEL1 ; data &= ~mask; - data &= ~UART_MR1_AUTO_RFR_LEVEL0 ; + data &= ~MSM_UART_MR1_AUTO_RFR_LEVEL0 ; data |= mask & (rfr_level <<2 ); - data |=UART_MR1_AUTO_RFR_LEVEL0 & rfr_level; -msm_write (port, data,UART_MR1 ); + data |=MSM_UART_MR1_AUTO_RFR_LEVEL0 & rfr_level; +msm_write (port, data,MSM_UART_MR1 );if (msm_port->is_uartdm) {msm_request_tx_dma (msm_port, msm_port->uart.mapbase);
@@ -1252,7 +1252,7 @@ static void msm_shutdown(struct uart_port *port)struct msm_port *msm_port =to_msm_port (port); msm_port->imr =0 ; -msm_write (port,0 ,UART_IMR );/* disable interrupts */ +msm_write (port,0 ,MSM_UART_IMR );/* disable interrupts */ if (msm_port->is_uartdm)msm_release_dma (msm_port);
@@ -1282,60 +1282,60 @@ static void msm_set_termios(struct uart_port *port, struct ktermios *termios,tty_termios_encode_baud_rate (termios, baud, baud);/* calculate parity */ - mr =msm_read (port,UART_MR2 ); - mr &= ~UART_MR2_PARITY_MODE ; + mr =msm_read (port,MSM_UART_MR2 ); + mr &= ~MSM_UART_MR2_PARITY_MODE ;if (termios->c_cflag &PARENB ) {if (termios->c_cflag &PARODD ) - mr |=UART_MR2_PARITY_MODE_ODD ; + mr |=MSM_UART_MR2_PARITY_MODE_ODD ;else if (termios->c_cflag &CMSPAR ) - mr |=UART_MR2_PARITY_MODE_SPACE ; + mr |=MSM_UART_MR2_PARITY_MODE_SPACE ;else - mr |=UART_MR2_PARITY_MODE_EVEN ; + mr |=MSM_UART_MR2_PARITY_MODE_EVEN ; }/* calculate bits per char */ - mr &= ~UART_MR2_BITS_PER_CHAR ; + mr &= ~MSM_UART_MR2_BITS_PER_CHAR ;switch (termios->c_cflag &CSIZE ) {case CS5 : - mr |=UART_MR2_BITS_PER_CHAR_5 ; + mr |=MSM_UART_MR2_BITS_PER_CHAR_5 ;break ;case CS6 : - mr |=UART_MR2_BITS_PER_CHAR_6 ; + mr |=MSM_UART_MR2_BITS_PER_CHAR_6 ;break ;case CS7 : - mr |=UART_MR2_BITS_PER_CHAR_7 ; + mr |=MSM_UART_MR2_BITS_PER_CHAR_7 ;break ;case CS8 :default : - mr |=UART_MR2_BITS_PER_CHAR_8 ; + mr |=MSM_UART_MR2_BITS_PER_CHAR_8 ;break ; }/* calculate stop bits */ - mr &= ~(UART_MR2_STOP_BIT_LEN_ONE |UART_MR2_STOP_BIT_LEN_TWO ); + mr &= ~(MSM_UART_MR2_STOP_BIT_LEN_ONE |MSM_UART_MR2_STOP_BIT_LEN_TWO );if (termios->c_cflag &CSTOPB ) - mr |=UART_MR2_STOP_BIT_LEN_TWO ; + mr |=MSM_UART_MR2_STOP_BIT_LEN_TWO ;else - mr |=UART_MR2_STOP_BIT_LEN_ONE ; + mr |=MSM_UART_MR2_STOP_BIT_LEN_ONE ;/* set parity, bits per char, and stop bit */ -msm_write (port, mr,UART_MR2 ); +msm_write (port, mr,MSM_UART_MR2 );/* calculate and set hardware flow control */ - mr =msm_read (port,UART_MR1 ); - mr &= ~(UART_MR1_CTS_CTL |UART_MR1_RX_RDY_CTL ); + mr =msm_read (port,MSM_UART_MR1 ); + mr &= ~(MSM_UART_MR1_CTS_CTL |MSM_UART_MR1_RX_RDY_CTL );if (termios->c_cflag &CRTSCTS ) { - mr |=UART_MR1_CTS_CTL ; - mr |=UART_MR1_RX_RDY_CTL ; + mr |=MSM_UART_MR1_CTS_CTL ; + mr |=MSM_UART_MR1_RX_RDY_CTL ; } -msm_write (port, mr,UART_MR1 ); +msm_write (port, mr,MSM_UART_MR1 );/* Configure status bits to ignore based on termio flags. */ port->read_status_mask =0 ;if (termios->c_iflag &INPCK ) - port->read_status_mask |=UART_SR_PAR_FRAME_ERR ; + port->read_status_mask |=MSM_UART_SR_PAR_FRAME_ERR ;if (termios->c_iflag & (IGNBRK |BRKINT |PARMRK )) - port->read_status_mask |=UART_SR_RX_BREAK ; + port->read_status_mask |=MSM_UART_SR_RX_BREAK ;uart_update_timeout (port, termios->c_cflag, baud);
@@ -1439,9 +1439,9 @@ static void msm_power(struct uart_port *port, unsigned int state,static int msm_poll_get_char_single (struct uart_port *port) {struct msm_port *msm_port =to_msm_port (port); -unsigned int rf_reg = msm_port->is_uartdm ?UARTDM_RF :UART_RF ; +unsigned int rf_reg = msm_port->is_uartdm ?UARTDM_RF :MSM_UART_RF ; -if (!(msm_read (port,UART_SR ) &UART_SR_RX_READY )) +if (!(msm_read (port,MSM_UART_SR ) &MSM_UART_SR_RX_READY ))return NO_POLL_CHAR ;return msm_read (port, rf_reg) &0xff ;
@@ -1459,7 +1459,7 @@ static int msm_poll_get_char_dm(struct uart_port *port) c = sp[sizeof (slop) - count]; count--;/* Or if FIFO is empty */ - }else if (!(msm_read (port,UART_SR ) &UART_SR_RX_READY )) { + }else if (!(msm_read (port,MSM_UART_SR ) &MSM_UART_SR_RX_READY )) {/* * If RX packing buffer has less than a word, force stale to * push contents into RX FIFO
@@ -1467,14 +1467,13 @@ static int msm_poll_get_char_dm(struct uart_port *port) count =msm_read (port,UARTDM_RXFS ); count = (count >>UARTDM_RXFS_BUF_SHIFT ) &UARTDM_RXFS_BUF_MASK ;if (count) { -msm_write (port,UART_CR_CMD_FORCE_STALE ,UART_CR ); +msm_write (port,MSM_UART_CR_CMD_FORCE_STALE ,MSM_UART_CR ); slop =msm_read (port,UARTDM_RF ); c = sp[0 ]; count--; -msm_write (port,UART_CR_CMD_RESET_STALE_INT ,UART_CR ); +msm_write (port,MSM_UART_CR_CMD_RESET_STALE_INT ,MSM_UART_CR );msm_write (port,0xFFFFFF ,UARTDM_DMRX ); -msm_write (port,UART_CR_CMD_STALE_EVENT_ENABLE , -UART_CR ); +msm_write (port,MSM_UART_CR_CMD_STALE_EVENT_ENABLE ,MSM_UART_CR ); }else { c =NO_POLL_CHAR ; }
@@ -1495,8 +1494,8 @@ static int msm_poll_get_char(struct uart_port *port)struct msm_port *msm_port =to_msm_port (port);/* Disable all interrupts */ - imr =msm_read (port,UART_IMR ); -msm_write (port,0 ,UART_IMR ); + imr =msm_read (port,MSM_UART_IMR ); +msm_write (port,0 ,MSM_UART_IMR );if (msm_port->is_uartdm) c =msm_poll_get_char_dm (port);
@@ -1504,7 +1503,7 @@ static int msm_poll_get_char(struct uart_port *port) c =msm_poll_get_char_single (port);/* Enable interrupts */ -msm_write (port, imr,UART_IMR ); +msm_write (port, imr,MSM_UART_IMR );return c; }
@@ -1515,25 +1514,25 @@ static void msm_poll_put_char(struct uart_port *port, unsigned char c)struct msm_port *msm_port =to_msm_port (port);/* Disable all interrupts */ - imr =msm_read (port,UART_IMR ); -msm_write (port,0 ,UART_IMR ); + imr =msm_read (port,MSM_UART_IMR ); +msm_write (port,0 ,MSM_UART_IMR );if (msm_port->is_uartdm)msm_reset_dm_count (port,1 );/* Wait until FIFO is empty */ -while (!(msm_read (port,UART_SR ) &UART_SR_TX_READY )) +while (!(msm_read (port,MSM_UART_SR ) &MSM_UART_SR_TX_READY ))cpu_relax ();/* Write a character */ -msm_write (port, c, msm_port->is_uartdm ?UARTDM_TF :UART_TF ); +msm_write (port, c, msm_port->is_uartdm ?UARTDM_TF :MSM_UART_TF );/* Wait until FIFO is empty */ -while (!(msm_read (port,UART_SR ) &UART_SR_TX_READY )) +while (!(msm_read (port,MSM_UART_SR ) &MSM_UART_SR_TX_READY ))cpu_relax ();/* Enable interrupts */ - msm_write(port, imr, UART_IMR); + msm_write(port, imr, MSM_UART_IMR); }#endif
@@ -1591,7 +1590,7 @@ static struct msm_port msm_uart_ports[] = { }, }; -#define UART_NR ARRAY_SIZE(msm_uart_ports) +#define MSM_UART_NR ARRAY_SIZE(msm_uart_ports)static inline struct uart_port *msm_get_port_from_line (unsigned int line) {
@@ -1612,7 +1611,7 @@ static void __msm_console_write(struct uart_port *port, const char *s,if (is_uartdm) tf = port->membase +UARTDM_TF ;else - tf = port->membase +UART_TF ; + tf = port->membase +MSM_UART_TF ;/* Account for newlines that will get a carriage return added */ for (i =0 ; i < count; i++)
@@ -1658,7 +1657,7 @@ static void __msm_console_write(struct uart_port *port, const char *s, } } -while (!(msm_read (port,UART_SR ) &UART_SR_TX_READY )) +while (!(msm_read (port,MSM_UART_SR ) &MSM_UART_SR_TX_READY ))cpu_relax ();iowrite32_rep (tf, buf,1 );
@@ -1677,7 +1676,7 @@ static void msm_console_write(struct console *co, const char *s,struct uart_port *port;struct msm_port *msm_port; -BUG_ON (co->index <0 || co->index >=UART_NR ); +BUG_ON (co->index <0 || co->index >=MSM_UART_NR ); port =msm_get_port_from_line (co->index); msm_port =to_msm_port (port);
@@ -1693,7 +1692,7 @@ static int msm_console_setup(struct console *co, char *options)int parity ='n' ;int flow ='n' ; -if (unlikely (co->index >=UART_NR || co->index <0 )) +if (unlikely (co->index >=MSM_UART_NR || co->index <0 ))return -ENXIO ; port =msm_get_port_from_line (co->index);
@@ -1774,7 +1773,7 @@ static struct uart_driver msm_uart_driver = { .owner = THIS_MODULE, .driver_name = "msm_serial", .dev_name = "ttyMSM", - .nr = UART_NR, + .nr = MSM_UART_NR, .cons = MSM_CONSOLE, };
@@ -1804,7 +1803,7 @@ static int msm_serial_probe(struct platform_device *pdev)if (line <0 ) line =atomic_inc_return (&msm_uart_next_id) -1 ; -if (unlikely (line <0 || line >=UART_NR )) +if (unlikely (line <0 || line >=MSM_UART_NR ))return -ENXIO ;dev_info (&pdev->dev,"msm_serial: detected port #%d\n" , line);
Signature · 1 line
2.30.2
PATCH v3 3/6 serial: Use bits for UART_LSR_BRK_ERROR_BITS/MSR_ANY_DELTA
In reply to Ilpo JärvinenInstead of listing the bits for UART_LSR_BRK_ERROR_BITS and UART_MSR_ANY_DELTA in comment, use them to define instead.
--- include/uapi/linux/serial_reg.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
include/uapi/linux/serial_reg.h +2 -2
@@ -139,7 +139,7 @@#define UART_LSR_PE 0x04/* Parity error indicator */ #define UART_LSR_OE 0x02/* Overrun error indicator */ #define UART_LSR_DR 0x01/* Receiver data ready */ -#define UART_LSR_BRK_ERROR_BITS 0x1E/* BI, FE, PE, OE bits */ +#define UART_LSR_BRK_ERROR_BITS (UART_LSR_BI|UART_LSR_FE|UART_LSR_PE|UART_LSR_OE)#define UART_MSR 6/* In: Modem Status Register */ #define UART_MSR_DCD 0x80/* Data Carrier Detect */
@@ -150,7 +150,7 @@#define UART_MSR_TERI 0x04/* Trailing edge ring indicator */ #define UART_MSR_DDSR 0x02/* Delta DSR */ #define UART_MSR_DCTS 0x01/* Delta CTS */ -#define UART_MSR_ANY_DELTA 0x0F/* Any of the delta bits! */ +#define UART_MSR_ANY_DELTA (UART_MSR_DDCD|UART_MSR_TERI|UART_MSR_DDSR|UART_MSR_DCTS)#define UART_SCR 7/* I/O: Scratch Register */
Signature · 1 line
2.30.2
PATCH v3 4/6 serial: 8250: Use C99 array initializer & define UART_REG_UNMAPPED
In reply to Ilpo JärvinenUse C99 array initializer insteads of comments and make unmapped checks more obvious.
--- drivers/tty/serial/8250/8250_port.c | 38 +++++++++++++++-------------- 1 file changed, 20 insertions(+), 18 deletions(-)
drivers/tty/serial/8250/8250_port.c +20 -18
@@ -336,27 +336,29 @@ static void default_serial_dl_write(struct uart_8250_port *up, int value)#ifdef CONFIG_SERIAL_8250_RT288X +#define UART_REG_UNMAPPED -1 +/* Au1x00/RT288x UART hardware has a weird register layout */ static const s8 au_io_in_map[8 ] = { -0 ,/* UART_RX */ -2 ,/* UART_IER */ -3 ,/* UART_IIR */ -5 ,/* UART_LCR */ -6 ,/* UART_MCR */ -7 ,/* UART_LSR */ -8 ,/* UART_MSR */ --1 ,/* UART_SCR (unmapped) */ + [UART_RX ] =0 , + [UART_IER ] =2 , + [UART_IIR ] =3 , + [UART_LCR ] =5 , + [UART_MCR ] =6 , + [UART_LSR ] =7 , + [UART_MSR ] =8 , + [UART_SCR ] =UART_REG_UNMAPPED , };static const s8 au_io_out_map[8 ] = { -1 ,/* UART_TX */ -2 ,/* UART_IER */ -4 ,/* UART_FCR */ -5 ,/* UART_LCR */ -6 ,/* UART_MCR */ --1 ,/* UART_LSR (unmapped) */ --1 ,/* UART_MSR (unmapped) */ --1 ,/* UART_SCR (unmapped) */ + [UART_TX ] =1 , + [UART_IER ] =2 , + [UART_FCR ] =4 , + [UART_LCR ] =5 , + [UART_MCR ] =6 , + [UART_LSR ] =UART_REG_UNMAPPED , + [UART_MSR ] =UART_REG_UNMAPPED , + [UART_SCR ] =UART_REG_UNMAPPED , };unsigned int au_serial_in (struct uart_port *p,int offset)
@@ -364,7 +366,7 @@ unsigned int au_serial_in(struct uart_port *p, int offset)if (offset >=ARRAY_SIZE (au_io_in_map))return UINT_MAX ; offset = au_io_in_map[offset]; -if (offset <0 ) +if (offset ==UART_REG_UNMAPPED )return UINT_MAX ;return __raw_readl (p->membase + (offset << p->regshift)); }
@@ -374,7 +376,7 @@ void au_serial_out(struct uart_port *p, int offset, int value)if (offset >=ARRAY_SIZE (au_io_out_map))return ; offset = au_io_out_map[offset]; -if (offset <0 ) +if (offset ==UART_REG_UNMAPPED )return ;__raw_writel (value, p->membase + (offset << p->regshift)); }
Signature · 1 line
2.30.2
PATCH v3 5/6 serial: Convert SERIAL_XMIT_SIZE to UART_XMIT_SIZE
In reply to Ilpo JärvinenBoth UART_XMIT_SIZE and SERIAL_XMIT_SIZE are defined. Make them all UART_XMIT_SIZE.
--- drivers/tty/amiserial.c | 18 +++++++++--------- drivers/tty/mips_ejtag_fdc.c | 2 +- drivers/tty/serial/meson_uart.c | 2 +- drivers/tty/serial/owl-uart.c | 2 +- drivers/tty/serial/rda-uart.c | 2 +- include/linux/serial.h | 6 ------ 6 files changed, 13 insertions(+), 19 deletions(-)
drivers/tty/amiserial.c +9 -9
@@ -51,6 +51,7 @@#include <linux/seq_file.h> #include <linux/serial.h> #include <linux/serial_reg.h> +#include <linux/serial_core.h> #include <linux/sched.h> #include <linux/signal.h> #include <linux/slab.h>
@@ -283,12 +284,12 @@ static void transmit_chars(struct serial_state *info) amiga_custom.serdat = info->xmit.buf[info->xmit.tail++] |0x100 ;mb (); - info->xmit.tail = info->xmit.tail & (SERIAL_XMIT_SIZE -1 ); + info->xmit.tail = info->xmit.tail & (UART_XMIT_SIZE -1 ); info->icount.tx++;if (CIRC_CNT (info->xmit.head, info->xmit.tail, -SERIAL_XMIT_SIZE ) <WAKEUP_CHARS ) +UART_XMIT_SIZE ) <WAKEUP_CHARS )tty_wakeup (info->tport.tty);#ifdef SERIAL_DEBUG_INTR
@@ -708,13 +709,13 @@ static int rs_put_char(struct tty_struct *tty, unsigned char ch)local_irq_save (flags);if (CIRC_SPACE (info->xmit.head, info->xmit.tail, -SERIAL_XMIT_SIZE ) ==0 ) { +UART_XMIT_SIZE ) ==0 ) {local_irq_restore (flags);return 0 ; } info->xmit.buf[info->xmit.head++] = ch; - info->xmit.head &=SERIAL_XMIT_SIZE -1 ; + info->xmit.head &=UART_XMIT_SIZE -1 ;local_irq_restore (flags);return 1 ; }
@@ -753,15 +754,14 @@ static int rs_write(struct tty_struct * tty, const unsigned char *buf, int countwhile (1 ) { c =CIRC_SPACE_TO_END (info->xmit.head, info->xmit.tail, -SERIAL_XMIT_SIZE ); +UART_XMIT_SIZE );if (count < c) c = count;if (c <=0 ) {break ; }memcpy (info->xmit.buf + info->xmit.head, buf, c); - info->xmit.head = ((info->xmit.head + c) & - (SERIAL_XMIT_SIZE -1 )); + info->xmit.head = (info->xmit.head + c) & (UART_XMIT_SIZE -1 ); buf += c; count -= c; ret += c;
@@ -788,14 +788,14 @@ static unsigned int rs_write_room(struct tty_struct *tty) {struct serial_state *info = tty->driver_data; -return CIRC_SPACE (info->xmit.head, info->xmit.tail,SERIAL_XMIT_SIZE ); +return CIRC_SPACE (info->xmit.head, info->xmit.tail,UART_XMIT_SIZE ); }static unsigned int rs_chars_in_buffer (struct tty_struct *tty) {struct serial_state *info = tty->driver_data; -return CIRC_CNT (info->xmit.head, info->xmit.tail,SERIAL_XMIT_SIZE ); +return CIRC_CNT (info->xmit.head, info->xmit.tail,UART_XMIT_SIZE ); }static void rs_flush_buffer (struct tty_struct *tty)
drivers/tty/mips_ejtag_fdc.c +1 -1
@@ -916,7 +916,7 @@ static int mips_ejtag_fdc_tty_probe(struct mips_cdmm_device *dev)mips_ejtag_fdc_write (priv,REG_FDCFG , cfg);/* Make each port's xmit FIFO big enough to fill FDC TX FIFO */ - priv->xmit_size =min (tx_fifo *4 , (unsigned int )SERIAL_XMIT_SIZE ); + priv->xmit_size =min (tx_fifo *4 , (unsigned int )UART_XMIT_SIZE ); driver =tty_alloc_driver (NUM_TTY_CHANNELS ,TTY_DRIVER_REAL_RAW );if (IS_ERR (driver))
drivers/tty/serial/meson_uart.c +1 -1
@@ -162,7 +162,7 @@ static void meson_uart_start_tx(struct uart_port *port) ch = xmit->buf[xmit->tail];writel (ch, port->membase +AML_UART_WFIFO ); - xmit->tail = (xmit->tail+1 ) & (SERIAL_XMIT_SIZE -1 ); + xmit->tail = (xmit->tail +1 ) & (UART_XMIT_SIZE -1 ); port->icount.tx++; }
drivers/tty/serial/owl-uart.c +1 -1
@@ -201,7 +201,7 @@ static void owl_uart_send_chars(struct uart_port *port) ch = xmit->buf[xmit->tail];owl_uart_write (port, ch,OWL_UART_TXDAT ); - xmit->tail = (xmit->tail +1 ) & (SERIAL_XMIT_SIZE -1 ); + xmit->tail = (xmit->tail +1 ) & (UART_XMIT_SIZE -1 ); port->icount.tx++; }
drivers/tty/serial/rda-uart.c +1 -1
@@ -353,7 +353,7 @@ static void rda_uart_send_chars(struct uart_port *port) ch = xmit->buf[xmit->tail];rda_uart_write (port, ch,RDA_UART_RXTX_BUFFER ); - xmit->tail = (xmit->tail +1 ) & (SERIAL_XMIT_SIZE -1 ); + xmit->tail = (xmit->tail +1 ) & (UART_XMIT_SIZE -1 ); port->icount.tx++; }
include/linux/serial.h +0 -6
@@ -9,7 +9,6 @@#ifndef _LINUX_SERIAL_H#define _LINUX_SERIAL_H -#include <asm/page.h> #include <uapi/linux/serial.h> /* Helper for dealing with UART_LCR_WLEN* defines */
@@ -25,11 +24,6 @@ struct async_icount { __u32 buf_overrun; }; -/* -* The size of the serial xmit buffer is 1 page, or 4096 bytes -*/ -#define SERIAL_XMIT_SIZE PAGE_SIZE -#include <linux/compiler.h> #endif /* _LINUX_SERIAL_H */
Signature · 1 line
2.30.2
Re: [PATCH v3 5/6] serial: Convert SERIAL_XMIT_SIZE to UART_XMIT_SIZE
Quoted 4 lines · Ilpo Järvinen
Both
UART_XMIT_SIZEandSERIAL_XMIT_SIZEare defined. Make them allUART_XMIT_SIZE.Signed-off-by Ilpo Järvinen <[email protected]>
Signature · 2 lines
js suse labs
PATCH v3 6/6 serial: Consolidate BOTH_EMPTY use
In reply to Ilpo JärvinenPer file BOTH_EMPTY defines are littering our source code here and there. Define once in serial.h and create helper for the check too.
--- arch/mips/ath79/early_printk.c | 9 +++++---- drivers/accessibility/speakup/serialio.h | 3 +-- drivers/tty/serial/8250/8250_early.c | 4 +--- drivers/tty/serial/8250/8250_port.c | 12 +++++------- drivers/tty/serial/omap-serial.c | 7 +++---- drivers/tty/serial/pch_uart.c | 7 +++---- drivers/tty/serial/pxa.c | 5 ++--- drivers/tty/serial/sunsu.c | 4 +--- drivers/tty/serial/vr41xx_siu.c | 4 +--- include/linux/serial.h | 9 +++++++++ 10 files changed, 31 insertions(+), 33 deletions(-)
arch/mips/ath79/early_printk.c +5 -4
@@ -8,6 +8,7 @@#include <linux/io.h> #include <linux/errno.h> +#include <linux/serial.h> #include <linux/serial_reg.h> #include <asm/addrspace.h> #include <asm/setup.h>
@@ -29,15 +30,15 @@ static inline void prom_putchar_wait(void __iomem *reg, u32 mask, u32 val) }while (1 ); } -#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) -static void prom_putchar_ar71xx (char ch) {void __iomem *base = (void __iomem *)(KSEG1ADDR (AR71XX_UART_BASE )); -prom_putchar_wait (base +UART_LSR *4 ,BOTH_EMPTY ,BOTH_EMPTY ); +prom_putchar_wait (base +UART_LSR *4 ,UART_LSR_BOTH_EMPTY , +UART_LSR_BOTH_EMPTY );__raw_writel ((unsigned char )ch, base +UART_TX *4 ); -prom_putchar_wait (base +UART_LSR *4 ,BOTH_EMPTY ,BOTH_EMPTY ); +prom_putchar_wait (base +UART_LSR *4 ,UART_LSR_BOTH_EMPTY , +UART_LSR_BOTH_EMPTY ); }static void prom_putchar_ar933x (char ch)
drivers/accessibility/speakup/serialio.h +1 -2
@@ -33,9 +33,8 @@ struct old_serial_port {#define NUM_DISABLE_TIMEOUTS 3/* buffer timeout in ms */ #define SPK_TIMEOUT 100 -#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE)#define spk_serial_tx_busy () \ - ((inb(speakup_info.port_tts + UART_LSR) & BOTH_EMPTY) != BOTH_EMPTY) + (!uart_lsr_tx_empty(inb(speakup_info.port_tts + UART_LSR)))#endif
drivers/tty/serial/8250/8250_early.c +1 -3
@@ -84,8 +84,6 @@ static void serial8250_early_out(struct uart_port *port, int offset, int value) } } -#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) -static void serial_putc (struct uart_port *port,unsigned char c) {unsigned int status;
@@ -94,7 +92,7 @@ static void serial_putc(struct uart_port *port, unsigned char c)for (;;) { status =serial8250_early_in (port,UART_LSR ); -if ((status &BOTH_EMPTY ) ==BOTH_EMPTY ) +if (uart_lsr_tx_empty (status))break ;cpu_relax (); }
drivers/tty/serial/8250/8250_port.c +5 -7
@@ -50,8 +50,6 @@ #define DEBUG_AUTOCONF(fmt...) do { } while (0)#endif -#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) -/* * Here we define the default xmit fifo size used for each type of UART. */
@@ -1841,7 +1839,7 @@ void serial8250_tx_chars(struct uart_8250_port *up)if (uart_circ_empty (xmit))break ;if ((up->capabilities &UART_CAP_HFIFO ) && - (serial_in (up,UART_LSR ) &BOTH_EMPTY ) !=BOTH_EMPTY ) + !uart_lsr_tx_empty (serial_in (up,UART_LSR )))break ;/* The BCM2835 MINI UART THRE bit is really a not-full bit. */ if ((up->capabilities & UART_CAP_MINI) &&
@@ -2001,7 +1999,7 @@ static unsigned int serial8250_tx_empty(struct uart_port *port)serial8250_rpm_put (up); -return (lsr &BOTH_EMPTY ) ==BOTH_EMPTY ?TIOCSER_TEMT :0 ; +return uart_lsr_tx_empty (lsr) ?TIOCSER_TEMT :0 ; }unsigned int serial8250_do_get_mctrl (struct uart_port *port)
@@ -2149,7 +2147,7 @@ static void serial8250_put_poll_char(struct uart_port *port,else serial_port_out (port,UART_IER ,0 ); -wait_for_xmitr (up,BOTH_EMPTY ); +wait_for_xmitr (up,UART_LSR_BOTH_EMPTY );/* * Send the character out. */
@@ -2159,7 +2157,7 @@ static void serial8250_put_poll_char(struct uart_port *port,* Finally, wait for transmitter to become empty * and restore the IER */ -wait_for_xmitr (up,BOTH_EMPTY ); +wait_for_xmitr (up,UART_LSR_BOTH_EMPTY );serial_port_out (port,UART_IER , ier);serial8250_rpm_put (up); }
@@ -3429,7 +3427,7 @@ void serial8250_console_write(struct uart_8250_port *up, const char *s,* Finally, wait for transmitter to become empty * and restore the IER */ -wait_for_xmitr (up,BOTH_EMPTY ); +wait_for_xmitr (up,UART_LSR_BOTH_EMPTY );if (em485) {mdelay (port->rs485.delay_rts_after_send);
drivers/tty/serial/omap-serial.c +3 -4
@@ -19,6 +19,7 @@#include <linux/module.h> #include <linux/init.h> #include <linux/console.h> +#include <linux/serial.h> #include <linux/serial_reg.h> #include <linux/delay.h> #include <linux/slab.h>
@@ -1102,8 +1103,6 @@ serial_omap_type(struct uart_port *port)return up->name; } -#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) -static void __maybe_unused wait_for_xmitr (struct uart_omap_port *up) {unsigned int status, tmout =10000 ;
@@ -1118,7 +1117,7 @@ static void __maybe_unused wait_for_xmitr(struct uart_omap_port *up)if (--tmout ==0 )break ;udelay (1 ); - }while ((status &BOTH_EMPTY ) !=BOTH_EMPTY ); + }while (!uart_lsr_tx_empty (status));/* Wait up to 1s for flow control if necessary */ if (up->port.flags &UPF_CONS_FLOW ) {
@@ -1186,7 +1185,7 @@ static void omap_serial_early_putc(struct uart_port *port, unsigned char c)for (;;) { status =omap_serial_early_in (port,UART_LSR ); -if ((status &BOTH_EMPTY ) ==BOTH_EMPTY ) +if (uart_lsr_tx_empty (status))break ;cpu_relax (); }
drivers/tty/serial/pch_uart.c +3 -4
@@ -3,6 +3,7 @@*Copyright (C) 2011 LAPIS Semiconductor Co., Ltd. */ #include <linux/kernel.h> +#include <linux/serial.h> #include <linux/serial_reg.h> #include <linux/slab.h> #include <linux/module.h>
@@ -189,8 +190,6 @@ enum {#define PCH_UART_HAL_LOOP (PCH_UART_MCR_LOOP)#define PCH_UART_HAL_AFE (PCH_UART_MCR_AFE) -#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) -#define DEFAULT_UARTCLK 1843200/* 1.8432 MHz */ #define CMITC_UARTCLK 192000000/* 192.0000 MHz */ #define FRI2_64_UARTCLK 64000000/* 64.0000 MHz */
@@ -1516,7 +1515,7 @@ static void pch_uart_put_poll_char(struct uart_port *port,* Finally, wait for transmitter to become empty * and restore the IER */ -wait_for_xmitr (priv,BOTH_EMPTY ); +wait_for_xmitr (priv,UART_LSR_BOTH_EMPTY ); iowrite8(ier, priv->membase + UART_IER); }#endif /* CONFIG_CONSOLE_POLL */
@@ -1602,7 +1601,7 @@ pch_console_write(struct console *co, const char *s, unsigned int count)* Finally, wait for transmitter to become empty * and restore the IER */ -wait_for_xmitr (priv,BOTH_EMPTY ); +wait_for_xmitr (priv,UART_LSR_BOTH_EMPTY );iowrite8 (ier, priv->membase +UART_IER );if (port_locked)
drivers/tty/serial/pxa.c +2 -3
@@ -23,6 +23,7 @@#include <linux/init.h> #include <linux/console.h> #include <linux/sysrq.h> +#include <linux/serial.h> #include <linux/serial_reg.h> #include <linux/circ_buf.h> #include <linux/delay.h>
@@ -575,8 +576,6 @@ static struct uart_driver serial_pxa_reg;#ifdef CONFIG_SERIAL_PXA_CONSOLE -#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) -/* * Wait for transmitter & holding register to empty */
@@ -594,7 +593,7 @@ static void wait_for_xmitr(struct uart_pxa_port *up)if (--tmout ==0 )break ;udelay (1 ); - }while ((status &BOTH_EMPTY ) !=BOTH_EMPTY ); + }while (!uart_lsr_tx_empty (status));/* Wait up to 1s for flow control if necessary */ if (up->port.flags &UPF_CONS_FLOW ) {
drivers/tty/serial/sunsu.c +1 -3
@@ -1249,8 +1249,6 @@ static int sunsu_kbd_ms_init(struct uart_sunsu_port *up)#ifdef CONFIG_SERIAL_SUNSU_CONSOLE -#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) -/* * Wait for transmitter & holding register to empty */
@@ -1268,7 +1266,7 @@ static void wait_for_xmitr(struct uart_sunsu_port *up)if (--tmout ==0 )break ;udelay (1 ); - }while ((status &BOTH_EMPTY ) !=BOTH_EMPTY ); + }while (!uart_lsr_tx_empty (status));/* Wait up to 1s for flow control if necessary */ if (up->port.flags &UPF_CONS_FLOW ) {
drivers/tty/serial/vr41xx_siu.c +1 -3
@@ -703,8 +703,6 @@ static int siu_init_ports(struct platform_device *pdev)#ifdef CONFIG_SERIAL_VR41XX_CONSOLE -#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) -static void wait_for_xmitr (struct uart_port *port) {int timeout =10000 ;
@@ -715,7 +713,7 @@ static void wait_for_xmitr(struct uart_port *port)if (lsr &UART_LSR_BI ) lsr_break_flag[port->line] =UART_LSR_BI ; -if ((lsr &BOTH_EMPTY ) ==BOTH_EMPTY ) +if (uart_lsr_tx_empty (lsr))break ; }while (timeout-- >0 );
include/linux/serial.h +9 -0
@@ -10,10 +10,19 @@#define _LINUX_SERIAL_H#include <uapi/linux/serial.h> +#include <uapi/linux/serial_reg.h> /* Helper for dealing with UART_LCR_WLEN* defines */ #define UART_LCR_WLEN (x) ((x) - 5) +/* FIFO and shifting register empty */ +#define UART_LSR_BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) + +static inline bool uart_lsr_tx_empty (u16 lsr) +{ +return (lsr &UART_LSR_BOTH_EMPTY ) ==UART_LSR_BOTH_EMPTY ; +} +/* * Counters of the input lines (CTS, DSR, RI, CD) interrupts */
Signature · 1 line
2.30.2