From: "Maciej W. Rozycki" <macro@orcam.me.uk>
To: Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Jiri Slaby <jirislaby@kernel.org>,
Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: linux-mips@vger.kernel.org, linux-serial@vger.kernel.org,
linux-kernel@vger.kernel.org
Subject: [PATCH 4/5] serial: core, 8250: Add a hook for extra port property reporting
Date: Thu, 10 Jun 2021 20:38:44 +0200 (CEST) [thread overview]
Message-ID: <alpine.DEB.2.21.2105190414160.29169@angie.orcam.me.uk> (raw)
In-Reply-To: <alpine.DEB.2.21.2105181800170.3032@angie.orcam.me.uk>
Add a hook for `uart_report_port' to let serial ports report extra
properties beyond `irq' and `base_baud'. Use it with the 8250 backend
to report extra baud rates supported above the base rate for ports with
the UPF_MAGIC_MULTIPLIER property, so that people have a way to find out
that they are supported with their system, e.g.:
Serial: 8250/16550 driver, 5 ports, IRQ sharing enabled
printk: console [ttyS0] disabled
serial8250.0: ttyS0 at I/O 0x3f8 (irq = 4, base_baud = 115200 [+230400, 460800]) is a 16550A
printk: console [ttyS0] enabled
printk: console [ttyS0] enabled
printk: bootconsole [uart8250] disabled
printk: bootconsole [uart8250] disabled
serial8250.0: ttyS1 at I/O 0x2f8 (irq = 3, base_baud = 115200 [+230400, 460800]) is a 16550A
serial8250.0: ttyS2 at MMIO 0x1f000900 (irq = 20, base_baud = 230400) is a 16550A
Otherwise there is no clear way to figure this out.
Signed-off-by: Maciej W. Rozycki <macro@orcam.me.uk>
---
drivers/tty/serial/8250/8250_core.c | 10 ++++++++++
drivers/tty/serial/serial_core.c | 11 +++++++++--
include/linux/serial_core.h | 3 +++
3 files changed, 22 insertions(+), 2 deletions(-)
linux-serial-core-baud-extra.diff
Index: linux-malta-cbus-uart/drivers/tty/serial/8250/8250_core.c
===================================================================
--- linux-malta-cbus-uart.orig/drivers/tty/serial/8250/8250_core.c
+++ linux-malta-cbus-uart/drivers/tty/serial/8250/8250_core.c
@@ -952,6 +952,13 @@ static struct uart_8250_port *serial8250
return NULL;
}
+static void serial8250_report_magic(struct uart_port *port,
+ char *report_buf, size_t report_size)
+{
+ snprintf(report_buf, report_size,
+ " [+%d, %d]", port->uartclk / 8, port->uartclk / 4);
+}
+
static void serial_8250_overrun_backoff_work(struct work_struct *work)
{
struct uart_8250_port *up =
@@ -1048,6 +1055,9 @@ int serial8250_register_8250_port(struct
}
}
+ if (up->port.flags & UPF_MAGIC_MULTIPLIER)
+ uart->port.report_extra = serial8250_report_magic;
+
serial8250_set_defaults(uart);
/* Possibly override default I/O functions. */
Index: linux-malta-cbus-uart/drivers/tty/serial/serial_core.c
===================================================================
--- linux-malta-cbus-uart.orig/drivers/tty/serial/serial_core.c
+++ linux-malta-cbus-uart/drivers/tty/serial/serial_core.c
@@ -2309,6 +2309,7 @@ int uart_resume_port(struct uart_driver
static inline void
uart_report_port(struct uart_driver *drv, struct uart_port *port)
{
+ char report_extra[64];
char address[64];
switch (port->iotype) {
@@ -2333,11 +2334,17 @@ uart_report_port(struct uart_driver *drv
break;
}
- pr_info("%s%s%s at %s (irq = %d, base_baud = %d) is a %s\n",
+ if (port->report_extra)
+ port->report_extra(port, report_extra, sizeof(report_extra));
+ else
+ report_extra[0] = '\0';
+
+ pr_info("%s%s%s at %s (irq = %d, base_baud = %d%s) is a %s\n",
port->dev ? dev_name(port->dev) : "",
port->dev ? ": " : "",
port->name,
- address, port->irq, port->uartclk / 16, uart_type(port));
+ address, port->irq, port->uartclk / 16, report_extra,
+ uart_type(port));
}
static void
Index: linux-malta-cbus-uart/include/linux/serial_core.h
===================================================================
--- linux-malta-cbus-uart.orig/include/linux/serial_core.h
+++ linux-malta-cbus-uart/include/linux/serial_core.h
@@ -135,6 +135,9 @@ struct uart_port {
struct serial_rs485 *rs485);
int (*iso7816_config)(struct uart_port *,
struct serial_iso7816 *iso7816);
+ void (*report_extra)(struct uart_port *port,
+ char *report_buf,
+ size_t report_size);
unsigned int irq; /* irq number */
unsigned long irqflags; /* irq flags */
unsigned int uartclk; /* base uart clock */
next prev parent reply other threads:[~2021-06-10 18:38 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-10 18:38 [PATCH 0/5] serial, Malta: Fixes to magic multipliers for SMSC Super I/O UARTs Maciej W. Rozycki
2021-06-10 18:38 ` [PATCH 1/5] serial: 8250: Document SMSC Super I/O UART peculiarities Maciej W. Rozycki
2021-06-10 18:38 ` [PATCH 2/5] serial: 8250: Actually allow UPF_MAGIC_MULTIPLIER baud rates Maciej W. Rozycki
2021-06-10 18:38 ` [PATCH 3/5] serial: 8250: Handle custom baud rates in UPF_MAGIC_MULTIPLIER range Maciej W. Rozycki
2021-06-10 18:38 ` Maciej W. Rozycki [this message]
2021-06-15 13:19 ` [PATCH 4/5] serial: core, 8250: Add a hook for extra port property reporting Greg Kroah-Hartman
2021-06-26 4:12 ` Maciej W. Rozycki
2021-06-10 18:38 ` [PATCH 5/5] MIPS: Malta: Enable magic multipliers for Super I/O UARTs Maciej W. Rozycki
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=alpine.DEB.2.21.2105190414160.29169@angie.orcam.me.uk \
--to=macro@orcam.me.uk \
--cc=gregkh@linuxfoundation.org \
--cc=jirislaby@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mips@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=tsbogend@alpha.franken.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 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.