8250-men-mcb: add support for 16z025 and 16z057
PATCH v2 1/1 8250-men-mcb: add support for 16z025 and 16z057
Add support for two MEN UARTs (16z025 and 16z057) to the 8250_men_mcb driver.
The 16z025 consists of up to four ports, the 16z057 has exactly four ports. Apart from that, all of them share the Port settings.
---
Changes to v1:
Deduplicated the two switch() blocks into a function returning the number of ports.
Minor style corrections.
--- drivers/tty/serial/8250/8250_men_mcb.c | 124 ++++++++++++++++++++++++--------- drivers/tty/serial/8250/Kconfig | 5 +- 2 files changed, 93 insertions(+), 36 deletions(-)
drivers/tty/serial/8250/8250_men_mcb.c +90 -34
@@ -7,6 +7,12 @@#include <linux/serial_8250.h> #include <uapi/linux/serial_core.h> +#define MEN_UART_ID_Z025 0x19 +#define MEN_UART_ID_Z057 0x39 +#define MEN_UART_ID_Z125 0x7d + +#define MEN_UART_MEM_SIZE 0x10 +struct serial_8250_men_mcb_data {struct uart_8250_port uart;int line;
@@ -18,7 +24,7 @@ struct serial_8250_men_mcb_data {* parameter in order to really set the correct baudrate, and * do so if possible without user interaction */ -static u32 men_z125_lookup_uartclk (struct mcb_device *mdev) +static u32 men_lookup_uartclk (struct mcb_device *mdev) {/* use default value if board is not available below */ u32 clkval =1041666 ;
@@ -28,10 +34,12 @@ static u32 men_z125_lookup_uartclk(struct mcb_device *mdev) mdev->bus->name);if (strncmp (mdev->bus->name,"F075" ,4 ) ==0 ) clkval =1041666 ; -else if (strncmp (mdev->bus->name,"F216" ,4 ) ==0 ) +else if (strncmp (mdev->bus->name,"F216" ,4 ) ==0 ) clkval =1843200 ;else if (strncmp (mdev->bus->name,"G215" ,4 ) ==0 ) clkval =1843200 ; +else if (strncmp (mdev->bus->name,"F210" ,4 ) ==0 ) + clkval =115200 ;else dev_info (&mdev->dev,"board not detected, using default uartclk\n" );
@@ -41,62 +49,108 @@ static u32 men_z125_lookup_uartclk(struct mcb_device *mdev)return clkval; } +static unsigned int get_num_ports (struct mcb_device *mdev, +void __iomem *membase) +{ +switch (mdev->id) { +case MEN_UART_ID_Z125 : +return 1U ; +case MEN_UART_ID_Z025 : +return readb (membase) >>4 ; +case MEN_UART_ID_Z057 : +return 4U ; +default : +dev_err (&mdev->dev,"no supported device!\n" ); +return -ENODEV ; + } +} +static int serial_8250_men_mcb_probe (struct mcb_device *mdev,const struct mcb_device_id *id) {struct serial_8250_men_mcb_data *data;struct resource *mem; - - data =devm_kzalloc (&mdev->dev, -sizeof (struct serial_8250_men_mcb_data ), -GFP_KERNEL ); -if (!data) -return -ENOMEM ; - -mcb_set_drvdata (mdev, data); - data->uart.port.dev = mdev->dma_dev; -spin_lock_init (&data->uart.port.lock); - - data->uart.port.type =PORT_16550 ; - data->uart.port.flags =UPF_SKIP_TEST |UPF_SHARE_IRQ |UPF_FIXED_TYPE ; - data->uart.port.iotype =UPIO_MEM ; - data->uart.port.uartclk =men_z125_lookup_uartclk (mdev); - data->uart.port.regshift =0 ; - data->uart.port.fifosize =60 ; +unsigned int num_ports; +unsigned int i; +void __iomem *membase; mem =mcb_get_resource (mdev,IORESOURCE_MEM );if (mem ==NULL )return -ENXIO ; + membase =devm_ioremap_resource (&mdev->dev, mem); +if (IS_ERR (membase)) +return PTR_ERR_OR_ZERO (membase); - data->uart.port.irq =mcb_get_irq (mdev); + num_ports =get_num_ports (mdev, membase); - data->uart.port.membase =devm_ioremap_resource (&mdev->dev, mem); -if (IS_ERR (data->uart.port.membase)) -return PTR_ERR_OR_ZERO (data->uart.port.membase); +dev_dbg (&mdev->dev,"found a 16z%03u with %u ports\n" , + mdev->id, num_ports); - data->uart.port.mapbase = (unsigned long ) mem->start; - data->uart.port.iobase = data->uart.port.mapbase; +if (num_ports ==0 || num_ports >4 ) { +dev_err (&mdev->dev,"unexpected number of ports: %u\n" , + num_ports); +return -ENODEV ; + } -/* ok, register the port */ - data->line =serial8250_register_8250_port (&data->uart); -if (data->line <0 ) -return data->line; + data =devm_kcalloc (&mdev->dev, num_ports, +sizeof (struct serial_8250_men_mcb_data ), +GFP_KERNEL ); +if (!data) +return -ENOMEM ; -dev_info (&mdev->dev,"found 16Z125 UART: ttyS%d\n" , data->line); +mcb_set_drvdata (mdev, data); + +for (i =0 ; i < num_ports; i++) { + data[i].uart.port.dev = mdev->dma_dev; +spin_lock_init (&data[i].uart.port.lock); + + data[i].uart.port.type =PORT_16550 ; + data[i].uart.port.flags =UPF_SKIP_TEST |UPF_SHARE_IRQ + |UPF_FIXED_TYPE ; + data[i].uart.port.iotype =UPIO_MEM ; + data[i].uart.port.uartclk =men_lookup_uartclk (mdev); + data[i].uart.port.regshift =0 ; + data[i].uart.port.irq =mcb_get_irq (mdev); + data[i].uart.port.membase = membase; + data[i].uart.port.fifosize =60 ; + data[i].uart.port.mapbase = (unsigned long ) mem->start + + i *MEN_UART_MEM_SIZE ; + data[i].uart.port.iobase = data[i].uart.port.mapbase; + +/* ok, register the port */ + data[i].line =serial8250_register_8250_port (&data[i].uart); +if (data[i].line <0 ) { +dev_err (&mdev->dev,"unable to register UART port\n" ); +return data[i].line; + } +dev_info (&mdev->dev,"found MCB UART: ttyS%d\n" , data[i].line); + }return 0 ; }static void serial_8250_men_mcb_remove (struct mcb_device *mdev) { +unsigned int num_ports, i;struct serial_8250_men_mcb_data *data =mcb_get_drvdata (mdev); -if (data) -serial8250_unregister_port (data->line); +if (!data) +return ; + + num_ports =get_num_ports (mdev, data[0 ].uart.port.membase); +if (num_ports <0 || num_ports >4 ) { +dev_err (&mdev->dev,"error retrieving number of ports!\n" ); +return ; + } + +for (i =0 ; i < num_ports; i++) +serial8250_unregister_port (data[i].line); }static const struct mcb_device_id serial_8250_men_mcb_ids[] = { - { .device =0x7d }, + { .device =MEN_UART_ID_Z025 }, + { .device =MEN_UART_ID_Z057 }, + { .device =MEN_UART_ID_Z125 }, { } };MODULE_DEVICE_TABLE (mcb, serial_8250_men_mcb_ids);
@@ -113,6 +167,8 @@ static struct mcb_driver mcb_driver = {module_mcb_driver (mcb_driver);MODULE_LICENSE ("GPL v2" ); -MODULE_DESCRIPTION ("MEN 16z125 8250 UART driver" ); +MODULE_DESCRIPTION ("MEN 8250 UART driver" );MODULE_AUTHOR ("Michael Moese <[email protected]" );MODULE_ALIAS ("mcb:16z125" ); +MODULE_ALIAS ("mcb:16z025" ); +MODULE_ALIAS ("mcb:16z057" );
drivers/tty/serial/8250/Kconfig +3 -2
@@ -157,11 +157,12 @@ config SERIAL_8250_CS If unsure, say N. config SERIAL_8250_MEN_MCB - tristate "MEN Z125 UART device support" + tristate "MEN MCB UART device support" depends on MCB && SERIAL_8250 help This enables support for FPGA based UARTs found on many MEN - boards. This driver enables support for the Z125 UARTs. + boards. This driver enables support for the 16z025, 16z057 + and 16z125 UARTs. To compile this driver as a module, chose M here: the module will be called 8250_men_mcb.
Signature · 1 line
2.13.6
kbuild test robot
build botThank you for the patch! Yet something to improve:
Hi Michael,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on tty/tty-testing]
[also build test ERROR on v4.16-rc3 next-20180302]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]
url: https://github.com/0day-ci/linux/commits/Michael-Moese/8250-men-mcb-add-support-for-16z025-and-16z057/20180303-104548 base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty-testing config: sparc64-allyesconfig (attached as .config) compiler: sparc64-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0
reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=sparc64
All errors (new ones prefixed by >>):
drivers/tty/serial/8250/8250_men_mcb.c: In function 'get_num_ports':
>> drivers/tty/serial/8250/8250_men_mcb.c:59:10: error: implicit declaration of function 'readb' [-Werror=implicit-function-declaration]
return readb(membase) >> 4;
^~~~~cc1: some warnings being treated as errors
vim +/readb +59 drivers/tty/serial/8250/8250_men_mcb.c
51
52 static unsigned int get_num_ports(struct mcb_device *mdev,
53 void __iomem *membase)
54 {
55 switch (mdev->id) {
56 case MEN_UART_ID_Z125:
57 return 1U;
58 case MEN_UART_ID_Z025:
> 59 return readb(membase) >> 4;
60 case MEN_UART_ID_Z057:
61 return 4U;
62 default:
63 dev_err(&mdev->dev, "no supported device!\n");
64 return -ENODEV;
65 }
66 }
67 ---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Quoted 18 lines · kbuild test robot
Hi Michael,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on tty/tty-testing]
[also build test ERROR on v4.16-rc3 next-20180302]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]url: https://github.com/0day-ci/linux/commits/Michael-Moese/8250-men-mcb-add-support-for-16z025-and-16z057/20180303-104548 base: https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty-testing config: sparc64-allyesconfig (attached as .config) compiler: sparc64-linux-gnu-gcc (Debian 7.2.0-11) 7.2.0reproduce:
wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross
# save the attached .config to linux build tree
make.cross ARCH=sparc64
Quoted 7 lines
All errors (new ones prefixed by >>):
drivers/tty/serial/8250/8250_men_mcb.c: In function 'get_num_ports':Quoted 1 line
Quoted 1 line
drivers/tty/serial/8250/8250_men_mcb.c:59:10: error: implicit declaration of function 'readb' [-Werror=implicit-function-declaration]return readb(membase) >> 4; ^~~~~cc1: some warnings being treated as errors
I suppose kbuildbot can generate patches in similar cases, i.e. adding "#include <linux/io.h>" has to cure this.
Quoted 24 lines
vim +/readb +59
drivers/tty/serial/8250/8250_men_mcb.c51 52 static unsigned int get_num_ports(struct mcb_device *mdev, 53 void __iomem *membase) 54 { 55 switch (mdev->id) { 56 case MEN_UART_ID_Z125: 57 return 1U; 58 case MEN_UART_ID_Z025:Quoted 1 line
59 return readb(membase) >> 4;
60 case MEN_UART_ID_Z057: 61 return 4U; 62 default: 63 dev_err(&mdev->dev, "no supported device!\n"); 64 return -ENODEV; 65 } 66 } 67---
0-DAY kernel test infrastructure Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all Intel Corporation
Signature · 2 lines
With Best Regards, Andy Shevchenko