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 09/12] serial: 8250: make saved LSR larger
Date: Mon, 4 Apr 2022 11:29:09 +0300 [thread overview]
Message-ID: <20220404082912.6885-10-ilpo.jarvinen@linux.intel.com> (raw)
In-Reply-To: <20220404082912.6885-1-ilpo.jarvinen@linux.intel.com>
DW flags address received as BIT(8) in LSR. In order to not
lose that on read, enlarge lsr_saved_flags and adjust related
call chains which passed chars previously.
Signed-off-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
---
drivers/tty/serial/8250/8250_port.c | 8 ++++----
include/linux/serial_8250.h | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c
index 276c5281aaa0..6e85ad0fade6 100644
--- a/drivers/tty/serial/8250/8250_port.c
+++ b/drivers/tty/serial/8250/8250_port.c
@@ -1585,7 +1585,7 @@ static inline void __start_tx(struct uart_port *port)
if (serial8250_set_THRI(up)) {
if (up->bugs & UART_BUG_TXEN) {
- unsigned char lsr;
+ unsigned int lsr;
lsr = serial_in(up, UART_LSR);
up->lsr_saved_flags |= lsr & LSR_SAVE_FLAGS;
@@ -1741,7 +1741,7 @@ static void serial8250_enable_ms(struct uart_port *port)
serial8250_rpm_put(up);
}
-void serial8250_read_char(struct uart_8250_port *up, unsigned char lsr)
+void serial8250_read_char(struct uart_8250_port *up, unsigned int lsr)
{
struct uart_port *port = &up->port;
unsigned char ch;
@@ -1808,7 +1808,7 @@ EXPORT_SYMBOL_GPL(serial8250_read_char);
* value, and returns the remaining LSR bits not handled
* by this Rx routine.
*/
-unsigned char serial8250_rx_chars(struct uart_8250_port *up, unsigned char lsr)
+unsigned int serial8250_rx_chars(struct uart_8250_port *up, unsigned int lsr)
{
struct uart_port *port = &up->port;
int max_count = 256;
@@ -1930,7 +1930,7 @@ static bool handle_rx_dma(struct uart_8250_port *up, unsigned int iir)
*/
int serial8250_handle_irq(struct uart_port *port, unsigned int iir)
{
- unsigned char status;
+ unsigned int status;
struct uart_8250_port *up = up_to_u8250p(port);
bool skip_rx = false;
unsigned long flags;
diff --git a/include/linux/serial_8250.h b/include/linux/serial_8250.h
index ff84a3ed10ea..921df4c60062 100644
--- a/include/linux/serial_8250.h
+++ b/include/linux/serial_8250.h
@@ -119,7 +119,7 @@ struct uart_8250_port {
* be immediately processed.
*/
#define LSR_SAVE_FLAGS UART_LSR_BRK_ERROR_BITS
- unsigned char lsr_saved_flags;
+ u16 lsr_saved_flags;
#define MSR_SAVE_FLAGS UART_MSR_ANY_DELTA
unsigned char msr_saved_flags;
@@ -170,8 +170,8 @@ extern void serial8250_do_set_divisor(struct uart_port *port, unsigned int baud,
unsigned int quot_frac);
extern int fsl8250_handle_irq(struct uart_port *port);
int serial8250_handle_irq(struct uart_port *port, unsigned int iir);
-unsigned char serial8250_rx_chars(struct uart_8250_port *up, unsigned char lsr);
-void serial8250_read_char(struct uart_8250_port *up, unsigned char lsr);
+unsigned int serial8250_rx_chars(struct uart_8250_port *up, unsigned int lsr);
+void serial8250_read_char(struct uart_8250_port *up, unsigned int lsr);
void serial8250_tx_chars(struct uart_8250_port *up);
unsigned int serial8250_modem_status(struct uart_8250_port *up);
void serial8250_init_port(struct uart_8250_port *up);
--
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 ` Ilpo Järvinen [this message]
2022-04-04 8:29 ` [PATCH v2 10/12] serial: 8250: create lsr_save_mask Ilpo Järvinen
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-10-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).