wrong number of serial port detected
Hello,
I have a question about the way serial ports are detected. Since I started using udev last year I noticed 32 ttySxx nodes in my /dev directory. I checked dmesg and the serial port driver was detecting 32 ports. Here is the line from dmesg:
Serial: 8250/16550 driver $Revision: 1.90 $ 32 ports, IRQ sharing enabled
In fact I don't have 32 ports. I have two serial ports on the motherboard, both of which are disabled in the BIOS. I opened a bug in RedHat's bugzilla system and it was promptly closed saying this was unfixable. I was told that the kernel loaded the maximum number of ports supported by the serial port driver. I asked why and I have not received a response. So I ask this mailing list Can the kernel detect the proper number of serial ports or not?
Thanks,
Jason
Quoted 2 lines · Jason Dravet
So I ask this mailing list Can the kernel detect the proper number of serial ports or not?
It does detect serial ports found in the machine.
However, it _always_ offers the configured number of serial devices. This is to allow folk whose ports are not autodetected to configure them appropriately via the setserial command. If they were not available, they could not configure them.
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core
Quoted 10 lines
From: Russell King <[email protected]>
To: Jason Dravet <[email protected]>
CC: [email protected]
Subject: Re: wrong number of serial port detected
Date: Wed, 7 Dec 2005 15:50:34 +0000Quoted 2 lines · Jason Dravet
So I ask this mailing list Can the kernel detect the proper number of serial ports or not?
Quoted 7 lines
It does detect serial ports found in the machine.
However, it _always_ offers the configured number of serial devices. This is to allow folk whose ports are not autodetected to configure them appropriately via the setserial command. If they were not available, they could not configure them.
Then may I ask how XP does it? I have to dual boot between XP and Fedora. When I go into XP's device manager I see all of the appropriate hardware listed, no extra serial ports. When I boot into Fedora and go into /dev, I see the same hardware except I have 32 serial ports and 64 tty nodes (tty is for virtual terminals right?). How can 1 OS show the correct number and another show the wrong number? I ask so I can better understand what is going on.
Thanks,
Jason
Quoted 17 lines · Jason Dravet
Quoted 10 lines
From: Russell King <[email protected]>
To: Jason Dravet <[email protected]>
CC: [email protected]
Subject: Re: wrong number of serial port detected
Date: Wed, 7 Dec 2005 15:50:34 +0000Quoted 2 lines · Jason Dravet
So I ask this mailing list Can the kernel detect the proper number of serial ports or not?
Quoted 7 lines
It does detect serial ports found in the machine.
However, it _always_ offers the configured number of serial devices. This is to allow folk whose ports are not autodetected to configure them appropriately via the setserial command. If they were not available, they could not configure them.
Quoted 7 lines
Then may I ask how XP does it? I have to dual boot between XP and Fedora. When I go into XP's device manager I see all of the appropriate hardware listed, no extra serial ports. When I boot into Fedora and go into /dev, I see the same hardware except I have 32 serial ports and 64 tty nodes (tty is for virtual terminals right?). How can 1 OS show the correct number and another show the wrong number? I ask so I can better understand what is going on.
It seems you are comparing apples (XP's device manager) with oranges (/dev directory). They're two entirely different things.
The former lists devices which _are_ present in your system.
The latter provides the filesystem namespace for applications to access devices which may or may not be present in your system.
I think you completely missed the second half of my point, and I'd like to illustrate what would happen if we were to only provide serial devices in /dev which actually existed:
1. We would only provide /dev/ttyS devices which actually existed, which may mean just /dev/ttyS0.
2. User adds a custom serial card in their system which adds 16 additional serial ports, but is not PCI based, so is not known to BIOS.
3. Neither XP nor Linux will find this automatically without some help (eg, a vendor supplied driver for XP).
4. User tries the well documented "setserial /dev/ttyS2 port 0x220 irq 5" procedure, which has been supported since Linux 1.x
5. User finds that, because there is no ttyS2 device in /dev, they can't configure their card.
6. User files a bug.
As for your 64 VT tty device nodes - these "devices" are created dynamically when the device node is opened. The act of opening the device node is defined to be the creation event. If the device node did not exist, there would be no way to create _any_ virtual terminals.
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core
Quoted 5 lines · Russell King
4. User tries the well documented "setserial
/dev/ttyS2port0x220irq 5" procedure, which has been supported since Linux 1.x5. User finds that, because there is no ttyS2 device in /dev, they can't configure their card.
Well, instead of polluting everybody's /dev for the 3 users having such cards, why not just tell the user to run
MAKEDEV /dev/ttyS2 ; setserial /dev/ttyS2 port 0x220 irq 5 instead ? (Or even mknod)
Xav
Quoted 5 lines · Xavier Bestel
Le mercredi 07 d?cembre 2005 ? 21:15 +0000, Russell King a ?crit :
Quoted 3 lines
4. User tries the well documented "setserial
/dev/ttyS2port0x220irq 5" procedure, which has been supported since Linux 1.x
Quoted 7 lines
Quoted 2 lines
5. User finds that, because there is no ttyS2 device in /dev, they can't configure their card.
Well, instead of polluting everybody's /dev for the 3 users having such cards, why not just tell the user to run
MAKEDEV/dev/ttyS2; setserial/dev/ttyS2port0x220irq 5 instead ? (Or even mknod)
Oh sorry. Mail me your root password and IP address, let me log in to your system, and I'll remove those device nodes right now. Thanks for pointing that out.
Seriously, surely you aren't suggesting that I somehow have personal control over this?
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core
Quoted 14 lines · Russell King
Quoted 5 lines · Xavier Bestel
Le mercredi 07 d?cembre 2005 ? 21:15 +0000, Russell King a ?crit :
Quoted 3 lines
4. User tries the well documented "setserial
/dev/ttyS2port0x220irq 5" procedure, which has been supported since Linux 1.xQuoted 7 lines
Quoted 2 lines
5. User finds that, because there is no ttyS2 device in /dev, they can't configure their card.
Well, instead of polluting everybody's /dev for the 3 users having such cards, why not just tell the user to run
MAKEDEV/dev/ttyS2; setserial/dev/ttyS2port0x220irq 5 instead ? (Or even mknod)
Quoted 6 lines
Oh sorry. Mail me your root password and IP address, let me log in to your system, and I'll remove those device nodes right now. Thanks for pointing that out.
Seriously, surely you aren't suggesting that I somehow have personal control over this?
Additionally, if you have a problem with this, the total number of ports _is_ kernel configurable.
So if you're getting 32 ports from a distro targetted at the current range of consumer hardware which commonly has maybe 1 or 2 and possibly a modem card (iow probably max 4 ports), please take it up with them.
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core
Quoted 22 lines · Russell King
Quoted 14 lines · Russell King
Quoted 5 lines · Xavier Bestel
Le mercredi 07 d?cembre 2005 ? 21:15 +0000, Russell King a ?crit :
Quoted 3 lines
4. User tries the well documented "setserial
/dev/ttyS2port0x220irq 5" procedure, which has been supported since Linux 1.xQuoted 7 lines
Quoted 2 lines
5. User finds that, because there is no ttyS2 device in /dev, they can't configure their card.
Well, instead of polluting everybody's /dev for the 3 users having such cards, why not just tell the user to run
MAKEDEV/dev/ttyS2; setserial/dev/ttyS2port0x220irq 5 instead ? (Or even mknod)Quoted 6 lines
Oh sorry. Mail me your root password and IP address, let me log in to your system, and I'll remove those device nodes right now. Thanks for pointing that out.
Seriously, surely you aren't suggesting that I somehow have personal control over this?
Quoted 7 lines
Additionally, if you have a problem with this, the total number of ports _is_ kernel configurable.
So if you're getting 32 ports from a distro targetted at the current range of consumer hardware which commonly has maybe 1 or 2 and possibly a modem card (iow probably max 4 ports), please take it up with them.
Ok, how about something along the lines of this (completely untested) patch, which adds a runtime param to lower the number of registered ports, also allowing a default to be set for common cases.
Would something like this be acceptable ?
It would mean that users of kernels with NR_UARTS currently set to 32 would either also have to set the new default if they build their own kernels, or fiddle with a module param to see past their first four ports if they run a vendor kernel.
Given these people are the minority use-case, adding one extra option to their modprobe.conf doesn't seem too harsh, does it ?
Dave
drivers/serial/8250.c +17 -12
@@ -54,6 +54,8 @@*/ static unsigned int share_irqs =SERIAL8250_SHARE_IRQS ; +static unsigned int nr_uarts =CONFIG_SERIAL_8250_RUNTIME_UARTS ; +/* * Debugging. */
@@ -2118,7 +2120,7 @@ static void __init serial8250_isa_init_preturn ; first =0 ; -for (i =0 ; i <UART_NR ; i++) { +for (i =0 ; i < nr_uarts; i++) {struct uart_8250_port *up = &serial8250_ports[i]; up->port.line = i;
@@ -2137,7 +2139,7 @@ static void __init serial8250_isa_init_p }for (i =0 , up = serial8250_ports; - i <ARRAY_SIZE (old_serial_port) && i <UART_NR ; + i <ARRAY_SIZE (old_serial_port) && i < nr_uarts; i++, up++) { up->port.iobase = old_serial_port[i].port; up->port.irq =irq_canonicalize (old_serial_port[i].irq);
@@ -2159,7 +2161,7 @@ serial8250_register_ports(struct uart_drserial8250_isa_init_ports (); -for (i =0 ; i <UART_NR ; i++) { +for (i =0 ; i < nr_uarts; i++) {struct uart_8250_port *up = &serial8250_ports[i]; up->port.dev = dev;
@@ -2262,7 +2266,7 @@ static int serial8250_console_setup(stru* if so, search for the first available port that does have * console support. */ -if (co->index >=UART_NR ) +if (co->index >= nr_uarts) co->index =0 ; port = &serial8250_ports[co->index].port;if (!port->iobase && !port->membase)
@@ -2298,7 +2302,7 @@ static int __init find_port(struct uart_int line;struct uart_port *port; -for (line =0 ; line <UART_NR ; line++) { +for (line =0 ; line < nr_uarts; line++) { port = &serial8250_ports[line].port; if (p->iotype == port->iotype && p->iobase == port->iobase &&
@@ -2422,7 +2426,7 @@ static int __devexit serial8250_remove(s {int i; -for (i =0 ; i <UART_NR ; i++) { +for (i =0 ; i < nr_uarts; i++) {struct uart_8250_port *up = &serial8250_ports[i];if (up->port.dev == &dev->dev)
@@ -2435,7 +2439,7 @@ static int serial8250_suspend(struct pla {int i; -for (i =0 ; i <UART_NR ; i++) { +for (i =0 ; i < nr_uarts; i++) {struct uart_8250_port *up = &serial8250_ports[i];if (up->port.type !=PORT_UNKNOWN && up->port.dev == &dev->dev)
@@ -2449,7 +2453,7 @@ static int serial8250_resume(struct plat {int i; -for (i =0 ; i <UART_NR ; i++) { +for (i =0 ; i < nr_uarts; i++) {struct uart_8250_port *up = &serial8250_ports[i];if (up->port.type !=PORT_UNKNOWN && up->port.dev == &dev->dev)
@@ -2489,7 +2493,7 @@ static struct uart_8250_port *serial8250/* * First, find a port entry which matches. */ -for (i =0 ; i <UART_NR ; i++) +for (i =0 ; i < nr_uarts; i++)if (uart_match_port (&serial8250_ports[i].port, port))return &serial8250_ports[i];
@@ -2498,7 +2502,7 @@ static struct uart_8250_port *serial8250* free entry. We look for one which hasn't been previously * used (indicated by zero iobase). */ -for (i =0 ; i <UART_NR ; i++) +for (i =0 ; i < nr_uarts; i++)if (serial8250_ports[i].port.type ==PORT_UNKNOWN && serial8250_ports[i].port.iobase ==0 )return &serial8250_ports[i];
@@ -2507,7 +2511,7 @@ static struct uart_8250_port *serial8250* That also failed. Last resort is to find any entry which * doesn't have a real port associated with it. */ -for (i =0 ; i <UART_NR ; i++) +for (i =0 ; i < nr_uarts; i++)if (serial8250_ports[i].port.type ==PORT_UNKNOWN )return &serial8250_ports[i];
@@ -2593,7 +2597,7 @@ static int __init serial8250_init(void)int ret, i;printk (KERN_INFO "Serial: 8250/16550 driver $Revision: 1.90 $ " -"%d ports, IRQ sharing %sabled\n" , (int )UART_NR , +"%d ports, IRQ sharing %sabled\n" , nr_uarts, share_irqs ?"en" :"dis" );for (i =0 ; i <NR_IRQS ; i++)
@@ -2653,6 +2657,9 @@ module_param(share_irqs, uint, 0644);MODULE_PARM_DESC (share_irqs,"Share IRQs with other non-8250/16x50 devices" " (unsafe)" ); +module_param (nr_uarts, uint,0644 ); +MODULE_PARM_DESC (nr_uarts,"Maximum number of UARTs supported." ); +#ifdef CONFIG_SERIAL_8250_RSA module_param_array (probe_rsa, ulong, &probe_rsa_count,0444 );MODULE_PARM_DESC (probe_rsa,"Probe I/O ports for RSA" );
drivers/serial/Kconfig +9 -0
@@ -95,6 +100,15 @@ config SERIAL_8250_NR_UARTS PCI enumeration and any ports that may be added at run-time via hot-plug, or any ISA multi-port serial cards. +config SERIAL_8250_RUNTIME_UARTS + int "Number of 8250/16550 serial ports to register at runtime" + depends on SERIAL_8250 + default "4" + help + Set this to the maximum number of serial ports you want + the kernel to register at boot time. This can be overriden + with the parameter "nr_uarts". + config SERIAL_8250_EXTENDED bool "Extended 8250/16550 serial driver options" depends on SERIAL_8250
Quoted 5 lines · Dave Jones
Ok, how about something along the lines of this (completely untested) patch, which adds a runtime param to lower the number of registered ports, also allowing a default to be set for common cases.
Would something like this be acceptable ?
Sure, looks fine. The new parameter should probably be documented though, so folk know about it.
drivers/serial/8250.c module_param(share_irqs, uint, 0644); · line 2661
Quoted 6 lines
drivers/serial/8250.c +2
-0@@ -2653,6 +2657,9 @@ module_param(share_irqs, uint, 0644);MODULE_PARM_DESC (share_irqs,"Share IRQs with other non-8250/16x50 devices" " (unsafe)" ); +module_param (nr_uarts, uint,0644 ); +MODULE_PARM_DESC (nr_uarts,"Maximum number of UARTs supported." );
Should this help string include the compile-time maximum somehow?
What limits it to the compile-time maximum?
drivers/serial/Kconfig config SERIAL_8250_NR_UARTS · line 106
Quoted 11 lines
diff -urpN --exclude-from=/home/devel/davej/.exclude vanilla/drivers/serial/Kconfig linux-2.6.14/drivers/serial/Kconfig
drivers/serial/Kconfig +4
-0@@ -95,6 +100,15 @@ config SERIAL_8250_NR_UARTS PCI enumeration and any ports that may be added at run-time via hot-plug, or any ISA multi-port serial cards. +config SERIAL_8250_RUNTIME_UARTS + int "Number of 8250/16550 serial ports to register at runtime" + depends on SERIAL_8250 + default "4"
Can this be restricted to a range of 1 to SERIAL_8250_UARTS ?
drivers/serial/Kconfig config SERIAL_8250_NR_UARTS · line 110
Quoted 4 lines
drivers/serial/Kconfig +4
-0+ help + Set this to the maximum number of serial ports you want + the kernel to register at boot time. This can be overriden + with the parameter "nr_uarts".
And should we also give a pointer to the boot-time parameter (which I think will be 8250.nr_uarts ?)
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core
Quoted 3 lines · Russell King
Quoted 1 line
Would something like this be acceptable ?
Sure, looks fine. The new parameter should probably be documented though, so folk know about it.
Where to? Looks like the other 8250 params aren't documented in Documentation/ either.
If there's another good place for it already, I'll add it there. Shall I just add it to kernel-parameters.txt ?
Quoted 8 lines
Review module_param(share_irqs, uint, 0644); · line 2661
Quoted 6 lines
(quoted diff) +2
-0@@ -2653,6 +2657,9 @@ module_param(share_irqs, uint, 0644); MODULE_PARM_DESC(share_irqs, "Share IRQs with other non-8250/16x50 devices" " (unsafe)"); +module_param(nr_uarts, uint, 0644); +MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported.");Should this help string include the compile-time maximum somehow?
Done.
Quoted 1 line
What limits it to the compile-time maximum?
Hey, this was a rough & ready implementation ;)
I wanted to be sure you were ok with the principle of it first. It now clips it to NR_UARTS.
Quoted 6 lines
Review module_param(share_irqs, uint, 0644); · line 2665
Quoted 4 lines
(quoted diff) +4
-0+config SERIAL_8250_RUNTIME_UARTS + int "Number of 8250/16550 serial ports to register at runtime" + depends on SERIAL_8250 + default "4"Can this be restricted to a range of 1 to
SERIAL_8250_UARTS?
Heh, Seems not.
menuconfig gets very confused by range 1 CONFIG_SERIAL_8250_NR_UARTS and won't let me set it to anything.
We can always add that later though if Kconfig gets fixed.
Quoted 7 lines
Review module_param(share_irqs, uint, 0644);
Quoted 4 lines
(quoted diff) +4
-0+ help + Set this to the maximum number of serial ports you want + the kernel to register at boot time. This can be overriden + with the parameter "nr_uarts".And should we also give a pointer to the boot-time parameter (which I think will be 8250.nr_uarts ?)
Done.
Here's another iteration. I'll boot test this in a bit, and if it does the right thing, I'll add the documenation and a sign-off and send it your way.
Dave
drivers/serial/8250.c +20 -12
@@ -53,6 +53,8 @@*/ static unsigned int share_irqs =SERIAL8250_SHARE_IRQS ; +static unsigned int nr_uarts =CONFIG_SERIAL_8250_RUNTIME_UARTS ; +/* * Debugging. */
@@ -2047,7 +2049,7 @@ static void __init serial8250_isa_init_preturn ; first =0 ; -for (i =0 ; i <UART_NR ; i++) { +for (i =0 ; i < nr_uarts; i++) {struct uart_8250_port *up = &serial8250_ports[i]; up->port.line = i;
@@ -2066,7 +2068,7 @@ static void __init serial8250_isa_init_p }for (i =0 , up = serial8250_ports; - i <ARRAY_SIZE (old_serial_port) && i <UART_NR ; + i <ARRAY_SIZE (old_serial_port) && i < nr_uarts; i++, up++) { up->port.iobase = old_serial_port[i].port; up->port.irq =irq_canonicalize (old_serial_port[i].irq);
@@ -2088,7 +2090,7 @@ serial8250_register_ports(struct uart_drserial8250_isa_init_ports (); -for (i =0 ; i <UART_NR ; i++) { +for (i =0 ; i < nr_uarts; i++) {struct uart_8250_port *up = &serial8250_ports[i]; up->port.dev = dev;
@@ -2189,7 +2191,7 @@ static int serial8250_console_setup(stru* if so, search for the first available port that does have * console support. */ -if (co->index >=UART_NR ) +if (co->index >= nr_uarts) co->index =0 ; port = &serial8250_ports[co->index].port;if (!port->iobase && !port->membase)
@@ -2225,7 +2227,7 @@ static int __init find_port(struct uart_int line;struct uart_port *port; -for (line =0 ; line <UART_NR ; line++) { +for (line =0 ; line < nr_uarts; line++) { port = &serial8250_ports[line].port; if (p->iotype == port->iotype && p->iobase == port->iobase &&
@@ -2349,7 +2351,7 @@ static int __devexit serial8250_remove(s {int i; -for (i =0 ; i <UART_NR ; i++) { +for (i =0 ; i < nr_uarts; i++) {struct uart_8250_port *up = &serial8250_ports[i];if (up->port.dev == dev)
@@ -2365,7 +2367,7 @@ static int serial8250_suspend(struct devif (level !=SUSPEND_DISABLE )return 0 ; -for (i =0 ; i <UART_NR ; i++) { +for (i =0 ; i < nr_uarts; i++) {struct uart_8250_port *up = &serial8250_ports[i];if (up->port.type !=PORT_UNKNOWN && up->port.dev == dev)
@@ -2382,7 +2384,7 @@ static int serial8250_resume(struct deviif (level !=RESUME_ENABLE )return 0 ; -for (i =0 ; i <UART_NR ; i++) { +for (i =0 ; i < nr_uarts; i++) {struct uart_8250_port *up = &serial8250_ports[i];if (up->port.type !=PORT_UNKNOWN && up->port.dev == dev)
@@ -2421,7 +2423,7 @@ static struct uart_8250_port *serial8250/* * First, find a port entry which matches. */ -for (i =0 ; i <UART_NR ; i++) +for (i =0 ; i < nr_uarts; i++)if (uart_match_port (&serial8250_ports[i].port, port))return &serial8250_ports[i];
@@ -2430,7 +2432,7 @@ static struct uart_8250_port *serial8250* free entry. We look for one which hasn't been previously * used (indicated by zero iobase). */ -for (i =0 ; i <UART_NR ; i++) +for (i =0 ; i < nr_uarts; i++)if (serial8250_ports[i].port.type ==PORT_UNKNOWN && serial8250_ports[i].port.iobase ==0 )return &serial8250_ports[i];
@@ -2439,7 +2441,7 @@ static struct uart_8250_port *serial8250* That also failed. Last resort is to find any entry which * doesn't have a real port associated with it. */ -for (i =0 ; i <UART_NR ; i++) +for (i =0 ; i < nr_uarts; i++)if (serial8250_ports[i].port.type ==PORT_UNKNOWN )return &serial8250_ports[i];
@@ -2524,8 +2526,11 @@ static int __init serial8250_init(void) {int ret, i; +if (nr_uarts >UART_NR ) + nr_uarts =UART_NR ; +printk (KERN_INFO "Serial: 8250/16550 driver $Revision: 1.90 $ " -"%d ports, IRQ sharing %sabled\n" , (int )UART_NR , +"%d ports, IRQ sharing %sabled\n" , nr_uarts, share_irqs ?"en" :"dis" );for (i =0 ; i <NR_IRQS ; i++)
@@ -2585,6 +2590,9 @@ module_param(share_irqs, uint, 0644);MODULE_PARM_DESC (share_irqs,"Share IRQs with other non-8250/16x50 devices" " (unsafe)" ); +module_param (nr_uarts, uint,0644 ); +MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported. (1-" __MODULE_STRING(CONFIG_SERIAL_8250_RUNTIME_UARTS) ")"); +#ifdef CONFIG_SERIAL_8250_RSA module_param_array (probe_rsa, ulong, &probe_rsa_count,0444 );MODULE_PARM_DESC (probe_rsa,"Probe I/O ports for RSA" );
drivers/serial/Kconfig +10 -0
@@ -95,6 +95,16 @@ config SERIAL_8250_NR_UARTS PCI enumeration and any ports that may be added at run-time via hot-plug, or any ISA multi-port serial cards. +config SERIAL_8250_RUNTIME_UARTS + int "Number of 8250/16550 serial ports to register at runtime" + depends on SERIAL_8250 + default "4" + help + Set this to the maximum number of serial ports you want + the kernel to register at boot time. This can be overriden + with the module parameter "nr_uarts", or boot-time parameter + 8250.nr_uarts + config SERIAL_8250_EXTENDED bool "Extended 8250/16550 serial driver options" depends on SERIAL_8250
Quoted 3 lines · Dave Jones
Here's another iteration. I'll boot test this in a bit, and if it does the right thing, I'll add the documenation and a sign-off and send it your way.
Seems to the right thing.
Dave
Make the number of UARTs registered configurable.
Also add a nr_uarts module option to the 8250 code
to override this, up to a maximum of CONFIG_SERIAL_8250_NR_UARTS
This should appease people who complain about a proliferation of /dev/ttyS & /sysfs nodes whilst at the same time allowing a single kernel image to support the rarer occasions of lots of devices.
drivers/serial/8250.c +20 -12
@@ -53,6 +53,8 @@*/ static unsigned int share_irqs =SERIAL8250_SHARE_IRQS ; +static unsigned int nr_uarts =CONFIG_SERIAL_8250_RUNTIME_UARTS ; +/* * Debugging. */
@@ -2047,7 +2049,7 @@ static void __init serial8250_isa_init_preturn ; first =0 ; -for (i =0 ; i <UART_NR ; i++) { +for (i =0 ; i < nr_uarts; i++) {struct uart_8250_port *up = &serial8250_ports[i]; up->port.line = i;
@@ -2066,7 +2068,7 @@ static void __init serial8250_isa_init_p }for (i =0 , up = serial8250_ports; - i <ARRAY_SIZE (old_serial_port) && i <UART_NR ; + i <ARRAY_SIZE (old_serial_port) && i < nr_uarts; i++, up++) { up->port.iobase = old_serial_port[i].port; up->port.irq =irq_canonicalize (old_serial_port[i].irq);
@@ -2088,7 +2090,7 @@ serial8250_register_ports(struct uart_drserial8250_isa_init_ports (); -for (i =0 ; i <UART_NR ; i++) { +for (i =0 ; i < nr_uarts; i++) {struct uart_8250_port *up = &serial8250_ports[i]; up->port.dev = dev;
@@ -2189,7 +2191,7 @@ static int serial8250_console_setup(stru* if so, search for the first available port that does have * console support. */ -if (co->index >=UART_NR ) +if (co->index >= nr_uarts) co->index =0 ; port = &serial8250_ports[co->index].port;if (!port->iobase && !port->membase)
@@ -2225,7 +2227,7 @@ static int __init find_port(struct uart_int line;struct uart_port *port; -for (line =0 ; line <UART_NR ; line++) { +for (line =0 ; line < nr_uarts; line++) { port = &serial8250_ports[line].port; if (p->iotype == port->iotype && p->iobase == port->iobase &&
@@ -2349,7 +2351,7 @@ static int __devexit serial8250_remove(s {int i; -for (i =0 ; i <UART_NR ; i++) { +for (i =0 ; i < nr_uarts; i++) {struct uart_8250_port *up = &serial8250_ports[i];if (up->port.dev == dev)
@@ -2365,7 +2367,7 @@ static int serial8250_suspend(struct devif (level !=SUSPEND_DISABLE )return 0 ; -for (i =0 ; i <UART_NR ; i++) { +for (i =0 ; i < nr_uarts; i++) {struct uart_8250_port *up = &serial8250_ports[i];if (up->port.type !=PORT_UNKNOWN && up->port.dev == dev)
@@ -2382,7 +2384,7 @@ static int serial8250_resume(struct deviif (level !=RESUME_ENABLE )return 0 ; -for (i =0 ; i <UART_NR ; i++) { +for (i =0 ; i < nr_uarts; i++) {struct uart_8250_port *up = &serial8250_ports[i];if (up->port.type !=PORT_UNKNOWN && up->port.dev == dev)
@@ -2421,7 +2423,7 @@ static struct uart_8250_port *serial8250/* * First, find a port entry which matches. */ -for (i =0 ; i <UART_NR ; i++) +for (i =0 ; i < nr_uarts; i++)if (uart_match_port (&serial8250_ports[i].port, port))return &serial8250_ports[i];
@@ -2430,7 +2432,7 @@ static struct uart_8250_port *serial8250* free entry. We look for one which hasn't been previously * used (indicated by zero iobase). */ -for (i =0 ; i <UART_NR ; i++) +for (i =0 ; i < nr_uarts; i++)if (serial8250_ports[i].port.type ==PORT_UNKNOWN && serial8250_ports[i].port.iobase ==0 )return &serial8250_ports[i];
@@ -2439,7 +2441,7 @@ static struct uart_8250_port *serial8250* That also failed. Last resort is to find any entry which * doesn't have a real port associated with it. */ -for (i =0 ; i <UART_NR ; i++) +for (i =0 ; i < nr_uarts; i++)if (serial8250_ports[i].port.type ==PORT_UNKNOWN )return &serial8250_ports[i];
@@ -2524,8 +2526,11 @@ static int __init serial8250_init(void) {int ret, i; +if (nr_uarts >UART_NR ) + nr_uarts =UART_NR ; +printk (KERN_INFO "Serial: 8250/16550 driver $Revision: 1.90 $ " -"%d ports, IRQ sharing %sabled\n" , (int )UART_NR , +"%d ports, IRQ sharing %sabled\n" , nr_uarts, share_irqs ?"en" :"dis" );for (i =0 ; i <NR_IRQS ; i++)
@@ -2585,6 +2590,9 @@ module_param(share_irqs, uint, 0644);MODULE_PARM_DESC (share_irqs,"Share IRQs with other non-8250/16x50 devices" " (unsafe)" ); +module_param (nr_uarts, uint,0644 ); +MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported. (1-" __MODULE_STRING(CONFIG_SERIAL_8250_NR_UARTS) ")"); +#ifdef CONFIG_SERIAL_8250_RSA module_param_array (probe_rsa, ulong, &probe_rsa_count,0444 );MODULE_PARM_DESC (probe_rsa,"Probe I/O ports for RSA" );
drivers/serial/Kconfig +10 -0
@@ -95,6 +95,16 @@ config SERIAL_8250_NR_UARTS PCI enumeration and any ports that may be added at run-time via hot-plug, or any ISA multi-port serial cards. +config SERIAL_8250_RUNTIME_UARTS + int "Number of 8250/16550 serial ports to register at runtime" + depends on SERIAL_8250 + default "4" + help + Set this to the maximum number of serial ports you want + the kernel to register at boot time. This can be overriden + with the module parameter "nr_uarts", or boot-time parameter + 8250.nr_uarts + config SERIAL_8250_EXTENDED bool "Extended 8250/16550 serial driver options" depends on SERIAL_8250
Documentation/kernel-parameters.txt renamed from Documentation/kernel-parameters.txt~ +2 -0
@@ -982,6 +982,8 @@ running once the system is up. nowb [ARM] + nr_uarts= [SERIAL] maximum number of UARTs to be registered. + opl3= [HW,OSS] Format: <io>
Quoted 10 lines · Dave Jones
Make the number of UARTs registered configurable.
Also add anr_uartsmodule option to the 8250 code
to override this, up to a maximum ofCONFIG_SERIAL_8250_NR_UARTSThis should appease people who complain about a proliferation of
/dev/ttyS& /sysfs nodes whilst at the same time allowing a single kernel image to support the rarer occasions of lots of devices.Signed-off-by Dave Jones <[email protected]>
Any chance of an updated patch please? It doesn't appear to be healthy:
patching file drivers/serial/8250.c
Hunk #1 succeeded at 54 (offset 1 line).
Hunk #2 succeeded at 2119 (offset 70 lines).
Hunk #3 succeeded at 2069 (offset 1 line).
Hunk #4 succeeded at 2160 (offset 70 lines).
Hunk #5 succeeded at 2194 (offset 3 lines).
Hunk #6 succeeded at 2297 with fuzz 2 (offset 70 lines).
Hunk #7 succeeded at 2352 with fuzz 1 (offset 1 line). misordered hunks! output would be garbled
Hunk #8 FAILED at 2421.
Hunk #9 succeeded at 2381 with fuzz 2 (offset -3 lines).
Hunk #10 succeeded at 2492 (offset 69 lines).
Hunk #11 succeeded at 2429 (offset -3 lines).
Hunk #12 succeeded at 2510 (offset 69 lines).
Hunk #13 succeeded at 2523 (offset -3 lines).
Hunk #14 succeeded at 2659 (offset 69 lines).
1 out of 14 hunks FAILED -- saving rejects to file drivers/serial/8250.c.rej patching file drivers/serial/Kconfig
patching file Documentation/kernel-parameters.txt
Thanks.
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core
Quoted 26 lines · Russell King
Quoted 10 lines · Dave Jones
Make the number of UARTs registered configurable.
Also add anr_uartsmodule option to the 8250 code
to override this, up to a maximum ofCONFIG_SERIAL_8250_NR_UARTSThis should appease people who complain about a proliferation of
/dev/ttyS& /sysfs nodes whilst at the same time allowing a single kernel image to support the rarer occasions of lots of devices.Signed-off-by Dave Jones <[email protected]>Any chance of an updated patch please? It doesn't appear to be healthy:
patching file
drivers/serial/8250.c
Hunk #1 succeeded at 54 (offset 1 line).
Hunk #2 succeeded at 2119 (offset 70 lines). Hunk #3 succeeded at 2069 (offset 1 line).
Hunk #4 succeeded at 2160 (offset 70 lines). Hunk #5 succeeded at 2194 (offset 3 lines). Hunk #6 succeeded at 2297 with fuzz 2 (offset 70 lines). Hunk #7 succeeded at 2352 with fuzz 1 (offset 1 line). misordered hunks! output would be garbled
Hunk #8 FAILED at 2421.
Hunk #9 succeeded at 2381 with fuzz 2 (offset -3 lines).
Quoted 8 lines
Hunk #10 succeeded at 2492 (offset 69 lines).
Hunk #11 succeeded at 2429 (offset -3 lines).
Hunk #12 succeeded at 2510 (offset 69 lines).
Hunk #13 succeeded at 2523 (offset -3 lines).
Hunk #14 succeeded at 2659 (offset 69 lines).
1 out of 14 hunks FAILED -- saving rejects to filedrivers/serial/8250.c.rejpatching filedrivers/serial/Kconfig
patching fileDocumentation/kernel-parameters.txt
Make the number of UARTs registered configurable.
Also add a nr_uarts module option to the 8250 code
to override this, up to a maximum of CONFIG_SERIAL_8250_NR_UARTS
This should appease people who complain about a proliferation of /dev/ttyS & /sysfs nodes whilst at the same time allowing a single kernel image to support the rarer occasions of lots of devices.
drivers/serial/8250.c +18 -10
@@ -53,6 +53,8 @@*/ static unsigned int share_irqs =SERIAL8250_SHARE_IRQS ; +static unsigned int nr_uarts =CONFIG_SERIAL_8250_RUNTIME_UARTS ; +/* * Debugging. */
@@ -2047,7 +2049,7 @@ static void __init serial8250_isa_init_preturn ; first =0 ; -for (i =0 ; i <UART_NR ; i++) { +for (i =0 ; i < nr_uarts; i++) {struct uart_8250_port *up = &serial8250_ports[i]; up->port.line = i;
@@ -2066,7 +2068,7 @@ static void __init serial8250_isa_init_p }for (i =0 , up = serial8250_ports; - i <ARRAY_SIZE (old_serial_port) && i <UART_NR ; + i <ARRAY_SIZE (old_serial_port) && i < nr_uarts; i++, up++) { up->port.iobase = old_serial_port[i].port; up->port.irq =irq_canonicalize (old_serial_port[i].irq);
@@ -2088,7 +2090,7 @@ serial8250_register_ports(struct uart_drserial8250_isa_init_ports (); -for (i =0 ; i <UART_NR ; i++) { +for (i =0 ; i < nr_uarts; i++) {struct uart_8250_port *up = &serial8250_ports[i]; up->port.dev = dev;
@@ -2189,7 +2191,7 @@ static int serial8250_console_setup(stru* if so, search for the first available port that does have * console support. */ -if (co->index >=UART_NR ) +if (co->index >= nr_uarts) co->index =0 ; port = &serial8250_ports[co->index].port;if (!port->iobase && !port->membase)
@@ -2225,7 +2227,7 @@ static int __init find_port(struct uart_int line;struct uart_port *port; -for (line =0 ; line <UART_NR ; line++) { +for (line =0 ; line < nr_uarts; line++) { port = &serial8250_ports[line].port; if (p->iotype == port->iotype && p->iobase == port->iobase &&
@@ -2349,7 +2351,7 @@ static int __devexit serial8250_remove(s {int i; -for (i =0 ; i <UART_NR ; i++) { +for (i =0 ; i < nr_uarts; i++) {struct uart_8250_port *up = &serial8250_ports[i];if (up->port.dev == dev)
@@ -2421,7 +2423,7 @@ static struct uart_8250_port *serial8250/* * First, find a port entry which matches. */ -for (i =0 ; i <UART_NR ; i++) +for (i =0 ; i < nr_uarts; i++)if (uart_match_port (&serial8250_ports[i].port, port))return &serial8250_ports[i];
@@ -2430,7 +2432,7 @@ static struct uart_8250_port *serial8250* free entry. We look for one which hasn't been previously * used (indicated by zero iobase). */ -for (i =0 ; i <UART_NR ; i++) +for (i =0 ; i < nr_uarts; i++)if (serial8250_ports[i].port.type ==PORT_UNKNOWN && serial8250_ports[i].port.iobase ==0 )return &serial8250_ports[i];
@@ -2439,7 +2441,7 @@ static struct uart_8250_port *serial8250* That also failed. Last resort is to find any entry which * doesn't have a real port associated with it. */ -for (i =0 ; i <UART_NR ; i++) +for (i =0 ; i < nr_uarts; i++)if (serial8250_ports[i].port.type ==PORT_UNKNOWN )return &serial8250_ports[i];
@@ -2524,8 +2526,11 @@ static int __init serial8250_init(void) {int ret, i; +if (nr_uarts >UART_NR ) + nr_uarts =UART_NR ; +printk (KERN_INFO "Serial: 8250/16550 driver $Revision: 1.90 $ " -"%d ports, IRQ sharing %sabled\n" , (int )UART_NR , +"%d ports, IRQ sharing %sabled\n" , nr_uarts, share_irqs ?"en" :"dis" );for (i =0 ; i <NR_IRQS ; i++)
@@ -2585,6 +2590,9 @@ module_param(share_irqs, uint, 0644);MODULE_PARM_DESC (share_irqs,"Share IRQs with other non-8250/16x50 devices" " (unsafe)" ); +module_param (nr_uarts, uint,0644 ); +MODULE_PARM_DESC(nr_uarts, "Maximum number of UARTs supported. (1-" __MODULE_STRING(CONFIG_SERIAL_8250_NR_UARTS) ")"); +#ifdef CONFIG_SERIAL_8250_RSA module_param_array (probe_rsa, ulong, &probe_rsa_count,0444 );MODULE_PARM_DESC (probe_rsa,"Probe I/O ports for RSA" );
drivers/serial/Kconfig +10 -0
@@ -95,6 +95,16 @@ config SERIAL_8250_NR_UARTS PCI enumeration and any ports that may be added at run-time via hot-plug, or any ISA multi-port serial cards. +config SERIAL_8250_RUNTIME_UARTS + int "Number of 8250/16550 serial ports to register at runtime" + depends on SERIAL_8250 + default "4" + help + Set this to the maximum number of serial ports you want + the kernel to register at boot time. This can be overriden + with the module parameter "nr_uarts", or boot-time parameter + 8250.nr_uarts + config SERIAL_8250_EXTENDED bool "Extended 8250/16550 serial driver options" depends on SERIAL_8250
Documentation/kernel-parameters.txt renamed from Documentation/kernel-parameters.txt~ +2 -0
@@ -982,6 +982,8 @@ running once the system is up. nowb [ARM] + nr_uarts= [SERIAL] maximum number of UARTs to be registered. + opl3= [HW,OSS] Format: <io>
Quoted 9 lines
Make the number of UARTs registered configurable.
Also add anr_uartsmodule option to the 8250 code
to override this, up to a maximum ofCONFIG_SERIAL_8250_NR_UARTSThis should appease people who complain about a proliferation of
/dev/ttyS& /sysfs nodes whilst at the same time allowing a single kernel image to support the rarer occasions of lots of devices.
Not to keep complaining, but I now have the following issue. I running Fedora Cores 2.6.15-1.1826 kernel. When I run dmesg I now see this:
Serial: 8250/16550 driver $Revision: 1.90 $ 2 ports, IRQ sharing enabled
serial8250: ttyS0 at I/O 0x3f8 (irq = 4) is a 16550A
00:06: ttyS0 at I/O 0x3f8 (irq = 4) is a 16550A
before 2.6.15 I saw
Serial: 8250/16550 driver $Revision: 1.90 $ 32 ports, IRQ sharing enabled
The serial driver now correctly reports that I have two serial ports instead of 32. So shouldn't the patch register the minimum of CONFIG_SERIAL_8250_NR_UARTS and the number of serial ports detected by the serial driver?
Thanks,
Jason Dravet
Quoted 7 lines · Jason Dravet
Not to keep complaining, but I now have the following issue. I running Fedora Cores 2.6.15-1.1826 kernel. When I run dmesg I now see this:
Serial: 8250/16550 driver $Revision: 1.90 $ 2 ports, IRQ sharing enabled
serial8250: ttyS0 at I/O0x3f8(irq = 4) is a 16550A
00:06: ttyS0 at I/O0x3f8(irq = 4) is a 16550A
Quoted 7 lines
before 2.6.15 I saw
Serial: 8250/16550 driver $Revision: 1.90 $ 32 ports, IRQ sharing enabledThe serial driver now correctly reports that I have two serial ports instead of 32. So shouldn't the patch register the minimum of
CONFIG_SERIAL_8250_NR_UARTSand the number of serial ports detected by the serial driver?
It's a classic chicken and egg problem. If you can solve such problems, please feel free to send a patch.
Signature · 3 lines
Russell King Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/ maintainer of: 2.6 Serial core