Commit e4fda3a0 authored by Maciej S. Szmigiero's avatar Maciej S. Szmigiero Committed by Greg Kroah-Hartman

serial: don't register CIR serial ports

CIR type serial ports aren't real serial ports.

This is just a way to prevent legacy 8250 serial
driver from probing and eventually binding some
resources.

Since in current state such ports aren't providing
any real functionality and it is not possible
to change their type via setserial/ioctl(TIOCSSERIAL)
(due to UPF_FIXED_PORT flag set on them)
it is simpler and cleaner to not register them at all
with serial core.

Print a short message in this case so it is known
to user what has happened.

This way checks for PORT_8250_CIR in serial port
callbacks can be removed too, since they won't
ever be called.
Signed-off-by: default avatarMaciej Szmigiero <mail@maciej.szmigiero.name>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 658e2ebc
...@@ -569,6 +569,9 @@ serial8250_register_ports(struct uart_driver *drv, struct device *dev) ...@@ -569,6 +569,9 @@ serial8250_register_ports(struct uart_driver *drv, struct device *dev)
for (i = 0; i < nr_uarts; i++) { for (i = 0; i < nr_uarts; i++) {
struct uart_8250_port *up = &serial8250_ports[i]; struct uart_8250_port *up = &serial8250_ports[i];
if (up->port.type == PORT_8250_CIR)
continue;
if (up->port.dev) if (up->port.dev)
continue; continue;
...@@ -1027,13 +1030,24 @@ int serial8250_register_8250_port(struct uart_8250_port *up) ...@@ -1027,13 +1030,24 @@ int serial8250_register_8250_port(struct uart_8250_port *up)
if (up->dl_write) if (up->dl_write)
uart->dl_write = up->dl_write; uart->dl_write = up->dl_write;
if (serial8250_isa_config != NULL) if (uart->port.type != PORT_8250_CIR) {
serial8250_isa_config(0, &uart->port, if (serial8250_isa_config != NULL)
&uart->capabilities); serial8250_isa_config(0, &uart->port,
&uart->capabilities);
ret = uart_add_one_port(&serial8250_reg,
&uart->port);
if (ret == 0)
ret = uart->port.line;
} else {
dev_info(uart->port.dev,
"skipping CIR port at 0x%lx / 0x%llx, IRQ %d\n",
uart->port.iobase,
(unsigned long long)uart->port.mapbase,
uart->port.irq);
ret = uart_add_one_port(&serial8250_reg, &uart->port); ret = 0;
if (ret == 0) }
ret = uart->port.line;
} }
mutex_unlock(&serial_mutex); mutex_unlock(&serial_mutex);
......
...@@ -1799,9 +1799,6 @@ int serial8250_do_startup(struct uart_port *port) ...@@ -1799,9 +1799,6 @@ int serial8250_do_startup(struct uart_port *port)
unsigned char lsr, iir; unsigned char lsr, iir;
int retval; int retval;
if (port->type == PORT_8250_CIR)
return -ENODEV;
if (!port->fifosize) if (!port->fifosize)
port->fifosize = uart_config[port->type].fifo_size; port->fifosize = uart_config[port->type].fifo_size;
if (!up->tx_loadsz) if (!up->tx_loadsz)
...@@ -2505,14 +2502,8 @@ static void serial8250_release_port(struct uart_port *port) ...@@ -2505,14 +2502,8 @@ static void serial8250_release_port(struct uart_port *port)
static int serial8250_request_port(struct uart_port *port) static int serial8250_request_port(struct uart_port *port)
{ {
struct uart_8250_port *up = up_to_u8250p(port); struct uart_8250_port *up = up_to_u8250p(port);
int ret;
if (port->type == PORT_8250_CIR)
return -ENODEV;
ret = serial8250_request_std_resource(up); return serial8250_request_std_resource(up);
return ret;
} }
static int fcr_get_rxtrig_bytes(struct uart_8250_port *up) static int fcr_get_rxtrig_bytes(struct uart_8250_port *up)
...@@ -2660,9 +2651,6 @@ static void serial8250_config_port(struct uart_port *port, int flags) ...@@ -2660,9 +2651,6 @@ static void serial8250_config_port(struct uart_port *port, int flags)
struct uart_8250_port *up = up_to_u8250p(port); struct uart_8250_port *up = up_to_u8250p(port);
int ret; int ret;
if (port->type == PORT_8250_CIR)
return;
/* /*
* Find the region that we can probe for. This in turn * Find the region that we can probe for. This in turn
* tells us whether we can probe for the type of port. * tells us whether we can probe for the type of port.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment