From: Alan Cox <alan@lxorguk.ukuu.org.uk>
To: torvalds@linux-foundation.org, linux-kernel@vger.kernel.org
Subject: [PATCH 76/80] serial: fix device name reporting when minor space is shared between drivers
Date: Mon, 13 Oct 2008 10:45:26 +0100 [thread overview]
Message-ID: <20081013094522.21645.91366.stgit@localhost.localdomain> (raw)
In-Reply-To: <20081013092758.21645.2359.stgit@localhost.localdomain>
From: David S. Miller <davem@davemloft.net>
The multiple drivers share the minor space occupied by a particular major
number, the actual index within the device name's space is indicated by
the tty_driver->name_base + uart_port->line
Another usable formula is (uart_driver->minor - MINOR_BASE) + port->line
Use those to print the device names properly in such situations in
serial_core.c and 8250.c
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Alan Cox <alan@redhat.com>
---
drivers/serial/8250.c | 22 +++++++++++++++-------
drivers/serial/serial_core.c | 7 +++++--
2 files changed, 20 insertions(+), 9 deletions(-)
diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index db2cdc1..d4104a3 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -57,6 +57,13 @@ static unsigned int share_irqs = SERIAL8250_SHARE_IRQS;
static unsigned int nr_uarts = CONFIG_SERIAL_8250_RUNTIME_UARTS;
+static struct uart_driver serial8250_reg;
+
+static int serial_index(struct uart_port *port)
+{
+ return (serial8250_reg.minor - 64) + port->line;
+}
+
/*
* Debugging.
*/
@@ -997,7 +1004,7 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
return;
DEBUG_AUTOCONF("ttyS%d: autoconf (0x%04x, 0x%p): ",
- up->port.line, up->port.iobase, up->port.membase);
+ serial_index(&up->port), up->port.iobase, up->port.membase);
/*
* We really do need global IRQs disabled here - we're going to
@@ -1132,8 +1139,8 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
if (up->capabilities != uart_config[up->port.type].flags) {
printk(KERN_WARNING
"ttyS%d: detected caps %08x should be %08x\n",
- up->port.line, up->capabilities,
- uart_config[up->port.type].flags);
+ serial_index(&up->port), up->capabilities,
+ uart_config[up->port.type].flags);
}
up->port.fifosize = uart_config[up->port.type].fifo_size;
@@ -1857,7 +1864,8 @@ static int serial8250_startup(struct uart_port *port)
*/
if (!(up->port.flags & UPF_BUGGY_UART) &&
(serial_inp(up, UART_LSR) == 0xff)) {
- printk("ttyS%d: LSR safety check engaged!\n", up->port.line);
+ printk(KERN_INFO "ttyS%d: LSR safety check engaged!\n",
+ serial_index(&up->port));
return -ENODEV;
}
@@ -1912,7 +1920,8 @@ static int serial8250_startup(struct uart_port *port)
*/
if (!(iir1 & UART_IIR_NO_INT) && (iir & UART_IIR_NO_INT)) {
up->bugs |= UART_BUG_THRE;
- pr_debug("ttyS%d - using backup timer\n", port->line);
+ pr_debug("ttyS%d - using backup timer\n",
+ serial_index(port));
}
}
@@ -1972,7 +1981,7 @@ static int serial8250_startup(struct uart_port *port)
if (!(up->bugs & UART_BUG_TXEN)) {
up->bugs |= UART_BUG_TXEN;
pr_debug("ttyS%d - enabling bad tx status workarounds\n",
- port->line);
+ serial_index(port));
}
} else {
up->bugs &= ~UART_BUG_TXEN;
@@ -2633,7 +2642,6 @@ static int serial8250_console_early_setup(void)
return serial8250_find_port_for_earlycon();
}
-static struct uart_driver serial8250_reg;
static struct console serial8250_console = {
.name = "ttyS",
.write = serial8250_console_write,
diff --git a/drivers/serial/serial_core.c b/drivers/serial/serial_core.c
index 308588e..6bdf336 100644
--- a/drivers/serial/serial_core.c
+++ b/drivers/serial/serial_core.c
@@ -2051,7 +2051,8 @@ int uart_suspend_port(struct uart_driver *drv, struct uart_port *port)
"transmitter\n",
port->dev ? port->dev->bus_id : "",
port->dev ? ": " : "",
- drv->dev_name, port->line);
+ drv->dev_name,
+ drv->tty_driver->name_base + port->line);
ops->shutdown(port);
}
@@ -2176,7 +2177,9 @@ uart_report_port(struct uart_driver *drv, struct uart_port *port)
printk(KERN_INFO "%s%s%s%d at %s (irq = %d) is a %s\n",
port->dev ? port->dev->bus_id : "",
port->dev ? ": " : "",
- drv->dev_name, port->line, address, port->irq, uart_type(port));
+ drv->dev_name,
+ drv->tty_driver->name_base + port->line,
+ address, port->irq, uart_type(port));
}
static void
next prev parent reply other threads:[~2008-10-13 10:04 UTC|newest]
Thread overview: 86+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-13 9:31 [PATCH 00/80] TTY updates for 2.6.28 Alan Cox
2008-10-13 9:31 ` [PATCH 01/80] drivers/serial/crisv10.c: add missing put_tty_driver Alan Cox
2008-10-13 9:31 ` [PATCH 02/80] drivers/char/hvc_console.c: adjust call to put_tty_driver Alan Cox
2008-10-13 9:31 ` [PATCH 03/80] coldfire: scheduled SERIAL_COLDFIRE removal Alan Cox
2008-10-13 9:32 ` [PATCH 04/80] epca: call tty_port_init Alan Cox
2008-10-13 9:32 ` [PATCH 05/80] Blackfin Serial Driver: use __initdata for data, not __init Alan Cox
2008-10-13 9:32 ` [PATCH 06/80] Blackfin Serial Driver: Fix bug - should suspend/resume/remove all uart ports Alan Cox
2008-10-13 9:33 ` [PATCH 07/80] Blackfin Serial Driver: trim trailing whitespace -- no functional changes Alan Cox
2008-10-13 9:33 ` [PATCH 08/80] Blackfin Serial Driver: move common variables out of serial headers and into the serial driver Alan Cox
2008-10-13 9:33 ` [PATCH 09/80] Blackfin Serial Driver: Remove useless stop Alan Cox
2008-10-13 9:33 ` [PATCH 10/80] Blackfin Serial Driver: Fix bug - Don't call tx_stop in tx_transfer Alan Cox
2008-10-13 9:33 ` [PATCH 11/80] Blackfin Serial Driver: Fix bug - ircp fails on sir over Blackfin UART Alan Cox
2008-10-13 9:33 ` [PATCH 12/80] Blackfin Serial Driver: Fix bug - request UART2/3 peripheral mapped interrupts in PIO mode Alan Cox
2008-10-13 9:34 ` [PATCH 13/80] Fix oti6858 debug level Alan Cox
2008-10-13 9:34 ` [PATCH 14/80] Char: cyclades. remove bogus iomap Alan Cox
2008-10-13 9:34 ` [PATCH 15/80] Char: sx, fix io unmapping Alan Cox
2008-10-13 9:34 ` [PATCH 16/80] Char: merge ip2main and ip2base Alan Cox
2008-10-13 9:34 ` [PATCH 17/80] ip2, cleanup globals Alan Cox
2008-10-13 9:34 ` [PATCH 18/80] ip2, fix sparse warnings Alan Cox
2008-10-13 9:34 ` [PATCH 19/80] ip2, init/deinit cleanup Alan Cox
2008-10-13 9:35 ` [PATCH 20/80] ip2: avoid add_timer with pending timer Alan Cox
2008-10-13 9:35 ` [PATCH 21/80] audit: Handle embedded NUL in TTY input auditing Alan Cox
2008-10-13 9:35 ` [PATCH 22/80] serial: Make uart_port's ioport "unsigned long" Alan Cox
2008-10-13 9:35 ` [PATCH 23/80] nozomi: Fix close on error Alan Cox
2008-10-13 9:35 ` [PATCH 24/80] serial-make-uart_ports-ioport-unsigned-long-fix Alan Cox
2008-10-13 9:35 ` [PATCH 25/80] usb: fix pl2303 initialization Alan Cox
2008-10-13 9:36 ` [PATCH 26/80] ftdi: A few errors are err() that should be debug which causes much spewage Alan Cox
2008-10-13 9:36 ` [PATCH 27/80] serial_8250: pci_enable_device fail is not fully handled Alan Cox
2008-10-13 9:36 ` [PATCH 28/80] 8250: remove a few inlines of dubious value Alan Cox
2008-10-13 9:36 ` [PATCH 29/80] serial: allow 8250 to be used on sparc Alan Cox
2008-10-13 9:36 ` [PATCH 30/80] tty: move tioclinux from a special case Alan Cox
2008-10-13 9:36 ` [PATCH 31/80] uml: small cleanups and note bugs to be dealt with by uml authors Alan Cox
2008-10-13 9:36 ` [PATCH 32/80] tty: split the buffering from tty_io Alan Cox
2008-10-13 9:37 ` [PATCH 33/80] tty: Split tty_port into its own file Alan Cox
2008-10-13 9:37 ` [PATCH 34/80] pps: Reserve a line discipline number for PPS Alan Cox
2008-10-13 9:37 ` [PATCH 35/80] tty: Add a kref count Alan Cox
2008-10-13 9:37 ` [PATCH 36/80] tty: use krefs to protect driver module counts Alan Cox
2008-10-13 9:37 ` [PATCH 37/80] tty: Cris has a nice RS485 ioctl so we should steal it Alan Cox
2008-10-13 9:38 ` [PATCH 38/80] tty: ipw need reworking Alan Cox
2008-10-13 9:38 ` [PATCH 39/80] tty: Add termiox Alan Cox
2008-10-13 9:38 ` [PATCH 40/80] tty: Termios locking - sort out real_tty confusions and lock reads Alan Cox
2008-10-13 9:39 ` [PATCH 41/80] tty: compare the tty winsize Alan Cox
2008-10-13 9:39 ` [PATCH 42/80] tty: Make get_current_tty use a kref Alan Cox
2008-10-13 9:39 ` [PATCH 43/80] tty: Move tty_write_message out of kernel/printk Alan Cox
2008-10-13 9:39 ` [PATCH 44/80] tty: usb-serial krefs Alan Cox
2008-10-13 9:39 ` [PATCH 45/80] tty: kref usage for isicom and moxa Alan Cox
2008-10-13 9:40 ` [PATCH 46/80] stallion: Use krefs Alan Cox
2008-10-13 9:40 ` [PATCH 47/80] mxser: Switch to kref tty Alan Cox
2008-10-13 9:40 ` [PATCH 48/80] tty: the vhangup syscall is racy Alan Cox
2008-10-13 9:40 ` [PATCH 49/80] tty: Redo current tty locking Alan Cox
2008-10-13 9:40 ` [PATCH 50/80] tty: Fix abusers of current->sighand->tty Alan Cox
2008-10-13 9:41 ` [PATCH 51/80] pty: If the administrator creates a device for a ptmx slave we should not error Alan Cox
2008-10-13 9:41 ` [PATCH 52/80] vt: remove bogus lock dropping Alan Cox
2008-10-13 9:41 ` [PATCH 53/80] tty: shutdown method Alan Cox
2008-10-13 9:41 ` [PATCH 54/80] tty: Remove more special casing and out of place code Alan Cox
2008-10-13 9:41 ` [PATCH 55/80] tty: Move parts of tty_init_dev into new functions Alan Cox
2008-10-13 9:42 ` [PATCH 56/80] tty: Clean up the tty_init_dev changes further Alan Cox
2008-10-13 9:42 ` [PATCH 57/80] tty: kref the tty driver object Alan Cox
2008-10-13 9:42 ` [PATCH 58/80] tty: More driver operations Alan Cox
2008-10-13 9:42 ` [PATCH 59/80] tty: Finish fixing up the init_dev interface to use ERR_PTR Alan Cox
2008-10-13 9:42 ` [PATCH 60/80] tty: extract the pty init time special cases Alan Cox
2008-10-13 9:42 ` [PATCH 61/80] Move tty lookup/reopen to caller Alan Cox
2008-10-13 9:42 ` [PATCH 62/80] Add an instance parameter devpts interfaces Alan Cox
2008-10-13 9:43 ` [PATCH 63/80] Simplify devpts_get_tty() Alan Cox
2008-10-13 9:43 ` [PATCH 64/80] Simplify devpts_pty_new() Alan Cox
2008-10-13 9:43 ` [PATCH 65/80] Simplify devpts_pty_kill Alan Cox
2008-10-13 9:43 ` [PATCH 66/80] pty: Coding style and polish Alan Cox
2008-10-13 9:43 ` [PATCH 67/80] pty: Fix allocation failure double free Alan Cox
2008-10-13 9:43 ` [PATCH 68/80] pty: simplify unix98 allocation Alan Cox
2008-10-13 9:44 ` [PATCH 69/80] tty: simplify ktermios allocation Alan Cox
2008-10-13 9:44 ` [PATCH 70/80] tty: some ICANON magic is in the wrong places Alan Cox
2008-10-13 9:44 ` [PATCH 71/80] tty: Fallout from tty-move-canon-specials Alan Cox
2008-10-13 9:44 ` [PATCH 72/80] tty: fix up gigaset a bit Alan Cox
2008-10-16 15:50 ` Tilman Schmidt
2008-10-17 11:40 ` Alan Cox
2008-10-19 12:28 ` Tilman Schmidt
2008-10-22 9:00 ` Alan Cox
2008-10-24 11:21 ` Tilman Schmidt
2008-10-13 9:44 ` [PATCH 73/80] tty: Remove lots of NULL checks Alan Cox
2008-10-13 9:45 ` [PATCH 74/80] tty: Minor tidyups and document fixes for n_tty Alan Cox
2008-10-13 9:45 ` [PATCH 75/80] applicom: Fix an unchecked user ioctl range and an error return Alan Cox
2008-10-13 9:45 ` Alan Cox [this message]
2008-10-13 9:45 ` [PATCH 77/80] tty: tty_io.c shadows sparse fix Alan Cox
2008-10-13 9:45 ` [PATCH 78/80] fs3270: remove extra locks Alan Cox
2008-10-13 9:46 ` [PATCH 79/80] fs3270: Correct error returns Alan Cox
2008-10-13 9:46 ` [PATCH 80/80] tty: rename the remaining oddly named n_tty functions Alan Cox
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=20081013094522.21645.91366.stgit@localhost.localdomain \
--to=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@linux-foundation.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;
as well as URLs for NNTP newsgroup(s).