From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Guanbing Huang <albanhuang@tencent.com>,
linux-kernel@vger.kernel.org, linux-serial@vger.kernel.org
Cc: Jiri Slaby <jirislaby@kernel.org>
Subject: [PATCH v1 1/6] serial: port: Assign ->iotype correctly when ->iobase is set
Date: Fri, 24 Jan 2025 18:10:46 +0200 [thread overview]
Message-ID: <20250124161530.398361-2-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20250124161530.398361-1-andriy.shevchenko@linux.intel.com>
Currently the ->iotype is always assigned to the UPIO_MEM when
the respective property is not found. However, this will not
support the cases when user wants to have UPIO_PORT to be set
or preserved. Support this scenario by checking ->iobase value
and default the ->iotype respectively.
Fixes: 1117a6fdc7c1 ("serial: 8250_of: Switch to use uart_read_port_properties()")
Fixes: e894b6005dce ("serial: port: Introduce a common helper to read properties")
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/tty/serial/serial_port.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/tty/serial/serial_port.c b/drivers/tty/serial/serial_port.c
index d35f1d24156c..f28d0633fe6b 100644
--- a/drivers/tty/serial/serial_port.c
+++ b/drivers/tty/serial/serial_port.c
@@ -173,6 +173,7 @@ EXPORT_SYMBOL(uart_remove_one_port);
* The caller is responsible to initialize the following fields of the @port
* ->dev (must be valid)
* ->flags
+ * ->iobase
* ->mapbase
* ->mapsize
* ->regshift (if @use_defaults is false)
@@ -214,7 +215,7 @@ static int __uart_read_properties(struct uart_port *port, bool use_defaults)
/* Read the registers I/O access type (default: MMIO 8-bit) */
ret = device_property_read_u32(dev, "reg-io-width", &value);
if (ret) {
- port->iotype = UPIO_MEM;
+ port->iotype = port->iobase ? UPIO_PORT : UPIO_MEM;
} else {
switch (value) {
case 1:
--
2.43.0.rc1.1336.g36b5255a03ac
next prev parent reply other threads:[~2025-01-24 16:15 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-24 16:10 [PATCH v1 0/6] serial: port: Fix UPIO_PORT iotype handling Andy Shevchenko
2025-01-24 16:10 ` Andy Shevchenko [this message]
2025-02-04 13:45 ` [PATCH v1 1/6] serial: port: Assign ->iotype correctly when ->iobase is set Greg Kroah-Hartman
2025-01-24 16:10 ` [PATCH v1 2/6] serial: port: Always update ->iotype in __uart_read_properties() Andy Shevchenko
2025-01-24 16:10 ` [PATCH v1 3/6] serial: port: Make ->iotype validation global " Andy Shevchenko
2025-01-24 16:10 ` [PATCH v1 4/6] serial: 8250_of: Remove unneeded ->iotype assignment Andy Shevchenko
2025-01-24 16:10 ` [PATCH v1 5/6] serial: 8250_platform: " Andy Shevchenko
2025-01-24 16:10 ` [PATCH v1 6/6] serial: 8250_pnp: " Andy Shevchenko
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=20250124161530.398361-2-andriy.shevchenko@linux.intel.com \
--to=andriy.shevchenko@linux.intel.com \
--cc=albanhuang@tencent.com \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-serial@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.