From: Yunhui Cui <cuiyunhui@bytedance.com>
To: arnd@arndb.de, andriy.shevchenko@linux.intel.com,
benjamin.larsson@genexis.eu, cuiyunhui@bytedance.com,
gregkh@linuxfoundation.org, heikki.krogerus@linux.intel.com,
ilpo.jarvinen@linux.intel.com, jirislaby@kernel.org,
jkeeping@inmusicbrands.com, john.ogness@linutronix.de,
linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org,
markus.mayer@linaro.org, matt.porter@linaro.org,
namcao@linutronix.de, paulmck@kernel.org, pmladek@suse.com,
schnelle@linux.ibm.com, sunilvl@ventanamicro.com,
tim.kryger@linaro.org
Subject: [PATCH v6 2/4] serial: 8250: avoid potential PSLVERR issue
Date: Tue, 13 May 2025 10:42:10 +0800 [thread overview]
Message-ID: <20250513024212.74658-2-cuiyunhui@bytedance.com> (raw)
In-Reply-To: <20250513024212.74658-1-cuiyunhui@bytedance.com>
When the PSLVERR_RESP_EN parameter is set to 1, reading UART_RX while
the FIFO is enabled and UART_LSR_DR is not set will generate a PSLVERR
error.
Failure to check the UART_LSR_DR before reading UART_RX, or the non-
atomic nature of clearing the FIFO and reading UART_RX, poses
potential risks that could lead to PSLVERR.
PSLVERR is addressed through two methods. One is to introduce
serial8250_discard_data() to check whether UART_LSR_DR is set before
reading UART_RX, thus solving the PSLVERR issue when the FIFO is
enabled. The other is to place FIFO clearing and reading of UART_RX
under port->lock.
Signed-off-by: Yunhui Cui <cuiyunhui@bytedance.com>
---
drivers/tty/serial/8250/8250.h | 13 ++++++++
drivers/tty/serial/8250/8250_port.c | 47 +++++++++++++++--------------
2 files changed, 38 insertions(+), 22 deletions(-)
diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h
index 18530c31a5981..b3fb8a550db35 100644
--- a/drivers/tty/serial/8250/8250.h
+++ b/drivers/tty/serial/8250/8250.h
@@ -162,6 +162,19 @@ static inline u16 serial_lsr_in(struct uart_8250_port *up)
return lsr;
}
+/*
+ * To avoid PSLVERR, check UART_LSR_DR in UART_LSR before
+ * reading UART_RX.
+ */
+static inline void serial8250_discard_data(struct uart_8250_port *up)
+{
+ u16 lsr;
+
+ lsr = serial_in(up, UART_LSR);
+ if (lsr & UART_LSR_DR)
+ serial_in(up, UART_RX);
+}
+
/*
* For the 16C950
*/
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index 07fe818dffa34..9a04f24b0c762 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -1353,9 +1353,8 @@ static void autoconfig_irq(struct uart_8250_port *up)
/* Synchronize UART_IER access against the console. */
uart_port_lock_irq(port);
serial_out(up, UART_IER, UART_IER_ALL_INTR);
+ serial8250_discard_data(up);
uart_port_unlock_irq(port);
- serial_in(up, UART_LSR);
- serial_in(up, UART_RX);
serial_in(up, UART_IIR);
serial_in(up, UART_MSR);
serial_out(up, UART_TX, 0xFF);
@@ -2133,25 +2132,22 @@ static void wait_for_xmitr(struct uart_8250_port *up, int bits)
static int serial8250_get_poll_char(struct uart_port *port)
{
struct uart_8250_port *up = up_to_u8250p(port);
- int status;
+ int status = NO_POLL_CHAR;
u16 lsr;
+ unsigned long flags;
serial8250_rpm_get(up);
+ uart_port_lock_irqsave(port, &flags);
lsr = serial_port_in(port, UART_LSR);
+ if (lsr & UART_LSR_DR)
+ status = serial_port_in(port, UART_RX);
+ uart_port_unlock_irqrestore(port, flags);
- if (!(lsr & UART_LSR_DR)) {
- status = NO_POLL_CHAR;
- goto out;
- }
-
- status = serial_port_in(port, UART_RX);
-out:
serial8250_rpm_put(up);
return status;
}
-
static void serial8250_put_poll_char(struct uart_port *port,
unsigned char c)
{
@@ -2260,13 +2256,20 @@ int serial8250_do_startup(struct uart_port *port)
* Clear the FIFO buffers and disable them.
* (they will be reenabled in set_termios())
*/
+ uart_port_lock_irqsave(port, &flags);
serial8250_clear_fifos(up);
/*
- * Clear the interrupt registers.
+ * Read UART_RX to clear interrupts (e.g., Character Timeout).
+ * To prevent PSLVERR, we can either disable the FIFO before reading
+ * UART_RX or read UART_RX only when UART_LSR_DR is set while the FIFO
+ * remains enabled. If using the latter approach to avoid PSLVERR, it
+ * creates a contradiction with the interrupt-clearing (see the
+ * rx_timeout handling in dw8250_handle_irq()).
*/
serial_port_in(port, UART_LSR);
serial_port_in(port, UART_RX);
+ uart_port_unlock_irqrestore(port, flags);
serial_port_in(port, UART_IIR);
serial_port_in(port, UART_MSR);
@@ -2423,15 +2426,13 @@ int serial8250_do_startup(struct uart_port *port)
}
}
- uart_port_unlock_irqrestore(port, flags);
-
/*
* Clear the interrupt registers again for luck, and clear the
* saved flags to avoid getting false values from polling
* routines or the previous session.
*/
- serial_port_in(port, UART_LSR);
- serial_port_in(port, UART_RX);
+ serial8250_discard_data(up);
+ uart_port_unlock_irqrestore(port, flags);
serial_port_in(port, UART_IIR);
serial_port_in(port, UART_MSR);
up->lsr_saved_flags = 0;
@@ -2513,7 +2514,6 @@ void serial8250_do_shutdown(struct uart_port *port)
port->mctrl &= ~TIOCM_OUT2;
serial8250_set_mctrl(port, port->mctrl);
- uart_port_unlock_irqrestore(port, flags);
/*
* Disable break condition and FIFOs
@@ -2521,6 +2521,14 @@ void serial8250_do_shutdown(struct uart_port *port)
serial_port_out(port, UART_LCR,
serial_port_in(port, UART_LCR) & ~UART_LCR_SBC);
serial8250_clear_fifos(up);
+ /*
+ * Read data port to reset things, and then unlink from
+ * the IRQ chain.
+ * Since reading UART_RX clears interrupts, doing so with
+ * FIFO disabled won't trigger PSLVERR.
+ */
+ serial_port_in(port, UART_RX);
+ uart_port_unlock_irqrestore(port, flags);
#ifdef CONFIG_SERIAL_8250_RSA
/*
@@ -2529,11 +2537,6 @@ void serial8250_do_shutdown(struct uart_port *port)
disable_rsa(up);
#endif
- /*
- * Read data port to reset things, and then unlink from
- * the IRQ chain.
- */
- serial_port_in(port, UART_RX);
serial8250_rpm_put(up);
up->ops->release_irq(up);
--
2.39.2
next prev parent reply other threads:[~2025-05-13 2:42 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-05-13 2:42 [PATCH v6 1/4] serial: 8250: fix panic due to PSLVERR Yunhui Cui
2025-05-13 2:42 ` Yunhui Cui [this message]
2025-05-21 7:57 ` [PATCH v6 2/4] serial: 8250: avoid potential PSLVERR issue John Ogness
2025-05-28 3:29 ` [External] " yunhui cui
2025-05-13 2:42 ` [PATCH v6 3/4] serial: 8250_dw: assert port->lock is held in dw8250_force_idle() Yunhui Cui
2025-05-13 2:42 ` [PATCH v6 4/4] serial: 8250_dw: fix PSLVERR on RX_TIMEOUT Yunhui Cui
2025-05-21 6:21 ` [PATCH v6 1/4] serial: 8250: fix panic due to PSLVERR yunhui cui
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250513024212.74658-2-cuiyunhui@bytedance.com \
--to=cuiyunhui@bytedance.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=arnd@arndb.de \
--cc=benjamin.larsson@genexis.eu \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=ilpo.jarvinen@linux.intel.com \
--cc=jirislaby@kernel.org \
--cc=jkeeping@inmusicbrands.com \
--cc=john.ogness@linutronix.de \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=markus.mayer@linaro.org \
--cc=matt.porter@linaro.org \
--cc=namcao@linutronix.de \
--cc=paulmck@kernel.org \
--cc=pmladek@suse.com \
--cc=schnelle@linux.ibm.com \
--cc=sunilvl@ventanamicro.com \
--cc=tim.kryger@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®