From: "Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
To: linux-serial@vger.kernel.org,
Greg KH <gregkh@linuxfoundation.org>,
Jiri Slaby <jirislaby@kernel.org>, Lukas Wunner <lukas@wunner.de>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: "Johan Hovold" <johan@kernel.org>,
heiko@sntech.de, giulio.benetti@micronovasrl.com,
"Heikki Krogerus" <heikki.krogerus@linux.intel.com>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
"Ilpo Järvinen" <ilpo.jarvinen@linux.intel.com>
Subject: [PATCH v2 10/12] serial: 8250: create lsr_save_mask
Date: Mon, 4 Apr 2022 11:29:10 +0300 [thread overview]
Message-ID: <20220404082912.6885-11-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20220404082912.6885-1-ilpo.jarvinen@linux.intel.com>
Allow drivers to alter LSR save mask.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
drivers/tty/serial/8250/8250_core.c | 4 +++-
drivers/tty/serial/8250/8250_port.c | 6 +++---
include/linux/serial_8250.h | 1 +
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index f67bc3b76f65..7cb1267559d4 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -278,7 +278,7 @@ static void serial8250_backup_timeout(struct timer_list *t)
* ia64 and parisc boxes.
*/
lsr = serial_in(up, UART_LSR);
- up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
+ up->lsr_saved_flags |= lsr & up->lsr_save_mask;
if ((iir & UART_IIR_NO_INT) && (up->ier & UART_IER_THRI) &&
(!uart_circ_empty(&up->port.state->xmit) || up->port.x_char) &&
(lsr & UART_LSR_THRE)) {
@@ -1097,6 +1097,8 @@ int serial8250_register_8250_port(const struct uart_8250_port *up)
ret = 0;
}
+ uart->lsr_save_mask = up->lsr_save_mask ?: LSR_SAVE_FLAGS;
+
/* Initialise interrupt backoff work if required */
if (up->overrun_backoff_time_ms > 0) {
uart->overrun_backoff_time_ms =
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index 6e85ad0fade6..b3289ef117d1 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -1588,7 +1588,7 @@ static inline void __start_tx(struct uart_port *port)
unsigned int lsr;
lsr = serial_in(up, UART_LSR);
- up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
+ up->lsr_saved_flags |= lsr & up->lsr_save_mask;
if (lsr & UART_LSR_THRE)
serial8250_tx_chars(up);
}
@@ -2019,7 +2019,7 @@ static unsigned int serial8250_tx_empty(struct uart_port *port)
spin_lock_irqsave(&port->lock, flags);
lsr = serial_port_in(port, UART_LSR);
- up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
+ up->lsr_saved_flags |= lsr & up->lsr_save_mask;
spin_unlock_irqrestore(&port->lock, flags);
serial8250_rpm_put(up);
@@ -2100,7 +2100,7 @@ static void wait_for_xmitr(struct uart_8250_port *up, int bits)
for (;;) {
status = serial_in(up, UART_LSR);
- up->lsr_saved_flags |= status & LSR_SAVE_FLAGS;
+ up->lsr_saved_flags |= status & up->lsr_save_mask;
if ((status & bits) == bits)
break;
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index 921df4c60062..aff76ea22287 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -120,6 +120,7 @@ struct uart_8250_port {
*/
#define LSR_SAVE_FLAGS UART_LSR_BRK_ERROR_BITS
u16 lsr_saved_flags;
+ u16 lsr_save_mask;
#define MSR_SAVE_FLAGS UART_MSR_ANY_DELTA
unsigned char msr_saved_flags;
--
2.30.2
next prev parent reply other threads:[~2022-04-04 8:30 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-04 8:29 [PATCH v2 00/12] Add RS485 support to DW UART Ilpo Järvinen
2022-04-04 8:29 ` [PATCH v2 01/12] serial: Store character timing information to uart_port Ilpo Järvinen
2022-04-04 8:29 ` [PATCH v2 02/12] serial: 8250: Handle UART without interrupt on TEMT Ilpo Järvinen
2022-04-04 8:29 ` [PATCH v2 03/12] serial: 8250_dwlib: RS485 HW half & full duplex support Ilpo Järvinen
2022-04-04 8:29 ` [PATCH v2 04/12] serial: 8250_dwlib: Implement SW half " Ilpo Järvinen
2022-04-04 8:29 ` [PATCH v2 05/12] dt_bindings: rs485: Add receiver enable polarity Ilpo Järvinen
2022-04-06 17:54 ` Rob Herring
2022-04-04 8:29 ` [PATCH v2 06/12] ACPI / property: Document RS485 _DSD properties Ilpo Järvinen
2022-04-04 8:29 ` [PATCH v2 07/12] serial: termbits: ADDRB to indicate 9th bit addressing mode Ilpo Järvinen
2022-04-04 8:52 ` Arnd Bergmann
2022-04-04 9:10 ` Ilpo Järvinen
2022-04-04 8:29 ` [PATCH v2 08/12] serial: General support for multipoint addresses Ilpo Järvinen
2022-04-04 8:29 ` [PATCH v2 09/12] serial: 8250: make saved LSR larger Ilpo Järvinen
2022-04-04 8:29 ` Ilpo Järvinen [this message]
2022-04-04 8:29 ` [PATCH v2 11/12] serial: 8250_lpss: Use 32-bit reads Ilpo Järvinen
2022-04-04 8:29 ` [PATCH v2 12/12] serial: 8250_dwlib: Support for 9th bit multipoint addressing Ilpo Järvinen
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=20220404082912.6885-11-ilpo.jarvinen@linux.intel.com \
--to=ilpo.jarvinen@linux.intel.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=giulio.benetti@micronovasrl.com \
--cc=gregkh@linuxfoundation.org \
--cc=heikki.krogerus@linux.intel.com \
--cc=heiko@sntech.de \
--cc=jirislaby@kernel.org \
--cc=johan@kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=lukas@wunner.de \
--cc=u.kleine-koenig@pengutronix.de \
/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;
as well as URLs for NNTP newsgroup(s).