ping?
On Fri, Jan 15, 2016 at 5:27 PM, Ricardo Ribalda Delgado
<ricardo.ribalda@xxxxxxxxx> wrote:
> From: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx>
>
> The 8250_fintek driver advertises as the PNP0501 driver; however this
> conflicts with the standard 16550A uart PNP0501. The conflict causes
> the 8250_fintek driver to load with _every_ PNP0501, but never probe,
> and causing the entire 8250 driver stack to unload if the 8250_fintek
> driver is unloaded (modprobe doesn't know that 8250_pnp rather than
> 8250_fintek claimed the resource).
>
> This patch merges the Fintek driver into the pnp. Thre is a new device
> flags that tells the pnp driver when to probe the fintek devices.
>
> The fintek probe can be disabled completely via configuration.
>
> Credit-to: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx>
> Reported-by: Peter Hurley <peter@xxxxxxxxxxxxxxxxxx>
> Signed-off-by: Ricardo Ribalda Delgado <ricardo.ribalda@xxxxxxxxx>
> ---
> drivers/tty/serial/8250/8250.h | 6 +++
> drivers/tty/serial/8250/8250_fintek.c | 98 +++--------------------------------
> drivers/tty/serial/8250/8250_pnp.c | 10 +++-
> drivers/tty/serial/8250/Kconfig | 16 +++---
> drivers/tty/serial/8250/Makefile | 2 +-
> 5 files changed, 31 insertions(+), 101 deletions(-)
>
> diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h
> index d54dcd87c67e..44640a8608ce 100644
> --- a/drivers/tty/serial/8250/8250.h
> +++ b/drivers/tty/serial/8250/8250.h
> @@ -137,6 +137,12 @@ static inline int serial8250_pnp_init(void) { return 0; }
> static inline void serial8250_pnp_exit(void) { }
> #endif
>
> +#ifdef CONFIG_SERIAL_8250_FINTEK
> +int fintek_8250_probe(struct uart_8250_port *uart);
> +#else
> +static inline int fintek_8250_probe(struct uart_8250_port *uart) { return 0; }
> +#endif
> +
> #ifdef CONFIG_ARCH_OMAP1
> static inline int is_omap1_8250(struct uart_8250_port *pt)
> {
> diff --git a/drivers/tty/serial/8250/8250_fintek.c b/drivers/tty/serial/8250/8250_fintek.c
> index 89474399ab89..2b20e392b5ec 100644
> --- a/drivers/tty/serial/8250/8250_fintek.c
> +++ b/drivers/tty/serial/8250/8250_fintek.c
> @@ -1,9 +1,7 @@
> /*
> * Probe for F81216A LPC to 4 UART
> *
> - * Based on drivers/tty/serial/8250_pnp.c, by Russell King, et al
> - *
> - * Copyright (C) 2014 Ricardo Ribalda, Qtechnology A/S
> + * Copyright (C) 2014-2016 Ricardo Ribalda, Qtechnology A/S
> *
> *
> * This program is free software; you can redistribute it and/or modify
> @@ -38,19 +36,16 @@
> #define RXW4C_IRA BIT(3)
> #define TXW4C_IRA BIT(2)
>
> -#define DRIVER_NAME "8250_fintek"
> -
> struct fintek_8250 {
> u16 base_port;
> u8 index;
> u8 key;
> - long line;
> };
>
> static int fintek_8250_enter_key(u16 base_port, u8 key)
> {
>
> - if (!request_muxed_region(base_port, 2, DRIVER_NAME))
> + if (!request_muxed_region(base_port, 2, "8250_fintek"))
> return -EBUSY;
>
> outb(key, base_port + ADDR_PORT);
> @@ -179,104 +174,25 @@ static int fintek_8250_base_port(u16 io_address, u8 *key, u8 *index)
> return -ENODEV;
> }
>
> -static int
> -fintek_8250_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
> +int fintek_8250_probe(struct uart_8250_port *uart)
> {
> - struct uart_8250_port uart;
> struct fintek_8250 *pdata;
> int base_port;
> u8 key;
> u8 index;
>
> - if (!pnp_port_valid(dev, 0))
> - return -ENODEV;
> -
> - base_port = fintek_8250_base_port(pnp_port_start(dev, 0), &key, &index);
> + base_port = fintek_8250_base_port(uart->port.iobase, &key, &index);
> if (base_port < 0)
> return -ENODEV;
>
> - memset(&uart, 0, sizeof(uart));
> -
> - pdata = devm_kzalloc(&dev->dev, sizeof(*pdata), GFP_KERNEL);
> + pdata = devm_kzalloc(uart->port.dev, sizeof(*pdata), GFP_KERNEL);
> if (!pdata)
> return -ENOMEM;
> - uart.port.private_data = pdata;
> -
> - if (!pnp_irq_valid(dev, 0))
> - return -ENODEV;
> - uart.port.irq = pnp_irq(dev, 0);
> - uart.port.iobase = pnp_port_start(dev, 0);
> - uart.port.iotype = UPIO_PORT;
> - uart.port.rs485_config = fintek_8250_rs485_config;
> -
> - uart.port.flags |= UPF_SKIP_TEST | UPF_BOOT_AUTOCONF;
> - if (pnp_irq_flags(dev, 0) & IORESOURCE_IRQ_SHAREABLE)
> - uart.port.flags |= UPF_SHARE_IRQ;
> - uart.port.uartclk = 1843200;
> - uart.port.dev = &dev->dev;
> -
> pdata->key = key;
> pdata->base_port = base_port;
> pdata->index = index;
> - pdata->line = serial8250_register_8250_port(&uart);
> - if (pdata->line < 0)
> - return -ENODEV;
> + uart->port.rs485_config = fintek_8250_rs485_config;
> + uart->port.private_data = pdata;
>
> - pnp_set_drvdata(dev, pdata);
> return 0;
> }
> -
> -static void fintek_8250_remove(struct pnp_dev *dev)
> -{
> - struct fintek_8250 *pdata = pnp_get_drvdata(dev);
> -
> - if (pdata)
> - serial8250_unregister_port(pdata->line);
> -}
> -
> -#ifdef CONFIG_PM
> -static int fintek_8250_suspend(struct pnp_dev *dev, pm_message_t state)
> -{
> - struct fintek_8250 *pdata = pnp_get_drvdata(dev);
> -
> - if (!pdata)
> - return -ENODEV;
> - serial8250_suspend_port(pdata->line);
> - return 0;
> -}
> -
> -static int fintek_8250_resume(struct pnp_dev *dev)
> -{
> - struct fintek_8250 *pdata = pnp_get_drvdata(dev);
> -
> - if (!pdata)
> - return -ENODEV;
> - serial8250_resume_port(pdata->line);
> - return 0;
> -}
> -#else
> -#define fintek_8250_suspend NULL
> -#define fintek_8250_resume NULL
> -#endif /* CONFIG_PM */
> -
> -static const struct pnp_device_id fintek_dev_table[] = {
> - /* Qtechnology Panel PC / IO1000 */
> - { "PNP0501"},
> - {}
> -};
> -
> -MODULE_DEVICE_TABLE(pnp, fintek_dev_table);
> -
> -static struct pnp_driver fintek_8250_driver = {
> - .name = DRIVER_NAME,
> - .probe = fintek_8250_probe,
> - .remove = fintek_8250_remove,
> - .suspend = fintek_8250_suspend,
> - .resume = fintek_8250_resume,
> - .id_table = fintek_dev_table,
> -};
> -
> -module_pnp_driver(fintek_8250_driver);
> -MODULE_DESCRIPTION("Fintek F812164 module");
> -MODULE_AUTHOR("Ricardo Ribalda <ricardo.ribalda@xxxxxxxxx>");
> -MODULE_LICENSE("GPL");
> diff --git a/drivers/tty/serial/8250/8250_pnp.c b/drivers/tty/serial/8250/8250_pnp.c
> index 658b392d1170..98c2c085fd22 100644
> --- a/drivers/tty/serial/8250/8250_pnp.c
> +++ b/drivers/tty/serial/8250/8250_pnp.c
> @@ -25,6 +25,7 @@
>
> #define UNKNOWN_DEV 0x3000
> #define CIR_PORT 0x0800
> +#define CHECK_FINTEK 0x4000
>
> static const struct pnp_device_id pnp_dev_table[] = {
> /* Archtek America Corp. */
> @@ -207,7 +208,7 @@ static const struct pnp_device_id pnp_dev_table[] = {
> /* Generic standard PC COM port */
> { "PNP0500", 0 },
> /* Generic 16550A-compatible COM port */
> - { "PNP0501", 0 },
> + { "PNP0501", CHECK_FINTEK },
> /* Compaq 14400 Modem */
> { "PNPC000", 0 },
> /* Compaq 2400/9600 Modem */
> @@ -478,6 +479,12 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
> uart.port.uartclk = 1843200;
> uart.port.dev = &dev->dev;
>
> + if (flags & CHECK_FINTEK) {
> + ret = fintek_8250_probe(&uart);
> + if (ret && ret != -ENODEV)
> + return ret;
> + }
> +
> line = serial8250_register_8250_port(&uart);
> if (line < 0 || (flags & CIR_PORT))
> return -ENODEV;
> @@ -486,6 +493,7 @@ serial_pnp_probe(struct pnp_dev *dev, const struct pnp_device_id *dev_id)
> if (uart_console(&port->port))
> dev->capabilities |= PNP_CONSOLE;
>
> +
> pnp_set_drvdata(dev, (void *)((long)line + 1));
> return 0;
> }
> diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig
> index 6412f1455beb..66345bc9ee4a 100644
> --- a/drivers/tty/serial/8250/Kconfig
> +++ b/drivers/tty/serial/8250/Kconfig
> @@ -57,6 +57,14 @@ config SERIAL_8250_PNP
> This builds standard PNP serial support. You may be able to
> disable this feature if you only need legacy serial support.
>
> +config SERIAL_8250_FINTEK
> + bool "Support for Fintek F81216A LPC to 4 UART RS485 API"
> + depends on SERIAL_8250_PNP
> + default n
> + ---help---
> + Selecting this option will add support for the RS485 capabilities
> + of the Fintek F81216A LPC to 4 UART. If unsure, say N.
> +
> config SERIAL_8250_CONSOLE
> bool "Console on 8250/16550 and compatible serial port"
> depends on SERIAL_8250=y
> @@ -329,14 +337,6 @@ config SERIAL_8250_OMAP_TTYO_FIXUP
> not booting kernel because the serial console remains silent in case
> they forgot to update the command line.
>
> -config SERIAL_8250_FINTEK
> - tristate "Support for Fintek F81216A LPC to 4 UART"
> - depends on SERIAL_8250 && PNP
> - help
> - Selecting this option will add support for the Fintek F81216A
> - LPC to 4 UART. This device has some RS485 functionality not available
> - through the PNP driver. If unsure, say N.
> -
> config SERIAL_8250_LPC18XX
> tristate "NXP LPC18xx/43xx serial port support"
> depends on SERIAL_8250 && OF && (ARCH_LPC18XX || COMPILE_TEST)
> diff --git a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Makefile
> index e177f8681ada..da466cfbf9bb 100644
> --- a/drivers/tty/serial/8250/Makefile
> +++ b/drivers/tty/serial/8250/Makefile
> @@ -5,6 +5,7 @@
> obj-$(CONFIG_SERIAL_8250) += 8250.o 8250_base.o
> 8250-y := 8250_core.o
> 8250-$(CONFIG_SERIAL_8250_PNP) += 8250_pnp.o
> +8250-$(CONFIG_SERIAL_8250_FINTEK) += 8250_fintek.o
> 8250_base-y := 8250_port.o
> 8250_base-$(CONFIG_SERIAL_8250_DMA) += 8250_dma.o
> obj-$(CONFIG_SERIAL_8250_GSC) += 8250_gsc.o
> @@ -22,7 +23,6 @@ obj-$(CONFIG_SERIAL_8250_FSL) += 8250_fsl.o
> obj-$(CONFIG_SERIAL_8250_DW) += 8250_dw.o
> obj-$(CONFIG_SERIAL_8250_EM) += 8250_em.o
> obj-$(CONFIG_SERIAL_8250_OMAP) += 8250_omap.o
> -obj-$(CONFIG_SERIAL_8250_FINTEK) += 8250_fintek.o
> obj-$(CONFIG_SERIAL_8250_LPC18XX) += 8250_lpc18xx.o
> obj-$(CONFIG_SERIAL_8250_MT6577) += 8250_mtk.o
> obj-$(CONFIG_SERIAL_8250_UNIPHIER) += 8250_uniphier.o
> --
> 2.6.4
>
--
Ricardo Ribalda
--
To unsubscribe from this list: send the line "unsubscribe linux-serial" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
