* [PATCH v2 10/16] serial: support for 16550A serial ports on LP-8x4x [not found] ` <1386901645-28895-1-git-send-email-ynvich@gmail.com> @ 2013-12-13 2:27 ` Sergei Ianovich [not found] ` <1387309071-22382-1-git-send-email-ynvich@gmail.com> 1 sibling, 0 replies; 31+ messages in thread From: Sergei Ianovich @ 2013-12-13 2:27 UTC (permalink / raw) To: linux-kernel, linux-arm-kernel Cc: Sergei Ianovich, Heikki Krogerus, Rob Herring, Pawel Moll, Mark Rutland, Stephen Warren, Ian Campbell, Rob Landley, Russell King, Greg Kroah-Hartman, Jiri Slaby, Grant Likely, Paul Bolle, James Cameron, open list:OPEN FIRMWARE AND..., open list:DOCUMENTATION, open list:SERIAL DRIVERS The patch adds support for 3 additional LP-8x4x built-in serial ports. The device can also host up to 8 extension cards with 4 serial ports on each card for a total of 35 ports. However, I don't have the hardware to test extension cards, so they are not supported, yet. Signed-off-by: Sergei Ianovich <ynvich@gmail.com> CC: Heikki Krogerus <heikki.krogerus@linux.intel.com> --- v0..v2 * register platform driver instead of platform device * use device tree * use devm helpers where possible .../devicetree/bindings/serial/lp8x4x-serial.txt | 35 +++++ arch/arm/boot/dts/pxa27x-lp8x4x.dts | 27 ++++ arch/arm/configs/lp8x4x_defconfig | 1 + drivers/tty/serial/8250/8250_lp8x4x.c | 162 +++++++++++++++++++++ drivers/tty/serial/8250/Kconfig | 12 ++ drivers/tty/serial/8250/Makefile | 1 + 6 files changed, 238 insertions(+) create mode 100644 Documentation/devicetree/bindings/serial/lp8x4x-serial.txt create mode 100644 drivers/tty/serial/8250/8250_lp8x4x.c diff --git a/Documentation/devicetree/bindings/serial/lp8x4x-serial.txt b/Documentation/devicetree/bindings/serial/lp8x4x-serial.txt new file mode 100644 index 0000000..eed4ffc --- /dev/null +++ b/Documentation/devicetree/bindings/serial/lp8x4x-serial.txt @@ -0,0 +1,35 @@ +UART ports on ICP DAS LP-8x4x + +ICP DAS LP-8x4x contains three additional serial ports interfaced via +Analog Devices ADM213EA chips in addition to 3 serial ports on PXA CPU. + +Required properties: +- compatible : should be "icpdas,uart-lp8x4x" + +- reg : should provide 16 byte man IO memory region and 1 byte region for + termios + +- interrupts : should provide interrupt + +- interrupt-parent : should provide a link to interrupt controller either + explicitly and implicitly from a parent node + +Examples (from pxa27x-lp8x4x.dts): + + uart@17009050 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x17009050 0x10 + 0x17009030 0x02>; + interrupt-parent = <&fpga>; + interrupts = <13>; + status = "okay"; + }; + + uart@17009060 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x17009060 0x10 + 0x17009032 0x02>; + interrupt-parent = <&fpga>; + interrupts = <14>; + status = "okay"; + }; diff --git a/arch/arm/boot/dts/pxa27x-lp8x4x.dts b/arch/arm/boot/dts/pxa27x-lp8x4x.dts index 2704760..4bcf400 100644 --- a/arch/arm/boot/dts/pxa27x-lp8x4x.dts +++ b/arch/arm/boot/dts/pxa27x-lp8x4x.dts @@ -129,5 +129,32 @@ interrupt-controller; status = "okay"; }; + + uart@17009050 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x17009050 0x10 + 0x17009030 0x02>; + interrupt-parent = <&fpga>; + interrupts = <13>; + status = "okay"; + }; + + uart@17009060 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x17009060 0x10 + 0x17009032 0x02>; + interrupt-parent = <&fpga>; + interrupts = <14>; + status = "okay"; + }; + + uart@17009070 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x17009070 0x10 + 0x17009034 0x02>; + interrupt-parent = <&fpga>; + interrupts = <15>; + status = "okay"; + }; }; }; diff --git a/arch/arm/configs/lp8x4x_defconfig b/arch/arm/configs/lp8x4x_defconfig index 8fa871e..ea1a4b8 100644 --- a/arch/arm/configs/lp8x4x_defconfig +++ b/arch/arm/configs/lp8x4x_defconfig @@ -111,6 +111,7 @@ CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_8250_LP8X4X=m CONFIG_HW_RANDOM=y CONFIG_I2C=m # CONFIG_I2C_COMPAT is not set diff --git a/drivers/tty/serial/8250/8250_lp8x4x.c b/drivers/tty/serial/8250/8250_lp8x4x.c new file mode 100644 index 0000000..ec2f215 --- /dev/null +++ b/drivers/tty/serial/8250/8250_lp8x4x.c @@ -0,0 +1,162 @@ +/* linux/drivers/tty/serial/8250/8250_lp8x4x.c + * + * Support for 16550A serial ports on ICP DAS LP-8x4x + * + * Copyright (C) 2013 Sergei Ianovich <ynvich@gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#include <linux/init.h> +#include <linux/io.h> +#include <linux/irq.h> +#include <linux/module.h> +#include <linux/serial_8250.h> +#include <linux/of.h> +#include <linux/platform_device.h> + +struct lp8x4x_serial_data { + int line; + void *ios_mem; +}; + +static void lp8x4x_serial_set_termios(struct uart_port *port, + struct ktermios *termios, struct ktermios *old) +{ + unsigned int len; + unsigned int baud; + struct lp8x4x_serial_data *data = port->private_data; + + switch (termios->c_cflag & CSIZE) { + case CS5: + len = 7; + break; + case CS6: + len = 8; + break; + case CS7: + len = 9; + break; + default: + case CS8: + len = 10; + break; + } + + if (termios->c_cflag & CSTOPB) + len++; + if (termios->c_cflag & PARENB) + len++; + if (!(termios->c_cflag & PARODD)) + len++; +#ifdef CMSPAR + if (termios->c_cflag & CMSPAR) + len++; +#endif + + len -= 9; + len &= 3; + len <<= 3; + /* + * Ask the core to calculate the divisor for us. + */ + baud = uart_get_baud_rate(port, termios, old, + port->uartclk / 16 / 0xffff, + port->uartclk / 16); + switch (baud) { + case 2400: + len |= 1; + case 4800: + len |= 2; + case 19200: + len |= 4; + case 38400: + len |= 5; + case 57600: + len |= 6; + case 115200: + len |= 7; + case 9600: + default: + len |= 3; + }; + iowrite8(len, data->ios_mem); + + serial8250_do_set_termios(port, termios, old); +} + +static struct of_device_id lp8x4x_serial_dt_ids[] = { + { .compatible = "icpdas,uart-lp8x4x", }, + {} +}; +MODULE_DEVICE_TABLE(of, lp8x4x_serial_dt_ids); + +static int lp8x4x_serial_probe(struct platform_device *pdev) +{ + struct uart_8250_port uart = {}; + struct lp8x4x_serial_data *data; + struct resource *mmres, *mires, *irqres; + int ret; + + mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0); + mires = platform_get_resource(pdev, IORESOURCE_MEM, 1); + irqres = platform_get_resource(pdev, IORESOURCE_IRQ, 0); + if (!mmres || !mires || !irqres) + return -ENODEV; + + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->ios_mem = devm_ioremap_resource(&pdev->dev, mires); + if (!data->ios_mem) + return -EFAULT; + + uart.port.iotype = UPIO_MEM; + uart.port.mapbase = mmres->start; + uart.port.iobase = mmres->start; + uart.port.regshift = 1; + uart.port.irq = irqres->start; + uart.port.flags = UPF_IOREMAP; + uart.port.dev = &pdev->dev; + uart.port.uartclk = 14745600; + uart.port.set_termios = lp8x4x_serial_set_termios; + uart.port.private_data = data; + + ret = serial8250_register_8250_port(&uart); + if (ret < 0) + return ret; + + data->line = ret; + + platform_set_drvdata(pdev, data); + + return 0; +} + +static int lp8x4x_serial_remove(struct platform_device *pdev) +{ + struct lp8x4x_serial_data *data = platform_get_drvdata(pdev); + + serial8250_unregister_port(data->line); + + return 0; +} + +static struct platform_driver lp8x4x_serial_driver = { + .probe = lp8x4x_serial_probe, + .remove = lp8x4x_serial_remove, + + .driver = { + .name = "uart-lp8x4x", + .owner = THIS_MODULE, + .of_match_table = lp8x4x_serial_dt_ids, + }, +}; + +module_platform_driver(lp8x4x_serial_driver); + +MODULE_AUTHOR("Sergei Ianovich"); +MODULE_DESCRIPTION("8250 serial port module for LP-8x4x"); +MODULE_LICENSE("GPL"); diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig index 81bd7c9..9fb0fbb 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig @@ -311,3 +311,15 @@ config SERIAL_PXA can enable its onboard serial ports by enabling this option. If you choose M here, the module name will be 8250_pxa. + +config SERIAL_8250_LP8X4X + tristate "Support 16550A ports on ICP DAS LP-8x4x" + depends on OF && SERIAL_8250 && SERIAL_8250_MANY_PORTS && ARCH_PXA + select LP8X4X_IRQ + help + In addition to serial ports on PXA270 SoC, LP-8x4x has 1 dual + RS232/RS485 port, 1 RS485 port and 1 RS232 port. + + Say N here, unless you plan to run this kernel on a LP-8x4x system. + + If you choose M here, the module name will be 8250_lp8x4x. diff --git a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Makefile index b7d1b61..7370bfb 100644 --- a/drivers/tty/serial/8250/Makefile +++ b/drivers/tty/serial/8250/Makefile @@ -17,6 +17,7 @@ obj-$(CONFIG_SERIAL_8250_ACCENT) += 8250_accent.o obj-$(CONFIG_SERIAL_8250_BOCA) += 8250_boca.o obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o +obj-$(CONFIG_SERIAL_8250_LP8X4X) += 8250_lp8x4x.o obj-$(CONFIG_SERIAL_8250_FSL) += 8250_fsl.o obj-$(CONFIG_SERIAL_8250_DW) += 8250_dw.o obj-$(CONFIG_SERIAL_8250_EM) += 8250_em.o -- 1.8.4.3 ^ permalink raw reply related [flat|nested] 31+ messages in thread
[parent not found: <1387309071-22382-1-git-send-email-ynvich@gmail.com>]
* [PATCH v3 01/21 resend] serial: rewrite pxa2xx-uart to use 8250_core [not found] ` <1387309071-22382-1-git-send-email-ynvich@gmail.com> @ 2013-12-17 19:37 ` Sergei Ianovich 2013-12-18 23:55 ` Greg Kroah-Hartman 2013-12-19 8:51 ` Heikki Krogerus 2013-12-17 19:37 ` [PATCH v3 12/21] serial: support for 16550A serial ports on LP-8x4x Sergei Ianovich ` (2 subsequent siblings) 3 siblings, 2 replies; 31+ messages in thread From: Sergei Ianovich @ 2013-12-17 19:37 UTC (permalink / raw) To: linux-kernel, linux-arm-kernel Cc: Sergei Ianovich, Greg Kroah-Hartman, Russell King, Jiri Slaby, Grant Likely, Rob Herring, Heikki Krogerus, James Cameron, Zhou Zhu, Haojian Zhuang, Arnd Bergmann, open list:SERIAL DRIVERS, open list:OPEN FIRMWARE AND... pxa2xx-uart was a separate uart platform driver. It was declaring the same device names and numbers as 8250 driver. As a result, it was impossible to use 8250 driver on PXA SoCs. Upon closer examination pxa2xx-uart turned out to be a clone of 8250_core driver. Workaround for Erratum #19 according to Marvel(R) PXA270M Processor Specification Update (April 19, 2010) is dropped. 8250_core reads from FIFO immediately after checking DR bit in LSR. Signed-off-by: Sergei Ianovich <ynvich@gmail.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Reviewed-by: James Cameron <quozl@laptop.org> CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- Resenging together with the rest of the series as the series breaks with this one at [PATCH 12/21] changes v2..v3 * remove devm_free/put as suggested by Heikki Krogerus * use SET_SYSTEM_SLEEP_PM_OPS macro to set pm ops as suggested by Heikki Krogerus changes v1..v2 * actually implement workaround for E74 in dl_write as spooted by James Cameron * added comment about E19 in commit message arch/arm/configs/am200epdkit_defconfig | 3 +- arch/arm/configs/cm_x2xx_defconfig | 3 +- arch/arm/configs/cm_x300_defconfig | 3 +- arch/arm/configs/colibri_pxa270_defconfig | 3 +- arch/arm/configs/colibri_pxa300_defconfig | 3 +- arch/arm/configs/corgi_defconfig | 4 +- arch/arm/configs/em_x270_defconfig | 3 +- arch/arm/configs/ezx_defconfig | 3 +- arch/arm/configs/h5000_defconfig | 3 +- arch/arm/configs/imote2_defconfig | 3 +- arch/arm/configs/lpd270_defconfig | 3 +- arch/arm/configs/lubbock_defconfig | 3 +- arch/arm/configs/mainstone_defconfig | 3 +- arch/arm/configs/mmp2_defconfig | 3 +- arch/arm/configs/pcm027_defconfig | 3 +- arch/arm/configs/pxa168_defconfig | 3 +- arch/arm/configs/pxa255-idp_defconfig | 3 +- arch/arm/configs/pxa3xx_defconfig | 3 +- arch/arm/configs/pxa910_defconfig | 3 +- arch/arm/configs/raumfeld_defconfig | 3 +- arch/arm/configs/spitz_defconfig | 4 +- arch/arm/configs/trizeps4_defconfig | 3 +- arch/arm/configs/viper_defconfig | 4 +- arch/arm/configs/xcep_defconfig | 3 +- drivers/tty/serial/8250/8250_pxa.c | 178 ++++++ drivers/tty/serial/8250/Kconfig | 9 + drivers/tty/serial/8250/Makefile | 1 + drivers/tty/serial/Kconfig | 23 - drivers/tty/serial/Makefile | 1 - drivers/tty/serial/pxa.c | 971 ------------------------------ 30 files changed, 236 insertions(+), 1022 deletions(-) create mode 100644 drivers/tty/serial/8250/8250_pxa.c delete mode 100644 drivers/tty/serial/pxa.c diff --git a/arch/arm/configs/am200epdkit_defconfig b/arch/arm/configs/am200epdkit_defconfig index f0dea52..0cde234 100644 --- a/arch/arm/configs/am200epdkit_defconfig +++ b/arch/arm/configs/am200epdkit_defconfig @@ -60,8 +60,9 @@ CONFIG_BLK_DEV_IDECS=m CONFIG_NETDEVICES=y CONFIG_NET_ETHERNET=y CONFIG_SMC91X=m +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set # CONFIG_HWMON is not set diff --git a/arch/arm/configs/cm_x2xx_defconfig b/arch/arm/configs/cm_x2xx_defconfig index a93ff8d..b9fbe65 100644 --- a/arch/arm/configs/cm_x2xx_defconfig +++ b/arch/arm/configs/cm_x2xx_defconfig @@ -96,8 +96,9 @@ CONFIG_KEYBOARD_PXA27x=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_UCB1400=m # CONFIG_SERIO_SERPORT is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_LEGACY_PTY_COUNT=16 # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/cm_x300_defconfig b/arch/arm/configs/cm_x300_defconfig index f4b7672..53a82ae 100644 --- a/arch/arm/configs/cm_x300_defconfig +++ b/arch/arm/configs/cm_x300_defconfig @@ -80,8 +80,9 @@ CONFIG_TOUCHSCREEN_WM97XX=m # CONFIG_TOUCHSCREEN_WM9713 is not set # CONFIG_SERIO is not set # CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_I2C=y CONFIG_I2C_PXA=y diff --git a/arch/arm/configs/colibri_pxa270_defconfig b/arch/arm/configs/colibri_pxa270_defconfig index 2ef2c5e..1ce0409 100644 --- a/arch/arm/configs/colibri_pxa270_defconfig +++ b/arch/arm/configs/colibri_pxa270_defconfig @@ -103,8 +103,9 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m CONFIG_SERIO_LIBPS2=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_I2C=y CONFIG_I2C_CHARDEV=y diff --git a/arch/arm/configs/colibri_pxa300_defconfig b/arch/arm/configs/colibri_pxa300_defconfig index b985334..f96bda0 100644 --- a/arch/arm/configs/colibri_pxa300_defconfig +++ b/arch/arm/configs/colibri_pxa300_defconfig @@ -31,8 +31,9 @@ CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_GPIO_ROTARY_ENCODER=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_DEBUG_GPIO=y # CONFIG_HWMON is not set diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig index 1fd1d1d..bb4842d 100644 --- a/arch/arm/configs/corgi_defconfig +++ b/arch/arm/configs/corgi_defconfig @@ -131,10 +131,10 @@ CONFIG_TOUCHSCREEN_ADS7846=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m # CONFIG_SERIO is not set -CONFIG_SERIAL_8250=m +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_LEGACY_PTYS is not set CONFIG_I2C=y CONFIG_I2C_PXA=y diff --git a/arch/arm/configs/em_x270_defconfig b/arch/arm/configs/em_x270_defconfig index 60a21e0..ec0ec54 100644 --- a/arch/arm/configs/em_x270_defconfig +++ b/arch/arm/configs/em_x270_defconfig @@ -90,8 +90,9 @@ CONFIG_TOUCHSCREEN_WM97XX=m # CONFIG_TOUCHSCREEN_WM9705 is not set # CONFIG_TOUCHSCREEN_WM9713 is not set # CONFIG_SERIO_SERPORT is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_LEGACY_PTY_COUNT=16 # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig index d95763d..631e2ec 100644 --- a/arch/arm/configs/ezx_defconfig +++ b/arch/arm/configs/ezx_defconfig @@ -215,8 +215,9 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y CONFIG_INPUT_PCAP=y # CONFIG_SERIO is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_LEGACY_PTY_COUNT=8 # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/h5000_defconfig b/arch/arm/configs/h5000_defconfig index 37903e3..655b735 100644 --- a/arch/arm/configs/h5000_defconfig +++ b/arch/arm/configs/h5000_defconfig @@ -47,8 +47,9 @@ CONFIG_MTD_PHYSMAP=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_LEGACY_PTY_COUNT=32 # CONFIG_HW_RANDOM is not set # CONFIG_HWMON is not set diff --git a/arch/arm/configs/imote2_defconfig b/arch/arm/configs/imote2_defconfig index fd996bb..49d45e9 100644 --- a/arch/arm/configs/imote2_defconfig +++ b/arch/arm/configs/imote2_defconfig @@ -193,8 +193,9 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y # CONFIG_SERIO is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_LEGACY_PTY_COUNT=8 # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/lpd270_defconfig b/arch/arm/configs/lpd270_defconfig index 1c8c9ee..c3927b6 100644 --- a/arch/arm/configs/lpd270_defconfig +++ b/arch/arm/configs/lpd270_defconfig @@ -38,8 +38,9 @@ CONFIG_SMC91X=y CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO_SERPORT is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_FB=y CONFIG_FB_PXA=y diff --git a/arch/arm/configs/lubbock_defconfig b/arch/arm/configs/lubbock_defconfig index c4ba274..c8b0436 100644 --- a/arch/arm/configs/lubbock_defconfig +++ b/arch/arm/configs/lubbock_defconfig @@ -37,8 +37,9 @@ CONFIG_PCMCIA_PCNET=y CONFIG_INPUT_EVDEV=y # CONFIG_SERIO_SERPORT is not set CONFIG_SERIO_SA1111=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_VGA_CONSOLE is not set CONFIG_USB_GADGET=y CONFIG_USB_G_SERIAL=m diff --git a/arch/arm/configs/mainstone_defconfig b/arch/arm/configs/mainstone_defconfig index 04efa1b..768892c 100644 --- a/arch/arm/configs/mainstone_defconfig +++ b/arch/arm/configs/mainstone_defconfig @@ -34,8 +34,9 @@ CONFIG_SMC91X=y CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO_SERPORT is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_FB=y CONFIG_FB_PXA=y # CONFIG_VGA_CONSOLE is not set diff --git a/arch/arm/configs/mmp2_defconfig b/arch/arm/configs/mmp2_defconfig index f1cb95e..1ced9df 100644 --- a/arch/arm/configs/mmp2_defconfig +++ b/arch/arm/configs/mmp2_defconfig @@ -44,8 +44,9 @@ CONFIG_SMC91X=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/pcm027_defconfig b/arch/arm/configs/pcm027_defconfig index 2f136c3..1280128 100644 --- a/arch/arm/configs/pcm027_defconfig +++ b/arch/arm/configs/pcm027_defconfig @@ -60,8 +60,9 @@ CONFIG_SMC91X=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/pxa168_defconfig b/arch/arm/configs/pxa168_defconfig index 74d7e01..1668dac 100644 --- a/arch/arm/configs/pxa168_defconfig +++ b/arch/arm/configs/pxa168_defconfig @@ -40,8 +40,9 @@ CONFIG_SMC91X=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set # CONFIG_HWMON is not set diff --git a/arch/arm/configs/pxa255-idp_defconfig b/arch/arm/configs/pxa255-idp_defconfig index 917a070..399a706 100644 --- a/arch/arm/configs/pxa255-idp_defconfig +++ b/arch/arm/configs/pxa255-idp_defconfig @@ -35,8 +35,9 @@ CONFIG_SMC91X=y CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO_SERPORT is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_FB=y CONFIG_FB_PXA=y # CONFIG_VGA_CONSOLE is not set diff --git a/arch/arm/configs/pxa3xx_defconfig b/arch/arm/configs/pxa3xx_defconfig index 60e3138..7c3e052 100644 --- a/arch/arm/configs/pxa3xx_defconfig +++ b/arch/arm/configs/pxa3xx_defconfig @@ -56,8 +56,9 @@ CONFIG_KEYBOARD_PXA27x=y CONFIG_KEYBOARD_PXA930_ROTARY=y CONFIG_MOUSE_PXA930_TRKBALL=y CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/pxa910_defconfig b/arch/arm/configs/pxa910_defconfig index 3bb7771..cdacfcb 100644 --- a/arch/arm/configs/pxa910_defconfig +++ b/arch/arm/configs/pxa910_defconfig @@ -40,8 +40,9 @@ CONFIG_SMC91X=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SPI=y CONFIG_FB=y CONFIG_MMP_DISP=y diff --git a/arch/arm/configs/raumfeld_defconfig b/arch/arm/configs/raumfeld_defconfig index f7caa90..f1e16f2 100644 --- a/arch/arm/configs/raumfeld_defconfig +++ b/arch/arm/configs/raumfeld_defconfig @@ -67,8 +67,9 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_EETI=m CONFIG_INPUT_MISC=y CONFIG_INPUT_GPIO_ROTARY_ENCODER=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_I2C=y CONFIG_I2C_CHARDEV=y diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig index 2e0419d..b6efcf5 100644 --- a/arch/arm/configs/spitz_defconfig +++ b/arch/arm/configs/spitz_defconfig @@ -128,10 +128,10 @@ CONFIG_TOUCHSCREEN_ADS7846=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m # CONFIG_SERIO is not set -CONFIG_SERIAL_8250=m +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_LEGACY_PTYS is not set CONFIG_SPI=y CONFIG_SPI_PXA2XX=y diff --git a/arch/arm/configs/trizeps4_defconfig b/arch/arm/configs/trizeps4_defconfig index 3162173..453c79c 100644 --- a/arch/arm/configs/trizeps4_defconfig +++ b/arch/arm/configs/trizeps4_defconfig @@ -132,8 +132,9 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m CONFIG_SERIO_LIBPS2=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_I2C=y CONFIG_I2C_CHARDEV=y diff --git a/arch/arm/configs/viper_defconfig b/arch/arm/configs/viper_defconfig index d36e0d3..4efac06 100644 --- a/arch/arm/configs/viper_defconfig +++ b/arch/arm/configs/viper_defconfig @@ -101,11 +101,11 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m # CONFIG_CONSOLE_TRANSLATIONS is not set # CONFIG_VT_CONSOLE is not set -CONFIG_SERIAL_8250=m +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=5 CONFIG_SERIAL_8250_RUNTIME_UARTS=5 CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_LEGACY_PTYS is not set CONFIG_I2C=y CONFIG_I2C_CHARDEV=y diff --git a/arch/arm/configs/xcep_defconfig b/arch/arm/configs/xcep_defconfig index 721832f..b67aeaf 100644 --- a/arch/arm/configs/xcep_defconfig +++ b/arch/arm/configs/xcep_defconfig @@ -60,8 +60,9 @@ CONFIG_NET_ETHERNET=y # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set # CONFIG_DEVKMEM is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_I2C=m diff --git a/drivers/tty/serial/8250/8250_pxa.c b/drivers/tty/serial/8250/8250_pxa.c new file mode 100644 index 0000000..0da0d40 --- /dev/null +++ b/drivers/tty/serial/8250/8250_pxa.c @@ -0,0 +1,178 @@ +/* + * drivers/tty/serial/8250/8250_pxa.c -- driver for PXA on-board UARTS + * Copyright: (C) 2013 Sergei Ianovich <ynvich@gmail.com> + * + * replaces drivers/serial/pxa.c by Nicolas Pitre + * Created: Feb 20, 2003 + * Copyright: (C) 2003 Monta Vista Software, Inc. + * + * Based on drivers/serial/8250.c by Russell King. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + +#include <linux/device.h> +#include <linux/init.h> +#include <linux/io.h> +#include <linux/module.h> +#include <linux/serial_8250.h> +#include <linux/serial_core.h> +#include <linux/serial_reg.h> +#include <linux/of.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/clk.h> +#include <linux/pm_runtime.h> + +#include "8250.h" + +struct pxa8250_data { + int line; + struct clk *clk; +}; + +#ifdef CONFIG_PM +static int serial_pxa_suspend(struct device *dev) +{ + struct pxa8250_data *data = dev_get_drvdata(dev); + + serial8250_suspend_port(data->line); + + return 0; +} + +static int serial_pxa_resume(struct device *dev) +{ + struct pxa8250_data *data = dev_get_drvdata(dev); + + serial8250_resume_port(data->line); + + return 0; +} +#endif + +static const struct dev_pm_ops serial_pxa_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(serial_pxa_suspend, serial_pxa_resume) +}; + +static struct of_device_id serial_pxa_dt_ids[] = { + { .compatible = "mrvl,pxa-uart", }, + { .compatible = "mrvl,mmp-uart", }, + {} +}; +MODULE_DEVICE_TABLE(of, serial_pxa_dt_ids); + +/* Uart divisor latch write */ +static void serial_pxa_dl_write(struct uart_8250_port *up, int value) +{ + unsigned int dll; + + serial_out(up, UART_DLL, value & 0xff); + /* + * work around Erratum #74 according to Marvel(R) PXA270M Processor + * Specification Update (April 19, 2010) + */ + dll = serial_in(up, UART_DLL); + WARN_ON(dll != (value & 0xff)); + + serial_out(up, UART_DLM, value >> 8 & 0xff); +} + + +static void serial_pxa_pm(struct uart_port *port, unsigned int state, + unsigned int oldstate) +{ + struct pxa8250_data *data = port->private_data; + + if (!state) + clk_prepare_enable(data->clk); + else + clk_disable_unprepare(data->clk); +} + +static int serial_pxa_probe(struct platform_device *pdev) +{ + struct uart_8250_port uart = {}; + struct pxa8250_data *data; + struct resource *mmres, *irqres; + int ret; + + mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0); + irqres = platform_get_resource(pdev, IORESOURCE_IRQ, 0); + if (!mmres || !irqres) + return -ENODEV; + + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(data->clk)) + return PTR_ERR(data->clk); + + ret = clk_prepare(data->clk); + if (ret) + return ret; + + uart.port.type = PORT_XSCALE; + uart.port.iotype = UPIO_MEM32; + uart.port.mapbase = mmres->start; + uart.port.regshift = 2; + uart.port.irq = irqres->start; + uart.port.fifosize = 64; + uart.port.flags = UPF_IOREMAP | UPF_SKIP_TEST; + uart.port.dev = &pdev->dev; + uart.port.uartclk = clk_get_rate(data->clk); + uart.port.pm = serial_pxa_pm; + uart.port.private_data = data; + uart.dl_write = serial_pxa_dl_write; + + ret = serial8250_register_8250_port(&uart); + if (ret < 0) + goto err_clk; + + data->line = ret; + + platform_set_drvdata(pdev, data); + + return 0; + + err_clk: + clk_unprepare(data->clk); + return ret; +} + +static int serial_pxa_remove(struct platform_device *pdev) +{ + struct pxa8250_data *data = platform_get_drvdata(pdev); + + serial8250_unregister_port(data->line); + + clk_unprepare(data->clk); + + return 0; +} + +static struct platform_driver serial_pxa_driver = { + .probe = serial_pxa_probe, + .remove = serial_pxa_remove, + + .driver = { + .name = "pxa2xx-uart", + .owner = THIS_MODULE, + .pm = &serial_pxa_pm_ops, + .of_match_table = serial_pxa_dt_ids, + }, +}; + +module_platform_driver(serial_pxa_driver); + +MODULE_AUTHOR("Sergei Ianovich"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:pxa2xx-uart"); diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig index 2332991..81bd7c9 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig @@ -302,3 +302,12 @@ config SERIAL_8250_RT288X If you have a Ralink RT288x/RT305x SoC based board and want to use the serial port, say Y to this option. The driver can handle up to 2 serial ports. If unsure, say N. + +config SERIAL_PXA + tristate "PXA serial port support" + depends on SERIAL_8250 && (ARCH_PXA || ARCH_MMP) + help + If you have a machine based on an Intel XScale PXA2xx CPU you + can enable its onboard serial ports by enabling this option. + + If you choose M here, the module name will be 8250_pxa. diff --git a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Makefile index 36d68d0..b7d1b61 100644 --- a/drivers/tty/serial/8250/Makefile +++ b/drivers/tty/serial/8250/Makefile @@ -20,3 +20,4 @@ obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o 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_PXA) += 8250_pxa.o diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index a3817ab..2ad7184b 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -396,29 +396,6 @@ config SERIAL_MPSC_CONSOLE help Say Y here if you want to support a serial console on a Marvell MPSC. -config SERIAL_PXA - bool "PXA serial port support" - depends on ARCH_PXA || ARCH_MMP - select SERIAL_CORE - help - If you have a machine based on an Intel XScale PXA2xx CPU you - can enable its onboard serial ports by enabling this option. - -config SERIAL_PXA_CONSOLE - bool "Console on PXA serial port" - depends on SERIAL_PXA - select SERIAL_CORE_CONSOLE - help - If you have enabled the serial port on the Intel XScale PXA - CPU you can make it the console by answering Y to this option. - - Even if you say Y here, the currently visible virtual console - (/dev/tty0) will still be used as the system console by default, but - you can alter that using a kernel command line option such as - "console=ttySA0". (Try "man bootparam" or see the documentation of - your boot loader (lilo or loadlin) about how to pass options to the - kernel at boot time.) - config SERIAL_SA1100 bool "SA1100 serial port support" depends on ARCH_SA1100 diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile index 3068c77..4ac337b 100644 --- a/drivers/tty/serial/Makefile +++ b/drivers/tty/serial/Makefile @@ -20,7 +20,6 @@ obj-$(CONFIG_SERIAL_8250) += 8250/ obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o -obj-$(CONFIG_SERIAL_PXA) += pxa.o obj-$(CONFIG_SERIAL_PNX8XXX) += pnx8xxx_uart.o obj-$(CONFIG_SERIAL_SA1100) += sa1100.o obj-$(CONFIG_SERIAL_BCM63XX) += bcm63xx_uart.o diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c deleted file mode 100644 index f9f20f3..0000000 --- a/drivers/tty/serial/pxa.c +++ /dev/null @@ -1,971 +0,0 @@ -/* - * Based on drivers/serial/8250.c by Russell King. - * - * Author: Nicolas Pitre - * Created: Feb 20, 2003 - * Copyright: (C) 2003 Monta Vista Software, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * Note 1: This driver is made separate from the already too overloaded - * 8250.c because it needs some kirks of its own and that'll make it - * easier to add DMA support. - * - * Note 2: I'm too sick of device allocation policies for serial ports. - * If someone else wants to request an "official" allocation of major/minor - * for this driver please be my guest. And don't forget that new hardware - * to come from Intel might have more than 3 or 4 of those UARTs. Let's - * hope for a better port registration and dynamic device allocation scheme - * with the serial core maintainer satisfaction to appear soon. - */ - - -#if defined(CONFIG_SERIAL_PXA_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) -#define SUPPORT_SYSRQ -#endif - -#include <linux/module.h> -#include <linux/ioport.h> -#include <linux/init.h> -#include <linux/console.h> -#include <linux/sysrq.h> -#include <linux/serial_reg.h> -#include <linux/circ_buf.h> -#include <linux/delay.h> -#include <linux/interrupt.h> -#include <linux/of.h> -#include <linux/platform_device.h> -#include <linux/tty.h> -#include <linux/tty_flip.h> -#include <linux/serial_core.h> -#include <linux/clk.h> -#include <linux/io.h> -#include <linux/slab.h> - -#define PXA_NAME_LEN 8 - -struct uart_pxa_port { - struct uart_port port; - unsigned char ier; - unsigned char lcr; - unsigned char mcr; - unsigned int lsr_break_flag; - struct clk *clk; - char name[PXA_NAME_LEN]; -}; - -static inline unsigned int serial_in(struct uart_pxa_port *up, int offset) -{ - offset <<= 2; - return readl(up->port.membase + offset); -} - -static inline void serial_out(struct uart_pxa_port *up, int offset, int value) -{ - offset <<= 2; - writel(value, up->port.membase + offset); -} - -static void serial_pxa_enable_ms(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - up->ier |= UART_IER_MSI; - serial_out(up, UART_IER, up->ier); -} - -static void serial_pxa_stop_tx(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - if (up->ier & UART_IER_THRI) { - up->ier &= ~UART_IER_THRI; - serial_out(up, UART_IER, up->ier); - } -} - -static void serial_pxa_stop_rx(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - up->ier &= ~UART_IER_RLSI; - up->port.read_status_mask &= ~UART_LSR_DR; - serial_out(up, UART_IER, up->ier); -} - -static inline void receive_chars(struct uart_pxa_port *up, int *status) -{ - unsigned int ch, flag; - int max_count = 256; - - do { - /* work around Errata #20 according to - * Intel(R) PXA27x Processor Family - * Specification Update (May 2005) - * - * Step 2 - * Disable the Reciever Time Out Interrupt via IER[RTOEI] - */ - up->ier &= ~UART_IER_RTOIE; - serial_out(up, UART_IER, up->ier); - - ch = serial_in(up, UART_RX); - flag = TTY_NORMAL; - up->port.icount.rx++; - - if (unlikely(*status & (UART_LSR_BI | UART_LSR_PE | - UART_LSR_FE | UART_LSR_OE))) { - /* - * For statistics only - */ - if (*status & UART_LSR_BI) { - *status &= ~(UART_LSR_FE | UART_LSR_PE); - up->port.icount.brk++; - /* - * We do the SysRQ and SAK checking - * here because otherwise the break - * may get masked by ignore_status_mask - * or read_status_mask. - */ - if (uart_handle_break(&up->port)) - goto ignore_char; - } else if (*status & UART_LSR_PE) - up->port.icount.parity++; - else if (*status & UART_LSR_FE) - up->port.icount.frame++; - if (*status & UART_LSR_OE) - up->port.icount.overrun++; - - /* - * Mask off conditions which should be ignored. - */ - *status &= up->port.read_status_mask; - -#ifdef CONFIG_SERIAL_PXA_CONSOLE - if (up->port.line == up->port.cons->index) { - /* Recover the break flag from console xmit */ - *status |= up->lsr_break_flag; - up->lsr_break_flag = 0; - } -#endif - if (*status & UART_LSR_BI) { - flag = TTY_BREAK; - } else if (*status & UART_LSR_PE) - flag = TTY_PARITY; - else if (*status & UART_LSR_FE) - flag = TTY_FRAME; - } - - if (uart_handle_sysrq_char(&up->port, ch)) - goto ignore_char; - - uart_insert_char(&up->port, *status, UART_LSR_OE, ch, flag); - - ignore_char: - *status = serial_in(up, UART_LSR); - } while ((*status & UART_LSR_DR) && (max_count-- > 0)); - tty_flip_buffer_push(&up->port.state->port); - - /* work around Errata #20 according to - * Intel(R) PXA27x Processor Family - * Specification Update (May 2005) - * - * Step 6: - * No more data in FIFO: Re-enable RTO interrupt via IER[RTOIE] - */ - up->ier |= UART_IER_RTOIE; - serial_out(up, UART_IER, up->ier); -} - -static void transmit_chars(struct uart_pxa_port *up) -{ - struct circ_buf *xmit = &up->port.state->xmit; - int count; - - if (up->port.x_char) { - serial_out(up, UART_TX, up->port.x_char); - up->port.icount.tx++; - up->port.x_char = 0; - return; - } - if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) { - serial_pxa_stop_tx(&up->port); - return; - } - - count = up->port.fifosize / 2; - do { - serial_out(up, UART_TX, xmit->buf[xmit->tail]); - xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); - up->port.icount.tx++; - if (uart_circ_empty(xmit)) - break; - } while (--count > 0); - - if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) - uart_write_wakeup(&up->port); - - - if (uart_circ_empty(xmit)) - serial_pxa_stop_tx(&up->port); -} - -static void serial_pxa_start_tx(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - if (!(up->ier & UART_IER_THRI)) { - up->ier |= UART_IER_THRI; - serial_out(up, UART_IER, up->ier); - } -} - -static inline void check_modem_status(struct uart_pxa_port *up) -{ - int status; - - status = serial_in(up, UART_MSR); - - if ((status & UART_MSR_ANY_DELTA) == 0) - return; - - if (status & UART_MSR_TERI) - up->port.icount.rng++; - if (status & UART_MSR_DDSR) - up->port.icount.dsr++; - if (status & UART_MSR_DDCD) - uart_handle_dcd_change(&up->port, status & UART_MSR_DCD); - if (status & UART_MSR_DCTS) - uart_handle_cts_change(&up->port, status & UART_MSR_CTS); - - wake_up_interruptible(&up->port.state->port.delta_msr_wait); -} - -/* - * This handles the interrupt from one port. - */ -static inline irqreturn_t serial_pxa_irq(int irq, void *dev_id) -{ - struct uart_pxa_port *up = dev_id; - unsigned int iir, lsr; - - iir = serial_in(up, UART_IIR); - if (iir & UART_IIR_NO_INT) - return IRQ_NONE; - lsr = serial_in(up, UART_LSR); - if (lsr & UART_LSR_DR) - receive_chars(up, &lsr); - check_modem_status(up); - if (lsr & UART_LSR_THRE) - transmit_chars(up); - return IRQ_HANDLED; -} - -static unsigned int serial_pxa_tx_empty(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned long flags; - unsigned int ret; - - spin_lock_irqsave(&up->port.lock, flags); - ret = serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0; - spin_unlock_irqrestore(&up->port.lock, flags); - - return ret; -} - -static unsigned int serial_pxa_get_mctrl(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned char status; - unsigned int ret; - - status = serial_in(up, UART_MSR); - - ret = 0; - if (status & UART_MSR_DCD) - ret |= TIOCM_CAR; - if (status & UART_MSR_RI) - ret |= TIOCM_RNG; - if (status & UART_MSR_DSR) - ret |= TIOCM_DSR; - if (status & UART_MSR_CTS) - ret |= TIOCM_CTS; - return ret; -} - -static void serial_pxa_set_mctrl(struct uart_port *port, unsigned int mctrl) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned char mcr = 0; - - if (mctrl & TIOCM_RTS) - mcr |= UART_MCR_RTS; - if (mctrl & TIOCM_DTR) - mcr |= UART_MCR_DTR; - if (mctrl & TIOCM_OUT1) - mcr |= UART_MCR_OUT1; - if (mctrl & TIOCM_OUT2) - mcr |= UART_MCR_OUT2; - if (mctrl & TIOCM_LOOP) - mcr |= UART_MCR_LOOP; - - mcr |= up->mcr; - - serial_out(up, UART_MCR, mcr); -} - -static void serial_pxa_break_ctl(struct uart_port *port, int break_state) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned long flags; - - spin_lock_irqsave(&up->port.lock, flags); - if (break_state == -1) - up->lcr |= UART_LCR_SBC; - else - up->lcr &= ~UART_LCR_SBC; - serial_out(up, UART_LCR, up->lcr); - spin_unlock_irqrestore(&up->port.lock, flags); -} - -static int serial_pxa_startup(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned long flags; - int retval; - - if (port->line == 3) /* HWUART */ - up->mcr |= UART_MCR_AFE; - else - up->mcr = 0; - - up->port.uartclk = clk_get_rate(up->clk); - - /* - * Allocate the IRQ - */ - retval = request_irq(up->port.irq, serial_pxa_irq, 0, up->name, up); - if (retval) - return retval; - - /* - * Clear the FIFO buffers and disable them. - * (they will be reenabled in set_termios()) - */ - serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO); - serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO | - UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT); - serial_out(up, UART_FCR, 0); - - /* - * Clear the interrupt registers. - */ - (void) serial_in(up, UART_LSR); - (void) serial_in(up, UART_RX); - (void) serial_in(up, UART_IIR); - (void) serial_in(up, UART_MSR); - - /* - * Now, initialize the UART - */ - serial_out(up, UART_LCR, UART_LCR_WLEN8); - - spin_lock_irqsave(&up->port.lock, flags); - up->port.mctrl |= TIOCM_OUT2; - serial_pxa_set_mctrl(&up->port, up->port.mctrl); - spin_unlock_irqrestore(&up->port.lock, flags); - - /* - * Finally, enable interrupts. Note: Modem status interrupts - * are set via set_termios(), which will be occurring imminently - * anyway, so we don't enable them here. - */ - up->ier = UART_IER_RLSI | UART_IER_RDI | UART_IER_RTOIE | UART_IER_UUE; - serial_out(up, UART_IER, up->ier); - - /* - * And clear the interrupt registers again for luck. - */ - (void) serial_in(up, UART_LSR); - (void) serial_in(up, UART_RX); - (void) serial_in(up, UART_IIR); - (void) serial_in(up, UART_MSR); - - return 0; -} - -static void serial_pxa_shutdown(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned long flags; - - free_irq(up->port.irq, up); - - /* - * Disable interrupts from this port - */ - up->ier = 0; - serial_out(up, UART_IER, 0); - - spin_lock_irqsave(&up->port.lock, flags); - up->port.mctrl &= ~TIOCM_OUT2; - serial_pxa_set_mctrl(&up->port, up->port.mctrl); - spin_unlock_irqrestore(&up->port.lock, flags); - - /* - * Disable break condition and FIFOs - */ - serial_out(up, UART_LCR, serial_in(up, UART_LCR) & ~UART_LCR_SBC); - serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO | - UART_FCR_CLEAR_RCVR | - UART_FCR_CLEAR_XMIT); - serial_out(up, UART_FCR, 0); -} - -static void -serial_pxa_set_termios(struct uart_port *port, struct ktermios *termios, - struct ktermios *old) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned char cval, fcr = 0; - unsigned long flags; - unsigned int baud, quot; - unsigned int dll; - - switch (termios->c_cflag & CSIZE) { - case CS5: - cval = UART_LCR_WLEN5; - break; - case CS6: - cval = UART_LCR_WLEN6; - break; - case CS7: - cval = UART_LCR_WLEN7; - break; - default: - case CS8: - cval = UART_LCR_WLEN8; - break; - } - - if (termios->c_cflag & CSTOPB) - cval |= UART_LCR_STOP; - if (termios->c_cflag & PARENB) - cval |= UART_LCR_PARITY; - if (!(termios->c_cflag & PARODD)) - cval |= UART_LCR_EPAR; - - /* - * Ask the core to calculate the divisor for us. - */ - baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); - quot = uart_get_divisor(port, baud); - - if ((up->port.uartclk / quot) < (2400 * 16)) - fcr = UART_FCR_ENABLE_FIFO | UART_FCR_PXAR1; - else if ((up->port.uartclk / quot) < (230400 * 16)) - fcr = UART_FCR_ENABLE_FIFO | UART_FCR_PXAR8; - else - fcr = UART_FCR_ENABLE_FIFO | UART_FCR_PXAR32; - - /* - * Ok, we're now changing the port state. Do it with - * interrupts disabled. - */ - spin_lock_irqsave(&up->port.lock, flags); - - /* - * Ensure the port will be enabled. - * This is required especially for serial console. - */ - up->ier |= UART_IER_UUE; - - /* - * Update the per-port timeout. - */ - uart_update_timeout(port, termios->c_cflag, baud); - - up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR; - if (termios->c_iflag & INPCK) - up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE; - if (termios->c_iflag & (BRKINT | PARMRK)) - up->port.read_status_mask |= UART_LSR_BI; - - /* - * Characters to ignore - */ - up->port.ignore_status_mask = 0; - if (termios->c_iflag & IGNPAR) - up->port.ignore_status_mask |= UART_LSR_PE | UART_LSR_FE; - if (termios->c_iflag & IGNBRK) { - up->port.ignore_status_mask |= UART_LSR_BI; - /* - * If we're ignoring parity and break indicators, - * ignore overruns too (for real raw support). - */ - if (termios->c_iflag & IGNPAR) - up->port.ignore_status_mask |= UART_LSR_OE; - } - - /* - * ignore all characters if CREAD is not set - */ - if ((termios->c_cflag & CREAD) == 0) - up->port.ignore_status_mask |= UART_LSR_DR; - - /* - * CTS flow control flag and modem status interrupts - */ - up->ier &= ~UART_IER_MSI; - if (UART_ENABLE_MS(&up->port, termios->c_cflag)) - up->ier |= UART_IER_MSI; - - serial_out(up, UART_IER, up->ier); - - if (termios->c_cflag & CRTSCTS) - up->mcr |= UART_MCR_AFE; - else - up->mcr &= ~UART_MCR_AFE; - - serial_out(up, UART_LCR, cval | UART_LCR_DLAB); /* set DLAB */ - serial_out(up, UART_DLL, quot & 0xff); /* LS of divisor */ - - /* - * work around Errata #75 according to Intel(R) PXA27x Processor Family - * Specification Update (Nov 2005) - */ - dll = serial_in(up, UART_DLL); - WARN_ON(dll != (quot & 0xff)); - - serial_out(up, UART_DLM, quot >> 8); /* MS of divisor */ - serial_out(up, UART_LCR, cval); /* reset DLAB */ - up->lcr = cval; /* Save LCR */ - serial_pxa_set_mctrl(&up->port, up->port.mctrl); - serial_out(up, UART_FCR, fcr); - spin_unlock_irqrestore(&up->port.lock, flags); -} - -static void -serial_pxa_pm(struct uart_port *port, unsigned int state, - unsigned int oldstate) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - if (!state) - clk_prepare_enable(up->clk); - else - clk_disable_unprepare(up->clk); -} - -static void serial_pxa_release_port(struct uart_port *port) -{ -} - -static int serial_pxa_request_port(struct uart_port *port) -{ - return 0; -} - -static void serial_pxa_config_port(struct uart_port *port, int flags) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - up->port.type = PORT_PXA; -} - -static int -serial_pxa_verify_port(struct uart_port *port, struct serial_struct *ser) -{ - /* we don't want the core code to modify any port params */ - return -EINVAL; -} - -static const char * -serial_pxa_type(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - return up->name; -} - -static struct uart_pxa_port *serial_pxa_ports[4]; -static struct uart_driver serial_pxa_reg; - -#ifdef CONFIG_SERIAL_PXA_CONSOLE - -#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) - -/* - * Wait for transmitter & holding register to empty - */ -static inline void wait_for_xmitr(struct uart_pxa_port *up) -{ - unsigned int status, tmout = 10000; - - /* Wait up to 10ms for the character(s) to be sent. */ - do { - status = serial_in(up, UART_LSR); - - if (status & UART_LSR_BI) - up->lsr_break_flag = UART_LSR_BI; - - if (--tmout == 0) - break; - udelay(1); - } while ((status & BOTH_EMPTY) != BOTH_EMPTY); - - /* Wait up to 1s for flow control if necessary */ - if (up->port.flags & UPF_CONS_FLOW) { - tmout = 1000000; - while (--tmout && - ((serial_in(up, UART_MSR) & UART_MSR_CTS) == 0)) - udelay(1); - } -} - -static void serial_pxa_console_putchar(struct uart_port *port, int ch) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - wait_for_xmitr(up); - serial_out(up, UART_TX, ch); -} - -/* - * Print a string to the serial port trying not to disturb - * any possible real use of the port... - * - * The console_lock must be held when we get here. - */ -static void -serial_pxa_console_write(struct console *co, const char *s, unsigned int count) -{ - struct uart_pxa_port *up = serial_pxa_ports[co->index]; - unsigned int ier; - unsigned long flags; - int locked = 1; - - clk_enable(up->clk); - local_irq_save(flags); - if (up->port.sysrq) - locked = 0; - else if (oops_in_progress) - locked = spin_trylock(&up->port.lock); - else - spin_lock(&up->port.lock); - - /* - * First save the IER then disable the interrupts - */ - ier = serial_in(up, UART_IER); - serial_out(up, UART_IER, UART_IER_UUE); - - uart_console_write(&up->port, s, count, serial_pxa_console_putchar); - - /* - * Finally, wait for transmitter to become empty - * and restore the IER - */ - wait_for_xmitr(up); - serial_out(up, UART_IER, ier); - - if (locked) - spin_unlock(&up->port.lock); - local_irq_restore(flags); - clk_disable(up->clk); - -} - -#ifdef CONFIG_CONSOLE_POLL -/* - * Console polling routines for writing and reading from the uart while - * in an interrupt or debug context. - */ - -static int serial_pxa_get_poll_char(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned char lsr = serial_in(up, UART_LSR); - - while (!(lsr & UART_LSR_DR)) - lsr = serial_in(up, UART_LSR); - - return serial_in(up, UART_RX); -} - - -static void serial_pxa_put_poll_char(struct uart_port *port, - unsigned char c) -{ - unsigned int ier; - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - /* - * First save the IER then disable the interrupts - */ - ier = serial_in(up, UART_IER); - serial_out(up, UART_IER, UART_IER_UUE); - - wait_for_xmitr(up); - /* - * Send the character out. - * If a LF, also do CR... - */ - serial_out(up, UART_TX, c); - if (c == 10) { - wait_for_xmitr(up); - serial_out(up, UART_TX, 13); - } - - /* - * Finally, wait for transmitter to become empty - * and restore the IER - */ - wait_for_xmitr(up); - serial_out(up, UART_IER, ier); -} - -#endif /* CONFIG_CONSOLE_POLL */ - -static int __init -serial_pxa_console_setup(struct console *co, char *options) -{ - struct uart_pxa_port *up; - int baud = 9600; - int bits = 8; - int parity = 'n'; - int flow = 'n'; - - if (co->index == -1 || co->index >= serial_pxa_reg.nr) - co->index = 0; - up = serial_pxa_ports[co->index]; - if (!up) - return -ENODEV; - - if (options) - uart_parse_options(options, &baud, &parity, &bits, &flow); - - return uart_set_options(&up->port, co, baud, parity, bits, flow); -} - -static struct console serial_pxa_console = { - .name = "ttyS", - .write = serial_pxa_console_write, - .device = uart_console_device, - .setup = serial_pxa_console_setup, - .flags = CON_PRINTBUFFER, - .index = -1, - .data = &serial_pxa_reg, -}; - -#define PXA_CONSOLE &serial_pxa_console -#else -#define PXA_CONSOLE NULL -#endif - -static struct uart_ops serial_pxa_pops = { - .tx_empty = serial_pxa_tx_empty, - .set_mctrl = serial_pxa_set_mctrl, - .get_mctrl = serial_pxa_get_mctrl, - .stop_tx = serial_pxa_stop_tx, - .start_tx = serial_pxa_start_tx, - .stop_rx = serial_pxa_stop_rx, - .enable_ms = serial_pxa_enable_ms, - .break_ctl = serial_pxa_break_ctl, - .startup = serial_pxa_startup, - .shutdown = serial_pxa_shutdown, - .set_termios = serial_pxa_set_termios, - .pm = serial_pxa_pm, - .type = serial_pxa_type, - .release_port = serial_pxa_release_port, - .request_port = serial_pxa_request_port, - .config_port = serial_pxa_config_port, - .verify_port = serial_pxa_verify_port, -#ifdef CONFIG_CONSOLE_POLL - .poll_get_char = serial_pxa_get_poll_char, - .poll_put_char = serial_pxa_put_poll_char, -#endif -}; - -static struct uart_driver serial_pxa_reg = { - .owner = THIS_MODULE, - .driver_name = "PXA serial", - .dev_name = "ttyS", - .major = TTY_MAJOR, - .minor = 64, - .nr = 4, - .cons = PXA_CONSOLE, -}; - -#ifdef CONFIG_PM -static int serial_pxa_suspend(struct device *dev) -{ - struct uart_pxa_port *sport = dev_get_drvdata(dev); - - if (sport) - uart_suspend_port(&serial_pxa_reg, &sport->port); - - return 0; -} - -static int serial_pxa_resume(struct device *dev) -{ - struct uart_pxa_port *sport = dev_get_drvdata(dev); - - if (sport) - uart_resume_port(&serial_pxa_reg, &sport->port); - - return 0; -} - -static const struct dev_pm_ops serial_pxa_pm_ops = { - .suspend = serial_pxa_suspend, - .resume = serial_pxa_resume, -}; -#endif - -static struct of_device_id serial_pxa_dt_ids[] = { - { .compatible = "mrvl,pxa-uart", }, - { .compatible = "mrvl,mmp-uart", }, - {} -}; -MODULE_DEVICE_TABLE(of, serial_pxa_dt_ids); - -static int serial_pxa_probe_dt(struct platform_device *pdev, - struct uart_pxa_port *sport) -{ - struct device_node *np = pdev->dev.of_node; - int ret; - - if (!np) - return 1; - - ret = of_alias_get_id(np, "serial"); - if (ret < 0) { - dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret); - return ret; - } - sport->port.line = ret; - return 0; -} - -static int serial_pxa_probe(struct platform_device *dev) -{ - struct uart_pxa_port *sport; - struct resource *mmres, *irqres; - int ret; - - mmres = platform_get_resource(dev, IORESOURCE_MEM, 0); - irqres = platform_get_resource(dev, IORESOURCE_IRQ, 0); - if (!mmres || !irqres) - return -ENODEV; - - sport = kzalloc(sizeof(struct uart_pxa_port), GFP_KERNEL); - if (!sport) - return -ENOMEM; - - sport->clk = clk_get(&dev->dev, NULL); - if (IS_ERR(sport->clk)) { - ret = PTR_ERR(sport->clk); - goto err_free; - } - - ret = clk_prepare(sport->clk); - if (ret) { - clk_put(sport->clk); - goto err_free; - } - - sport->port.type = PORT_PXA; - sport->port.iotype = UPIO_MEM; - sport->port.mapbase = mmres->start; - sport->port.irq = irqres->start; - sport->port.fifosize = 64; - sport->port.ops = &serial_pxa_pops; - sport->port.dev = &dev->dev; - sport->port.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF; - sport->port.uartclk = clk_get_rate(sport->clk); - - ret = serial_pxa_probe_dt(dev, sport); - if (ret > 0) - sport->port.line = dev->id; - else if (ret < 0) - goto err_clk; - snprintf(sport->name, PXA_NAME_LEN - 1, "UART%d", sport->port.line + 1); - - sport->port.membase = ioremap(mmres->start, resource_size(mmres)); - if (!sport->port.membase) { - ret = -ENOMEM; - goto err_clk; - } - - serial_pxa_ports[sport->port.line] = sport; - - uart_add_one_port(&serial_pxa_reg, &sport->port); - platform_set_drvdata(dev, sport); - - return 0; - - err_clk: - clk_unprepare(sport->clk); - clk_put(sport->clk); - err_free: - kfree(sport); - return ret; -} - -static int serial_pxa_remove(struct platform_device *dev) -{ - struct uart_pxa_port *sport = platform_get_drvdata(dev); - - uart_remove_one_port(&serial_pxa_reg, &sport->port); - - clk_unprepare(sport->clk); - clk_put(sport->clk); - kfree(sport); - - return 0; -} - -static struct platform_driver serial_pxa_driver = { - .probe = serial_pxa_probe, - .remove = serial_pxa_remove, - - .driver = { - .name = "pxa2xx-uart", - .owner = THIS_MODULE, -#ifdef CONFIG_PM - .pm = &serial_pxa_pm_ops, -#endif - .of_match_table = serial_pxa_dt_ids, - }, -}; - -static int __init serial_pxa_init(void) -{ - int ret; - - ret = uart_register_driver(&serial_pxa_reg); - if (ret != 0) - return ret; - - ret = platform_driver_register(&serial_pxa_driver); - if (ret != 0) - uart_unregister_driver(&serial_pxa_reg); - - return ret; -} - -static void __exit serial_pxa_exit(void) -{ - platform_driver_unregister(&serial_pxa_driver); - uart_unregister_driver(&serial_pxa_reg); -} - -module_init(serial_pxa_init); -module_exit(serial_pxa_exit); - -MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:pxa2xx-uart"); -- 1.8.4.2 ^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [PATCH v3 01/21 resend] serial: rewrite pxa2xx-uart to use 8250_core 2013-12-17 19:37 ` [PATCH v3 01/21 resend] serial: rewrite pxa2xx-uart to use 8250_core Sergei Ianovich @ 2013-12-18 23:55 ` Greg Kroah-Hartman 2013-12-19 8:51 ` Heikki Krogerus 1 sibling, 0 replies; 31+ messages in thread From: Greg Kroah-Hartman @ 2013-12-18 23:55 UTC (permalink / raw) To: Sergei Ianovich Cc: linux-kernel, linux-arm-kernel, Russell King, Jiri Slaby, Grant Likely, Rob Herring, Heikki Krogerus, James Cameron, Zhou Zhu, Haojian Zhuang, Arnd Bergmann, open list:SERIAL DRIVERS, open list:OPEN FIRMWARE AND... On Tue, Dec 17, 2013 at 11:37:31PM +0400, Sergei Ianovich wrote: > pxa2xx-uart was a separate uart platform driver. It was declaring > the same device names and numbers as 8250 driver. As a result, > it was impossible to use 8250 driver on PXA SoCs. > > Upon closer examination pxa2xx-uart turned out to be a clone of > 8250_core driver. > > Workaround for Erratum #19 according to Marvel(R) PXA270M Processor > Specification Update (April 19, 2010) is dropped. 8250_core reads > from FIFO immediately after checking DR bit in LSR. > > Signed-off-by: Sergei Ianovich <ynvich@gmail.com> > Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > Reviewed-by: James Cameron <quozl@laptop.org> > CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v3 01/21 resend] serial: rewrite pxa2xx-uart to use 8250_core 2013-12-17 19:37 ` [PATCH v3 01/21 resend] serial: rewrite pxa2xx-uart to use 8250_core Sergei Ianovich 2013-12-18 23:55 ` Greg Kroah-Hartman @ 2013-12-19 8:51 ` Heikki Krogerus 2013-12-19 9:35 ` Sergei Ianovich 1 sibling, 1 reply; 31+ messages in thread From: Heikki Krogerus @ 2013-12-19 8:51 UTC (permalink / raw) To: Sergei Ianovich Cc: linux-kernel, linux-arm-kernel, Greg Kroah-Hartman, Russell King, Jiri Slaby, Grant Likely, Rob Herring, James Cameron, Zhou Zhu, Haojian Zhuang, Arnd Bergmann, open list:SERIAL DRIVERS, open list:OPEN FIRMWARE AND... Hi Sergei, I noticed one more thing. I'm sorry about commenting this late. On Tue, Dec 17, 2013 at 11:37:31PM +0400, Sergei Ianovich wrote: > +static int serial_pxa_probe(struct platform_device *pdev) > +{ > + struct uart_8250_port uart = {}; > + struct pxa8250_data *data; > + struct resource *mmres, *irqres; > + int ret; > + > + mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + irqres = platform_get_resource(pdev, IORESOURCE_IRQ, 0); > + if (!mmres || !irqres) > + return -ENODEV; > + > + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); > + if (!data) > + return -ENOMEM; > + > + data->clk = devm_clk_get(&pdev->dev, NULL); > + if (IS_ERR(data->clk)) > + return PTR_ERR(data->clk); > + > + ret = clk_prepare(data->clk); > + if (ret) > + return ret; > + > + uart.port.type = PORT_XSCALE; > + uart.port.iotype = UPIO_MEM32; > + uart.port.mapbase = mmres->start; > + uart.port.regshift = 2; > + uart.port.irq = irqres->start; > + uart.port.fifosize = 64; > + uart.port.flags = UPF_IOREMAP | UPF_SKIP_TEST; Since you set the type PORT_XSCALE, don's you want to use UPF_FIXED_TYPE flag instead of the UPF_SKIP_TEST here? Otherwise the type will just get overridden and autoconfig() will be executed. I'm guessing you also want to prevent things like the irq and the uartclk from being changed by anybody by using the flag UPF_FIXED_PORT, right? > + uart.port.dev = &pdev->dev; > + uart.port.uartclk = clk_get_rate(data->clk); > + uart.port.pm = serial_pxa_pm; > + uart.port.private_data = data; > + uart.dl_write = serial_pxa_dl_write; > + > + ret = serial8250_register_8250_port(&uart); > + if (ret < 0) > + goto err_clk; > + > + data->line = ret; > + > + platform_set_drvdata(pdev, data); > + > + return 0; > + > + err_clk: > + clk_unprepare(data->clk); > + return ret; > +} -- heikki ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v3 01/21 resend] serial: rewrite pxa2xx-uart to use 8250_core 2013-12-19 8:51 ` Heikki Krogerus @ 2013-12-19 9:35 ` Sergei Ianovich 2013-12-19 10:01 ` Sergei Ianovich 0 siblings, 1 reply; 31+ messages in thread From: Sergei Ianovich @ 2013-12-19 9:35 UTC (permalink / raw) To: Heikki Krogerus Cc: linux-kernel, linux-arm-kernel, Greg Kroah-Hartman, Russell King, Jiri Slaby, Grant Likely, Rob Herring, James Cameron, Zhou Zhu, Haojian Zhuang, Arnd Bergmann, open list:SERIAL DRIVERS, open list:OPEN FIRMWARE AND... Hi Heikki, On Thu, 2013-12-19 at 10:51 +0200, Heikki Krogerus wrote: > I noticed one more thing. I'm sorry about commenting this late. > > Since you set the type PORT_XSCALE, don's you want to use > UPF_FIXED_TYPE flag instead of the UPF_SKIP_TEST here? Otherwise the > type will just get overridden and autoconfig() will be executed. UPF_FIXED_PORT was my first guess. However, it didn't work. I've also tried to do ioremap in serial_pxa_probe instead of using UPF_IOREMAP. This didn't work as well. I've left this uart.port.type = PORT_XSCALE; as an indicator that 8250_pxa depends on this port type, and anyone changing its specific code paths should test with 8250_pxa. This line could be safely removed or commented out, if you feel strongly about that. > I'm guessing you also want to prevent things like the irq and the > uartclk from being changed by anybody by using the flag > UPF_FIXED_PORT, right? IIRC, autoprobing doesn't change irq or uartclk. ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v3 01/21 resend] serial: rewrite pxa2xx-uart to use 8250_core 2013-12-19 9:35 ` Sergei Ianovich @ 2013-12-19 10:01 ` Sergei Ianovich 2013-12-19 11:05 ` Heikki Krogerus 0 siblings, 1 reply; 31+ messages in thread From: Sergei Ianovich @ 2013-12-19 10:01 UTC (permalink / raw) To: Heikki Krogerus Cc: linux-kernel, linux-arm-kernel, Greg Kroah-Hartman, Russell King, Jiri Slaby, Grant Likely, Rob Herring, James Cameron, Zhou Zhu, Haojian Zhuang, Arnd Bergmann, open list:SERIAL DRIVERS, open list:OPEN FIRMWARE AND... On Thu, 2013-12-19 at 13:35 +0400, Sergei Ianovich wrote: > Hi Heikki, > > On Thu, 2013-12-19 at 10:51 +0200, Heikki Krogerus wrote: > > I noticed one more thing. I'm sorry about commenting this late. > > > > Since you set the type PORT_XSCALE, don's you want to use > > UPF_FIXED_TYPE flag instead of the UPF_SKIP_TEST here? Otherwise the > > type will just get overridden and autoconfig() will be executed. > > UPF_FIXED_PORT was my first guess. However, it didn't work. > > I've also tried to do ioremap in serial_pxa_probe instead of using > UPF_IOREMAP. This didn't work as well. I didn't clarify properly. UPF_SKIP_TEST skips only the loopback test. This test could work on PXA, but requires PXA-specific pre-initialization. There are more test after the loopback one, which will fail if we are not on PXA. So I decided that skipping it is easier than tricky rewriting of autoconfig(). ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v3 01/21 resend] serial: rewrite pxa2xx-uart to use 8250_core 2013-12-19 10:01 ` Sergei Ianovich @ 2013-12-19 11:05 ` Heikki Krogerus 0 siblings, 0 replies; 31+ messages in thread From: Heikki Krogerus @ 2013-12-19 11:05 UTC (permalink / raw) To: Sergei Ianovich Cc: linux-kernel, linux-arm-kernel, Greg Kroah-Hartman, Russell King, Jiri Slaby, Grant Likely, Rob Herring, James Cameron, Zhou Zhu, Haojian Zhuang, Arnd Bergmann, open list:SERIAL DRIVERS, open list:OPEN FIRMWARE AND... On Thu, Dec 19, 2013 at 02:01:36PM +0400, Sergei Ianovich wrote: > On Thu, 2013-12-19 at 13:35 +0400, Sergei Ianovich wrote: > > On Thu, 2013-12-19 at 10:51 +0200, Heikki Krogerus wrote: > > > I noticed one more thing. I'm sorry about commenting this late. > > > > > > Since you set the type PORT_XSCALE, don's you want to use > > > UPF_FIXED_TYPE flag instead of the UPF_SKIP_TEST here? Otherwise the > > > type will just get overridden and autoconfig() will be executed. > > > > UPF_FIXED_PORT was my first guess. However, it didn't work. > > > > I've also tried to do ioremap in serial_pxa_probe instead of using > > UPF_IOREMAP. This didn't work as well. > > I didn't clarify properly. > > UPF_SKIP_TEST skips only the loopback test. This test could work on PXA, > but requires PXA-specific pre-initialization. There are more test after > the loopback one, which will fail if we are not on PXA. So I decided > that skipping it is easier than tricky rewriting of autoconfig(). OK. So there is no problem here. Sorry about the noise. Thanks, -- heikki ^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH v3 12/21] serial: support for 16550A serial ports on LP-8x4x [not found] ` <1387309071-22382-1-git-send-email-ynvich@gmail.com> 2013-12-17 19:37 ` [PATCH v3 01/21 resend] serial: rewrite pxa2xx-uart to use 8250_core Sergei Ianovich @ 2013-12-17 19:37 ` Sergei Ianovich 2013-12-19 11:18 ` Heikki Krogerus [not found] ` <1397668411-27162-1-git-send-email-ynvich@gmail.com> [not found] ` <1449700088-28076-1-git-send-email-ynvich@gmail.com> 3 siblings, 1 reply; 31+ messages in thread From: Sergei Ianovich @ 2013-12-17 19:37 UTC (permalink / raw) To: linux-kernel, linux-arm-kernel Cc: Sergei Ianovich, Heikki Krogerus, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Rob Landley, Russell King, Greg Kroah-Hartman, Jiri Slaby, Grant Likely, Randy Dunlap, Arnd Bergmann, James Cameron, open list:OPEN FIRMWARE AND..., open list:DOCUMENTATION, open list:SERIAL DRIVERS The patch adds support for 3 additional LP-8x4x built-in serial ports. The device can also host up to 8 extension cards with 4 serial ports on each card for a total of 35 ports. However, I don't have the hardware to test extension cards, so they are not supported, yet. Signed-off-by: Sergei Ianovich <ynvich@gmail.com> CC: Heikki Krogerus <heikki.krogerus@linux.intel.com> --- v2..v3 * no changes (except number 10/16 -> 12/21) v0..v2 * register platform driver instead of platform device * use device tree * use devm helpers where possible .../devicetree/bindings/serial/lp8x4x-serial.txt | 35 +++++ arch/arm/boot/dts/pxa27x-lp8x4x.dts | 25 ++++ arch/arm/configs/lp8x4x_defconfig | 1 + drivers/tty/serial/8250/8250_lp8x4x.c | 162 +++++++++++++++++++++ drivers/tty/serial/8250/Kconfig | 12 ++ drivers/tty/serial/8250/Makefile | 1 + 6 files changed, 236 insertions(+) create mode 100644 Documentation/devicetree/bindings/serial/lp8x4x-serial.txt create mode 100644 drivers/tty/serial/8250/8250_lp8x4x.c diff --git a/Documentation/devicetree/bindings/serial/lp8x4x-serial.txt b/Documentation/devicetree/bindings/serial/lp8x4x-serial.txt new file mode 100644 index 0000000..eed4ffc --- /dev/null +++ b/Documentation/devicetree/bindings/serial/lp8x4x-serial.txt @@ -0,0 +1,35 @@ +UART ports on ICP DAS LP-8x4x + +ICP DAS LP-8x4x contains three additional serial ports interfaced via +Analog Devices ADM213EA chips in addition to 3 serial ports on PXA CPU. + +Required properties: +- compatible : should be "icpdas,uart-lp8x4x" + +- reg : should provide 16 byte man IO memory region and 1 byte region for + termios + +- interrupts : should provide interrupt + +- interrupt-parent : should provide a link to interrupt controller either + explicitly and implicitly from a parent node + +Examples (from pxa27x-lp8x4x.dts): + + uart@17009050 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x17009050 0x10 + 0x17009030 0x02>; + interrupt-parent = <&fpga>; + interrupts = <13>; + status = "okay"; + }; + + uart@17009060 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x17009060 0x10 + 0x17009032 0x02>; + interrupt-parent = <&fpga>; + interrupts = <14>; + status = "okay"; + }; diff --git a/arch/arm/boot/dts/pxa27x-lp8x4x.dts b/arch/arm/boot/dts/pxa27x-lp8x4x.dts index 78dfd2e..ee0d8b7 100644 --- a/arch/arm/boot/dts/pxa27x-lp8x4x.dts +++ b/arch/arm/boot/dts/pxa27x-lp8x4x.dts @@ -155,6 +155,7 @@ #address-cells = <1>; #size-cells = <1>; ranges = <0 5 0x3000000 0x10000>; + interrupt-parent = <&fpgairq>; rtc@901c { compatible = "ds,rtc-ds1302"; @@ -177,6 +178,30 @@ interrupt-controller; status = "okay"; }; + + uart@9050 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x9050 0x10 + 0x9030 0x02>; + interrupts = <13>; + status = "okay"; + }; + + uart@9060 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x9060 0x10 + 0x9032 0x02>; + interrupts = <14>; + status = "okay"; + }; + + uart@9070 { + compatible = "icpdas,uart-lp8x4x"; + reg = <0x9070 0x10 + 0x9034 0x02>; + interrupts = <15>; + status = "okay"; + }; }; }; }; diff --git a/arch/arm/configs/lp8x4x_defconfig b/arch/arm/configs/lp8x4x_defconfig index 17a4e6f..9116ce1 100644 --- a/arch/arm/configs/lp8x4x_defconfig +++ b/arch/arm/configs/lp8x4x_defconfig @@ -112,6 +112,7 @@ CONFIG_SERIAL_8250_EXTENDED=y CONFIG_SERIAL_8250_MANY_PORTS=y CONFIG_SERIAL_8250_SHARE_IRQ=y CONFIG_SERIAL_PXA=y +CONFIG_SERIAL_8250_LP8X4X=m CONFIG_HW_RANDOM=y CONFIG_I2C=m # CONFIG_I2C_COMPAT is not set diff --git a/drivers/tty/serial/8250/8250_lp8x4x.c b/drivers/tty/serial/8250/8250_lp8x4x.c new file mode 100644 index 0000000..ec2f215 --- /dev/null +++ b/drivers/tty/serial/8250/8250_lp8x4x.c @@ -0,0 +1,162 @@ +/* linux/drivers/tty/serial/8250/8250_lp8x4x.c + * + * Support for 16550A serial ports on ICP DAS LP-8x4x + * + * Copyright (C) 2013 Sergei Ianovich <ynvich@gmail.com> + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ +#include <linux/init.h> +#include <linux/io.h> +#include <linux/irq.h> +#include <linux/module.h> +#include <linux/serial_8250.h> +#include <linux/of.h> +#include <linux/platform_device.h> + +struct lp8x4x_serial_data { + int line; + void *ios_mem; +}; + +static void lp8x4x_serial_set_termios(struct uart_port *port, + struct ktermios *termios, struct ktermios *old) +{ + unsigned int len; + unsigned int baud; + struct lp8x4x_serial_data *data = port->private_data; + + switch (termios->c_cflag & CSIZE) { + case CS5: + len = 7; + break; + case CS6: + len = 8; + break; + case CS7: + len = 9; + break; + default: + case CS8: + len = 10; + break; + } + + if (termios->c_cflag & CSTOPB) + len++; + if (termios->c_cflag & PARENB) + len++; + if (!(termios->c_cflag & PARODD)) + len++; +#ifdef CMSPAR + if (termios->c_cflag & CMSPAR) + len++; +#endif + + len -= 9; + len &= 3; + len <<= 3; + /* + * Ask the core to calculate the divisor for us. + */ + baud = uart_get_baud_rate(port, termios, old, + port->uartclk / 16 / 0xffff, + port->uartclk / 16); + switch (baud) { + case 2400: + len |= 1; + case 4800: + len |= 2; + case 19200: + len |= 4; + case 38400: + len |= 5; + case 57600: + len |= 6; + case 115200: + len |= 7; + case 9600: + default: + len |= 3; + }; + iowrite8(len, data->ios_mem); + + serial8250_do_set_termios(port, termios, old); +} + +static struct of_device_id lp8x4x_serial_dt_ids[] = { + { .compatible = "icpdas,uart-lp8x4x", }, + {} +}; +MODULE_DEVICE_TABLE(of, lp8x4x_serial_dt_ids); + +static int lp8x4x_serial_probe(struct platform_device *pdev) +{ + struct uart_8250_port uart = {}; + struct lp8x4x_serial_data *data; + struct resource *mmres, *mires, *irqres; + int ret; + + mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0); + mires = platform_get_resource(pdev, IORESOURCE_MEM, 1); + irqres = platform_get_resource(pdev, IORESOURCE_IRQ, 0); + if (!mmres || !mires || !irqres) + return -ENODEV; + + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->ios_mem = devm_ioremap_resource(&pdev->dev, mires); + if (!data->ios_mem) + return -EFAULT; + + uart.port.iotype = UPIO_MEM; + uart.port.mapbase = mmres->start; + uart.port.iobase = mmres->start; + uart.port.regshift = 1; + uart.port.irq = irqres->start; + uart.port.flags = UPF_IOREMAP; + uart.port.dev = &pdev->dev; + uart.port.uartclk = 14745600; + uart.port.set_termios = lp8x4x_serial_set_termios; + uart.port.private_data = data; + + ret = serial8250_register_8250_port(&uart); + if (ret < 0) + return ret; + + data->line = ret; + + platform_set_drvdata(pdev, data); + + return 0; +} + +static int lp8x4x_serial_remove(struct platform_device *pdev) +{ + struct lp8x4x_serial_data *data = platform_get_drvdata(pdev); + + serial8250_unregister_port(data->line); + + return 0; +} + +static struct platform_driver lp8x4x_serial_driver = { + .probe = lp8x4x_serial_probe, + .remove = lp8x4x_serial_remove, + + .driver = { + .name = "uart-lp8x4x", + .owner = THIS_MODULE, + .of_match_table = lp8x4x_serial_dt_ids, + }, +}; + +module_platform_driver(lp8x4x_serial_driver); + +MODULE_AUTHOR("Sergei Ianovich"); +MODULE_DESCRIPTION("8250 serial port module for LP-8x4x"); +MODULE_LICENSE("GPL"); diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig index 81bd7c9..9fb0fbb 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig @@ -311,3 +311,15 @@ config SERIAL_PXA can enable its onboard serial ports by enabling this option. If you choose M here, the module name will be 8250_pxa. + +config SERIAL_8250_LP8X4X + tristate "Support 16550A ports on ICP DAS LP-8x4x" + depends on OF && SERIAL_8250 && SERIAL_8250_MANY_PORTS && ARCH_PXA + select LP8X4X_IRQ + help + In addition to serial ports on PXA270 SoC, LP-8x4x has 1 dual + RS232/RS485 port, 1 RS485 port and 1 RS232 port. + + Say N here, unless you plan to run this kernel on a LP-8x4x system. + + If you choose M here, the module name will be 8250_lp8x4x. diff --git a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Makefile index b7d1b61..7370bfb 100644 --- a/drivers/tty/serial/8250/Makefile +++ b/drivers/tty/serial/8250/Makefile @@ -17,6 +17,7 @@ obj-$(CONFIG_SERIAL_8250_ACCENT) += 8250_accent.o obj-$(CONFIG_SERIAL_8250_BOCA) += 8250_boca.o obj-$(CONFIG_SERIAL_8250_EXAR_ST16C554) += 8250_exar_st16c554.o obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o +obj-$(CONFIG_SERIAL_8250_LP8X4X) += 8250_lp8x4x.o obj-$(CONFIG_SERIAL_8250_FSL) += 8250_fsl.o obj-$(CONFIG_SERIAL_8250_DW) += 8250_dw.o obj-$(CONFIG_SERIAL_8250_EM) += 8250_em.o -- 1.8.4.2 ^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [PATCH v3 12/21] serial: support for 16550A serial ports on LP-8x4x 2013-12-17 19:37 ` [PATCH v3 12/21] serial: support for 16550A serial ports on LP-8x4x Sergei Ianovich @ 2013-12-19 11:18 ` Heikki Krogerus 0 siblings, 0 replies; 31+ messages in thread From: Heikki Krogerus @ 2013-12-19 11:18 UTC (permalink / raw) To: Sergei Ianovich Cc: linux-kernel, linux-arm-kernel, Rob Herring, Pawel Moll, Mark Rutland, Ian Campbell, Kumar Gala, Rob Landley, Russell King, Greg Kroah-Hartman, Jiri Slaby, Grant Likely, Randy Dunlap, Arnd Bergmann, James Cameron, open list:OPEN FIRMWARE AND..., open list:DOCUMENTATION, open list:SERIAL DRIVERS Hi, On Tue, Dec 17, 2013 at 11:37:42PM +0400, Sergei Ianovich wrote: > The patch adds support for 3 additional LP-8x4x built-in serial > ports. > > The device can also host up to 8 extension cards with 4 serial ports > on each card for a total of 35 ports. However, I don't have > the hardware to test extension cards, so they are not supported, yet. > > Signed-off-by: Sergei Ianovich <ynvich@gmail.com> > CC: Heikki Krogerus <heikki.krogerus@linux.intel.com> Looks OK to me, though normally I would prefer the arch code and the driver to be handled in separate patches. FWIW... Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Thanks, -- heikki ^ permalink raw reply [flat|nested] 31+ messages in thread
[parent not found: <1397668411-27162-1-git-send-email-ynvich@gmail.com>]
* [PATCH v4 01/21] serial: rewrite pxa2xx-uart to use 8250_core [not found] ` <1397668411-27162-1-git-send-email-ynvich@gmail.com> @ 2014-04-16 17:13 ` Sergei Ianovich 2015-01-19 18:08 ` Rob Herring 0 siblings, 1 reply; 31+ messages in thread From: Sergei Ianovich @ 2014-04-16 17:13 UTC (permalink / raw) To: linux-kernel, linux-arm-kernel Cc: Sergei Ianovich, Russell King, Greg Kroah-Hartman, Jiri Slaby, Grant Likely, Rob Herring, James Cameron, Heikki Krogerus, Paul Bolle, Arnd Bergmann, Randy Dunlap, Stefan Seyfried, open list:SERIAL DRIVERS, open list:OPEN FIRMWARE AND... pxa2xx-uart was a separate uart platform driver. It was declaring the same device names and numbers as 8250 driver. As a result, it was impossible to use 8250 driver on PXA SoCs. Upon closer examination pxa2xx-uart turned out to be a clone of 8250_core driver. Workaround for Erratum #19 according to Marvel(R) PXA270M Processor Specification Update (April 19, 2010) is dropped. 8250_core reads from FIFO immediately after checking DR bit in LSR. Signed-off-by: Sergei Ianovich <ynvich@gmail.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Reviewed-by: James Cameron <quozl@laptop.org> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- Resenging together with the rest of the series as the series breaks without this one at [PATCH 12/21] no changes v3..v4 changes v2..v3 * remove devm_free/put as suggested by Heikki Krogerus * use SET_SYSTEM_SLEEP_PM_OPS macro to set pm ops as suggested by Heikki Krogerus changes v1..v2 * actually implement workaround for E74 in dl_write as spooted by James Cameron * added comment about E19 in commit message arch/arm/configs/am200epdkit_defconfig | 3 +- arch/arm/configs/cm_x2xx_defconfig | 3 +- arch/arm/configs/cm_x300_defconfig | 3 +- arch/arm/configs/colibri_pxa270_defconfig | 3 +- arch/arm/configs/colibri_pxa300_defconfig | 3 +- arch/arm/configs/corgi_defconfig | 4 +- arch/arm/configs/em_x270_defconfig | 3 +- arch/arm/configs/ezx_defconfig | 3 +- arch/arm/configs/h5000_defconfig | 3 +- arch/arm/configs/imote2_defconfig | 3 +- arch/arm/configs/lpd270_defconfig | 3 +- arch/arm/configs/lubbock_defconfig | 3 +- arch/arm/configs/mainstone_defconfig | 3 +- arch/arm/configs/mmp2_defconfig | 3 +- arch/arm/configs/pcm027_defconfig | 3 +- arch/arm/configs/pxa168_defconfig | 3 +- arch/arm/configs/pxa255-idp_defconfig | 3 +- arch/arm/configs/pxa3xx_defconfig | 3 +- arch/arm/configs/pxa910_defconfig | 3 +- arch/arm/configs/raumfeld_defconfig | 3 +- arch/arm/configs/spitz_defconfig | 4 +- arch/arm/configs/trizeps4_defconfig | 3 +- arch/arm/configs/viper_defconfig | 4 +- arch/arm/configs/xcep_defconfig | 3 +- drivers/tty/serial/8250/8250_pxa.c | 178 ++++++ drivers/tty/serial/8250/Kconfig | 9 + drivers/tty/serial/8250/Makefile | 1 + drivers/tty/serial/Kconfig | 23 - drivers/tty/serial/Makefile | 1 - drivers/tty/serial/pxa.c | 971 ------------------------------ 30 files changed, 236 insertions(+), 1022 deletions(-) create mode 100644 drivers/tty/serial/8250/8250_pxa.c delete mode 100644 drivers/tty/serial/pxa.c diff --git a/arch/arm/configs/am200epdkit_defconfig b/arch/arm/configs/am200epdkit_defconfig index f0dea52..0cde234 100644 --- a/arch/arm/configs/am200epdkit_defconfig +++ b/arch/arm/configs/am200epdkit_defconfig @@ -60,8 +60,9 @@ CONFIG_BLK_DEV_IDECS=m CONFIG_NETDEVICES=y CONFIG_NET_ETHERNET=y CONFIG_SMC91X=m +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set # CONFIG_HWMON is not set diff --git a/arch/arm/configs/cm_x2xx_defconfig b/arch/arm/configs/cm_x2xx_defconfig index a93ff8d..b9fbe65 100644 --- a/arch/arm/configs/cm_x2xx_defconfig +++ b/arch/arm/configs/cm_x2xx_defconfig @@ -96,8 +96,9 @@ CONFIG_KEYBOARD_PXA27x=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_UCB1400=m # CONFIG_SERIO_SERPORT is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_LEGACY_PTY_COUNT=16 # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/cm_x300_defconfig b/arch/arm/configs/cm_x300_defconfig index f4b7672..53a82ae 100644 --- a/arch/arm/configs/cm_x300_defconfig +++ b/arch/arm/configs/cm_x300_defconfig @@ -80,8 +80,9 @@ CONFIG_TOUCHSCREEN_WM97XX=m # CONFIG_TOUCHSCREEN_WM9713 is not set # CONFIG_SERIO is not set # CONFIG_LEGACY_PTYS is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_I2C=y CONFIG_I2C_PXA=y diff --git a/arch/arm/configs/colibri_pxa270_defconfig b/arch/arm/configs/colibri_pxa270_defconfig index 2ef2c5e..1ce0409 100644 --- a/arch/arm/configs/colibri_pxa270_defconfig +++ b/arch/arm/configs/colibri_pxa270_defconfig @@ -103,8 +103,9 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m CONFIG_SERIO_LIBPS2=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_I2C=y CONFIG_I2C_CHARDEV=y diff --git a/arch/arm/configs/colibri_pxa300_defconfig b/arch/arm/configs/colibri_pxa300_defconfig index b985334..f96bda0 100644 --- a/arch/arm/configs/colibri_pxa300_defconfig +++ b/arch/arm/configs/colibri_pxa300_defconfig @@ -31,8 +31,9 @@ CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_GPIO_ROTARY_ENCODER=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_DEBUG_GPIO=y # CONFIG_HWMON is not set diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig index 1fd1d1d..bb4842d 100644 --- a/arch/arm/configs/corgi_defconfig +++ b/arch/arm/configs/corgi_defconfig @@ -131,10 +131,10 @@ CONFIG_TOUCHSCREEN_ADS7846=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m # CONFIG_SERIO is not set -CONFIG_SERIAL_8250=m +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_LEGACY_PTYS is not set CONFIG_I2C=y CONFIG_I2C_PXA=y diff --git a/arch/arm/configs/em_x270_defconfig b/arch/arm/configs/em_x270_defconfig index 60a21e0..ec0ec54 100644 --- a/arch/arm/configs/em_x270_defconfig +++ b/arch/arm/configs/em_x270_defconfig @@ -90,8 +90,9 @@ CONFIG_TOUCHSCREEN_WM97XX=m # CONFIG_TOUCHSCREEN_WM9705 is not set # CONFIG_TOUCHSCREEN_WM9713 is not set # CONFIG_SERIO_SERPORT is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_LEGACY_PTY_COUNT=16 # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig index d95763d..631e2ec 100644 --- a/arch/arm/configs/ezx_defconfig +++ b/arch/arm/configs/ezx_defconfig @@ -215,8 +215,9 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y CONFIG_INPUT_PCAP=y # CONFIG_SERIO is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_LEGACY_PTY_COUNT=8 # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/h5000_defconfig b/arch/arm/configs/h5000_defconfig index 37903e3..655b735 100644 --- a/arch/arm/configs/h5000_defconfig +++ b/arch/arm/configs/h5000_defconfig @@ -47,8 +47,9 @@ CONFIG_MTD_PHYSMAP=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_LEGACY_PTY_COUNT=32 # CONFIG_HW_RANDOM is not set # CONFIG_HWMON is not set diff --git a/arch/arm/configs/imote2_defconfig b/arch/arm/configs/imote2_defconfig index fd996bb..49d45e9 100644 --- a/arch/arm/configs/imote2_defconfig +++ b/arch/arm/configs/imote2_defconfig @@ -193,8 +193,9 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y # CONFIG_SERIO is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_LEGACY_PTY_COUNT=8 # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/lpd270_defconfig b/arch/arm/configs/lpd270_defconfig index 1c8c9ee..c3927b6 100644 --- a/arch/arm/configs/lpd270_defconfig +++ b/arch/arm/configs/lpd270_defconfig @@ -38,8 +38,9 @@ CONFIG_SMC91X=y CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO_SERPORT is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_HW_RANDOM is not set CONFIG_FB=y CONFIG_FB_PXA=y diff --git a/arch/arm/configs/lubbock_defconfig b/arch/arm/configs/lubbock_defconfig index c4ba274..c8b0436 100644 --- a/arch/arm/configs/lubbock_defconfig +++ b/arch/arm/configs/lubbock_defconfig @@ -37,8 +37,9 @@ CONFIG_PCMCIA_PCNET=y CONFIG_INPUT_EVDEV=y # CONFIG_SERIO_SERPORT is not set CONFIG_SERIO_SA1111=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_VGA_CONSOLE is not set CONFIG_USB_GADGET=y CONFIG_USB_G_SERIAL=m diff --git a/arch/arm/configs/mainstone_defconfig b/arch/arm/configs/mainstone_defconfig index 04efa1b..768892c 100644 --- a/arch/arm/configs/mainstone_defconfig +++ b/arch/arm/configs/mainstone_defconfig @@ -34,8 +34,9 @@ CONFIG_SMC91X=y CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO_SERPORT is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_FB=y CONFIG_FB_PXA=y # CONFIG_VGA_CONSOLE is not set diff --git a/arch/arm/configs/mmp2_defconfig b/arch/arm/configs/mmp2_defconfig index f1cb95e..1ced9df 100644 --- a/arch/arm/configs/mmp2_defconfig +++ b/arch/arm/configs/mmp2_defconfig @@ -44,8 +44,9 @@ CONFIG_SMC91X=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/pcm027_defconfig b/arch/arm/configs/pcm027_defconfig index 2f136c3..1280128 100644 --- a/arch/arm/configs/pcm027_defconfig +++ b/arch/arm/configs/pcm027_defconfig @@ -60,8 +60,9 @@ CONFIG_SMC91X=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/pxa168_defconfig b/arch/arm/configs/pxa168_defconfig index 74d7e01..1668dac 100644 --- a/arch/arm/configs/pxa168_defconfig +++ b/arch/arm/configs/pxa168_defconfig @@ -40,8 +40,9 @@ CONFIG_SMC91X=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set # CONFIG_HWMON is not set diff --git a/arch/arm/configs/pxa255-idp_defconfig b/arch/arm/configs/pxa255-idp_defconfig index 917a070..399a706 100644 --- a/arch/arm/configs/pxa255-idp_defconfig +++ b/arch/arm/configs/pxa255-idp_defconfig @@ -35,8 +35,9 @@ CONFIG_SMC91X=y CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO_SERPORT is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_FB=y CONFIG_FB_PXA=y # CONFIG_VGA_CONSOLE is not set diff --git a/arch/arm/configs/pxa3xx_defconfig b/arch/arm/configs/pxa3xx_defconfig index 60e3138..7c3e052 100644 --- a/arch/arm/configs/pxa3xx_defconfig +++ b/arch/arm/configs/pxa3xx_defconfig @@ -56,8 +56,9 @@ CONFIG_KEYBOARD_PXA27x=y CONFIG_KEYBOARD_PXA930_ROTARY=y CONFIG_MOUSE_PXA930_TRKBALL=y CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/pxa910_defconfig b/arch/arm/configs/pxa910_defconfig index 3bb7771..cdacfcb 100644 --- a/arch/arm/configs/pxa910_defconfig +++ b/arch/arm/configs/pxa910_defconfig @@ -40,8 +40,9 @@ CONFIG_SMC91X=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_SPI=y CONFIG_FB=y CONFIG_MMP_DISP=y diff --git a/arch/arm/configs/raumfeld_defconfig b/arch/arm/configs/raumfeld_defconfig index f7caa90..f1e16f2 100644 --- a/arch/arm/configs/raumfeld_defconfig +++ b/arch/arm/configs/raumfeld_defconfig @@ -67,8 +67,9 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_EETI=m CONFIG_INPUT_MISC=y CONFIG_INPUT_GPIO_ROTARY_ENCODER=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_I2C=y CONFIG_I2C_CHARDEV=y diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig index 2e0419d..b6efcf5 100644 --- a/arch/arm/configs/spitz_defconfig +++ b/arch/arm/configs/spitz_defconfig @@ -128,10 +128,10 @@ CONFIG_TOUCHSCREEN_ADS7846=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m # CONFIG_SERIO is not set -CONFIG_SERIAL_8250=m +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CS=m CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_LEGACY_PTYS is not set CONFIG_SPI=y CONFIG_SPI_PXA2XX=y diff --git a/arch/arm/configs/trizeps4_defconfig b/arch/arm/configs/trizeps4_defconfig index 3162173..453c79c 100644 --- a/arch/arm/configs/trizeps4_defconfig +++ b/arch/arm/configs/trizeps4_defconfig @@ -132,8 +132,9 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m CONFIG_SERIO_LIBPS2=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_I2C=y CONFIG_I2C_CHARDEV=y diff --git a/arch/arm/configs/viper_defconfig b/arch/arm/configs/viper_defconfig index d36e0d3..4efac06 100644 --- a/arch/arm/configs/viper_defconfig +++ b/arch/arm/configs/viper_defconfig @@ -101,11 +101,11 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m # CONFIG_CONSOLE_TRANSLATIONS is not set # CONFIG_VT_CONSOLE is not set -CONFIG_SERIAL_8250=m +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=5 CONFIG_SERIAL_8250_RUNTIME_UARTS=5 CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_LEGACY_PTYS is not set CONFIG_I2C=y CONFIG_I2C_CHARDEV=y diff --git a/arch/arm/configs/xcep_defconfig b/arch/arm/configs/xcep_defconfig index 721832f..b67aeaf 100644 --- a/arch/arm/configs/xcep_defconfig +++ b/arch/arm/configs/xcep_defconfig @@ -60,8 +60,9 @@ CONFIG_NET_ETHERNET=y # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set # CONFIG_DEVKMEM is not set +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_I2C=m diff --git a/drivers/tty/serial/8250/8250_pxa.c b/drivers/tty/serial/8250/8250_pxa.c new file mode 100644 index 0000000..0da0d40 --- /dev/null +++ b/drivers/tty/serial/8250/8250_pxa.c @@ -0,0 +1,178 @@ +/* + * drivers/tty/serial/8250/8250_pxa.c -- driver for PXA on-board UARTS + * Copyright: (C) 2013 Sergei Ianovich <ynvich@gmail.com> + * + * replaces drivers/serial/pxa.c by Nicolas Pitre + * Created: Feb 20, 2003 + * Copyright: (C) 2003 Monta Vista Software, Inc. + * + * Based on drivers/serial/8250.c by Russell King. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + +#include <linux/device.h> +#include <linux/init.h> +#include <linux/io.h> +#include <linux/module.h> +#include <linux/serial_8250.h> +#include <linux/serial_core.h> +#include <linux/serial_reg.h> +#include <linux/of.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/clk.h> +#include <linux/pm_runtime.h> + +#include "8250.h" + +struct pxa8250_data { + int line; + struct clk *clk; +}; + +#ifdef CONFIG_PM +static int serial_pxa_suspend(struct device *dev) +{ + struct pxa8250_data *data = dev_get_drvdata(dev); + + serial8250_suspend_port(data->line); + + return 0; +} + +static int serial_pxa_resume(struct device *dev) +{ + struct pxa8250_data *data = dev_get_drvdata(dev); + + serial8250_resume_port(data->line); + + return 0; +} +#endif + +static const struct dev_pm_ops serial_pxa_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(serial_pxa_suspend, serial_pxa_resume) +}; + +static struct of_device_id serial_pxa_dt_ids[] = { + { .compatible = "mrvl,pxa-uart", }, + { .compatible = "mrvl,mmp-uart", }, + {} +}; +MODULE_DEVICE_TABLE(of, serial_pxa_dt_ids); + +/* Uart divisor latch write */ +static void serial_pxa_dl_write(struct uart_8250_port *up, int value) +{ + unsigned int dll; + + serial_out(up, UART_DLL, value & 0xff); + /* + * work around Erratum #74 according to Marvel(R) PXA270M Processor + * Specification Update (April 19, 2010) + */ + dll = serial_in(up, UART_DLL); + WARN_ON(dll != (value & 0xff)); + + serial_out(up, UART_DLM, value >> 8 & 0xff); +} + + +static void serial_pxa_pm(struct uart_port *port, unsigned int state, + unsigned int oldstate) +{ + struct pxa8250_data *data = port->private_data; + + if (!state) + clk_prepare_enable(data->clk); + else + clk_disable_unprepare(data->clk); +} + +static int serial_pxa_probe(struct platform_device *pdev) +{ + struct uart_8250_port uart = {}; + struct pxa8250_data *data; + struct resource *mmres, *irqres; + int ret; + + mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0); + irqres = platform_get_resource(pdev, IORESOURCE_IRQ, 0); + if (!mmres || !irqres) + return -ENODEV; + + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(data->clk)) + return PTR_ERR(data->clk); + + ret = clk_prepare(data->clk); + if (ret) + return ret; + + uart.port.type = PORT_XSCALE; + uart.port.iotype = UPIO_MEM32; + uart.port.mapbase = mmres->start; + uart.port.regshift = 2; + uart.port.irq = irqres->start; + uart.port.fifosize = 64; + uart.port.flags = UPF_IOREMAP | UPF_SKIP_TEST; + uart.port.dev = &pdev->dev; + uart.port.uartclk = clk_get_rate(data->clk); + uart.port.pm = serial_pxa_pm; + uart.port.private_data = data; + uart.dl_write = serial_pxa_dl_write; + + ret = serial8250_register_8250_port(&uart); + if (ret < 0) + goto err_clk; + + data->line = ret; + + platform_set_drvdata(pdev, data); + + return 0; + + err_clk: + clk_unprepare(data->clk); + return ret; +} + +static int serial_pxa_remove(struct platform_device *pdev) +{ + struct pxa8250_data *data = platform_get_drvdata(pdev); + + serial8250_unregister_port(data->line); + + clk_unprepare(data->clk); + + return 0; +} + +static struct platform_driver serial_pxa_driver = { + .probe = serial_pxa_probe, + .remove = serial_pxa_remove, + + .driver = { + .name = "pxa2xx-uart", + .owner = THIS_MODULE, + .pm = &serial_pxa_pm_ops, + .of_match_table = serial_pxa_dt_ids, + }, +}; + +module_platform_driver(serial_pxa_driver); + +MODULE_AUTHOR("Sergei Ianovich"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:pxa2xx-uart"); diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig index 2332991..81bd7c9 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig @@ -302,3 +302,12 @@ config SERIAL_8250_RT288X If you have a Ralink RT288x/RT305x SoC based board and want to use the serial port, say Y to this option. The driver can handle up to 2 serial ports. If unsure, say N. + +config SERIAL_PXA + tristate "PXA serial port support" + depends on SERIAL_8250 && (ARCH_PXA || ARCH_MMP) + help + If you have a machine based on an Intel XScale PXA2xx CPU you + can enable its onboard serial ports by enabling this option. + + If you choose M here, the module name will be 8250_pxa. diff --git a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Makefile index 36d68d0..b7d1b61 100644 --- a/drivers/tty/serial/8250/Makefile +++ b/drivers/tty/serial/8250/Makefile @@ -20,3 +20,4 @@ obj-$(CONFIG_SERIAL_8250_HUB6) += 8250_hub6.o 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_PXA) += 8250_pxa.o diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 2e6d8dd..da46e31 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -395,29 +395,6 @@ config SERIAL_MPSC_CONSOLE help Say Y here if you want to support a serial console on a Marvell MPSC. -config SERIAL_PXA - bool "PXA serial port support" - depends on ARCH_PXA || ARCH_MMP - select SERIAL_CORE - help - If you have a machine based on an Intel XScale PXA2xx CPU you - can enable its onboard serial ports by enabling this option. - -config SERIAL_PXA_CONSOLE - bool "Console on PXA serial port" - depends on SERIAL_PXA - select SERIAL_CORE_CONSOLE - help - If you have enabled the serial port on the Intel XScale PXA - CPU you can make it the console by answering Y to this option. - - Even if you say Y here, the currently visible virtual console - (/dev/tty0) will still be used as the system console by default, but - you can alter that using a kernel command line option such as - "console=ttySA0". (Try "man bootparam" or see the documentation of - your boot loader (lilo or loadlin) about how to pass options to the - kernel at boot time.) - config SERIAL_SA1100 bool "SA1100 serial port support" depends on ARCH_SA1100 diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile index 3680854..fd71d3f 100644 --- a/drivers/tty/serial/Makefile +++ b/drivers/tty/serial/Makefile @@ -20,7 +20,6 @@ obj-$(CONFIG_SERIAL_8250) += 8250/ obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o -obj-$(CONFIG_SERIAL_PXA) += pxa.o obj-$(CONFIG_SERIAL_PNX8XXX) += pnx8xxx_uart.o obj-$(CONFIG_SERIAL_SA1100) += sa1100.o obj-$(CONFIG_SERIAL_BCM63XX) += bcm63xx_uart.o diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c deleted file mode 100644 index f9f20f3..0000000 --- a/drivers/tty/serial/pxa.c +++ /dev/null @@ -1,971 +0,0 @@ -/* - * Based on drivers/serial/8250.c by Russell King. - * - * Author: Nicolas Pitre - * Created: Feb 20, 2003 - * Copyright: (C) 2003 Monta Vista Software, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * Note 1: This driver is made separate from the already too overloaded - * 8250.c because it needs some kirks of its own and that'll make it - * easier to add DMA support. - * - * Note 2: I'm too sick of device allocation policies for serial ports. - * If someone else wants to request an "official" allocation of major/minor - * for this driver please be my guest. And don't forget that new hardware - * to come from Intel might have more than 3 or 4 of those UARTs. Let's - * hope for a better port registration and dynamic device allocation scheme - * with the serial core maintainer satisfaction to appear soon. - */ - - -#if defined(CONFIG_SERIAL_PXA_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) -#define SUPPORT_SYSRQ -#endif - -#include <linux/module.h> -#include <linux/ioport.h> -#include <linux/init.h> -#include <linux/console.h> -#include <linux/sysrq.h> -#include <linux/serial_reg.h> -#include <linux/circ_buf.h> -#include <linux/delay.h> -#include <linux/interrupt.h> -#include <linux/of.h> -#include <linux/platform_device.h> -#include <linux/tty.h> -#include <linux/tty_flip.h> -#include <linux/serial_core.h> -#include <linux/clk.h> -#include <linux/io.h> -#include <linux/slab.h> - -#define PXA_NAME_LEN 8 - -struct uart_pxa_port { - struct uart_port port; - unsigned char ier; - unsigned char lcr; - unsigned char mcr; - unsigned int lsr_break_flag; - struct clk *clk; - char name[PXA_NAME_LEN]; -}; - -static inline unsigned int serial_in(struct uart_pxa_port *up, int offset) -{ - offset <<= 2; - return readl(up->port.membase + offset); -} - -static inline void serial_out(struct uart_pxa_port *up, int offset, int value) -{ - offset <<= 2; - writel(value, up->port.membase + offset); -} - -static void serial_pxa_enable_ms(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - up->ier |= UART_IER_MSI; - serial_out(up, UART_IER, up->ier); -} - -static void serial_pxa_stop_tx(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - if (up->ier & UART_IER_THRI) { - up->ier &= ~UART_IER_THRI; - serial_out(up, UART_IER, up->ier); - } -} - -static void serial_pxa_stop_rx(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - up->ier &= ~UART_IER_RLSI; - up->port.read_status_mask &= ~UART_LSR_DR; - serial_out(up, UART_IER, up->ier); -} - -static inline void receive_chars(struct uart_pxa_port *up, int *status) -{ - unsigned int ch, flag; - int max_count = 256; - - do { - /* work around Errata #20 according to - * Intel(R) PXA27x Processor Family - * Specification Update (May 2005) - * - * Step 2 - * Disable the Reciever Time Out Interrupt via IER[RTOEI] - */ - up->ier &= ~UART_IER_RTOIE; - serial_out(up, UART_IER, up->ier); - - ch = serial_in(up, UART_RX); - flag = TTY_NORMAL; - up->port.icount.rx++; - - if (unlikely(*status & (UART_LSR_BI | UART_LSR_PE | - UART_LSR_FE | UART_LSR_OE))) { - /* - * For statistics only - */ - if (*status & UART_LSR_BI) { - *status &= ~(UART_LSR_FE | UART_LSR_PE); - up->port.icount.brk++; - /* - * We do the SysRQ and SAK checking - * here because otherwise the break - * may get masked by ignore_status_mask - * or read_status_mask. - */ - if (uart_handle_break(&up->port)) - goto ignore_char; - } else if (*status & UART_LSR_PE) - up->port.icount.parity++; - else if (*status & UART_LSR_FE) - up->port.icount.frame++; - if (*status & UART_LSR_OE) - up->port.icount.overrun++; - - /* - * Mask off conditions which should be ignored. - */ - *status &= up->port.read_status_mask; - -#ifdef CONFIG_SERIAL_PXA_CONSOLE - if (up->port.line == up->port.cons->index) { - /* Recover the break flag from console xmit */ - *status |= up->lsr_break_flag; - up->lsr_break_flag = 0; - } -#endif - if (*status & UART_LSR_BI) { - flag = TTY_BREAK; - } else if (*status & UART_LSR_PE) - flag = TTY_PARITY; - else if (*status & UART_LSR_FE) - flag = TTY_FRAME; - } - - if (uart_handle_sysrq_char(&up->port, ch)) - goto ignore_char; - - uart_insert_char(&up->port, *status, UART_LSR_OE, ch, flag); - - ignore_char: - *status = serial_in(up, UART_LSR); - } while ((*status & UART_LSR_DR) && (max_count-- > 0)); - tty_flip_buffer_push(&up->port.state->port); - - /* work around Errata #20 according to - * Intel(R) PXA27x Processor Family - * Specification Update (May 2005) - * - * Step 6: - * No more data in FIFO: Re-enable RTO interrupt via IER[RTOIE] - */ - up->ier |= UART_IER_RTOIE; - serial_out(up, UART_IER, up->ier); -} - -static void transmit_chars(struct uart_pxa_port *up) -{ - struct circ_buf *xmit = &up->port.state->xmit; - int count; - - if (up->port.x_char) { - serial_out(up, UART_TX, up->port.x_char); - up->port.icount.tx++; - up->port.x_char = 0; - return; - } - if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) { - serial_pxa_stop_tx(&up->port); - return; - } - - count = up->port.fifosize / 2; - do { - serial_out(up, UART_TX, xmit->buf[xmit->tail]); - xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); - up->port.icount.tx++; - if (uart_circ_empty(xmit)) - break; - } while (--count > 0); - - if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) - uart_write_wakeup(&up->port); - - - if (uart_circ_empty(xmit)) - serial_pxa_stop_tx(&up->port); -} - -static void serial_pxa_start_tx(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - if (!(up->ier & UART_IER_THRI)) { - up->ier |= UART_IER_THRI; - serial_out(up, UART_IER, up->ier); - } -} - -static inline void check_modem_status(struct uart_pxa_port *up) -{ - int status; - - status = serial_in(up, UART_MSR); - - if ((status & UART_MSR_ANY_DELTA) == 0) - return; - - if (status & UART_MSR_TERI) - up->port.icount.rng++; - if (status & UART_MSR_DDSR) - up->port.icount.dsr++; - if (status & UART_MSR_DDCD) - uart_handle_dcd_change(&up->port, status & UART_MSR_DCD); - if (status & UART_MSR_DCTS) - uart_handle_cts_change(&up->port, status & UART_MSR_CTS); - - wake_up_interruptible(&up->port.state->port.delta_msr_wait); -} - -/* - * This handles the interrupt from one port. - */ -static inline irqreturn_t serial_pxa_irq(int irq, void *dev_id) -{ - struct uart_pxa_port *up = dev_id; - unsigned int iir, lsr; - - iir = serial_in(up, UART_IIR); - if (iir & UART_IIR_NO_INT) - return IRQ_NONE; - lsr = serial_in(up, UART_LSR); - if (lsr & UART_LSR_DR) - receive_chars(up, &lsr); - check_modem_status(up); - if (lsr & UART_LSR_THRE) - transmit_chars(up); - return IRQ_HANDLED; -} - -static unsigned int serial_pxa_tx_empty(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned long flags; - unsigned int ret; - - spin_lock_irqsave(&up->port.lock, flags); - ret = serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0; - spin_unlock_irqrestore(&up->port.lock, flags); - - return ret; -} - -static unsigned int serial_pxa_get_mctrl(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned char status; - unsigned int ret; - - status = serial_in(up, UART_MSR); - - ret = 0; - if (status & UART_MSR_DCD) - ret |= TIOCM_CAR; - if (status & UART_MSR_RI) - ret |= TIOCM_RNG; - if (status & UART_MSR_DSR) - ret |= TIOCM_DSR; - if (status & UART_MSR_CTS) - ret |= TIOCM_CTS; - return ret; -} - -static void serial_pxa_set_mctrl(struct uart_port *port, unsigned int mctrl) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned char mcr = 0; - - if (mctrl & TIOCM_RTS) - mcr |= UART_MCR_RTS; - if (mctrl & TIOCM_DTR) - mcr |= UART_MCR_DTR; - if (mctrl & TIOCM_OUT1) - mcr |= UART_MCR_OUT1; - if (mctrl & TIOCM_OUT2) - mcr |= UART_MCR_OUT2; - if (mctrl & TIOCM_LOOP) - mcr |= UART_MCR_LOOP; - - mcr |= up->mcr; - - serial_out(up, UART_MCR, mcr); -} - -static void serial_pxa_break_ctl(struct uart_port *port, int break_state) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned long flags; - - spin_lock_irqsave(&up->port.lock, flags); - if (break_state == -1) - up->lcr |= UART_LCR_SBC; - else - up->lcr &= ~UART_LCR_SBC; - serial_out(up, UART_LCR, up->lcr); - spin_unlock_irqrestore(&up->port.lock, flags); -} - -static int serial_pxa_startup(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned long flags; - int retval; - - if (port->line == 3) /* HWUART */ - up->mcr |= UART_MCR_AFE; - else - up->mcr = 0; - - up->port.uartclk = clk_get_rate(up->clk); - - /* - * Allocate the IRQ - */ - retval = request_irq(up->port.irq, serial_pxa_irq, 0, up->name, up); - if (retval) - return retval; - - /* - * Clear the FIFO buffers and disable them. - * (they will be reenabled in set_termios()) - */ - serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO); - serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO | - UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT); - serial_out(up, UART_FCR, 0); - - /* - * Clear the interrupt registers. - */ - (void) serial_in(up, UART_LSR); - (void) serial_in(up, UART_RX); - (void) serial_in(up, UART_IIR); - (void) serial_in(up, UART_MSR); - - /* - * Now, initialize the UART - */ - serial_out(up, UART_LCR, UART_LCR_WLEN8); - - spin_lock_irqsave(&up->port.lock, flags); - up->port.mctrl |= TIOCM_OUT2; - serial_pxa_set_mctrl(&up->port, up->port.mctrl); - spin_unlock_irqrestore(&up->port.lock, flags); - - /* - * Finally, enable interrupts. Note: Modem status interrupts - * are set via set_termios(), which will be occurring imminently - * anyway, so we don't enable them here. - */ - up->ier = UART_IER_RLSI | UART_IER_RDI | UART_IER_RTOIE | UART_IER_UUE; - serial_out(up, UART_IER, up->ier); - - /* - * And clear the interrupt registers again for luck. - */ - (void) serial_in(up, UART_LSR); - (void) serial_in(up, UART_RX); - (void) serial_in(up, UART_IIR); - (void) serial_in(up, UART_MSR); - - return 0; -} - -static void serial_pxa_shutdown(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned long flags; - - free_irq(up->port.irq, up); - - /* - * Disable interrupts from this port - */ - up->ier = 0; - serial_out(up, UART_IER, 0); - - spin_lock_irqsave(&up->port.lock, flags); - up->port.mctrl &= ~TIOCM_OUT2; - serial_pxa_set_mctrl(&up->port, up->port.mctrl); - spin_unlock_irqrestore(&up->port.lock, flags); - - /* - * Disable break condition and FIFOs - */ - serial_out(up, UART_LCR, serial_in(up, UART_LCR) & ~UART_LCR_SBC); - serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO | - UART_FCR_CLEAR_RCVR | - UART_FCR_CLEAR_XMIT); - serial_out(up, UART_FCR, 0); -} - -static void -serial_pxa_set_termios(struct uart_port *port, struct ktermios *termios, - struct ktermios *old) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned char cval, fcr = 0; - unsigned long flags; - unsigned int baud, quot; - unsigned int dll; - - switch (termios->c_cflag & CSIZE) { - case CS5: - cval = UART_LCR_WLEN5; - break; - case CS6: - cval = UART_LCR_WLEN6; - break; - case CS7: - cval = UART_LCR_WLEN7; - break; - default: - case CS8: - cval = UART_LCR_WLEN8; - break; - } - - if (termios->c_cflag & CSTOPB) - cval |= UART_LCR_STOP; - if (termios->c_cflag & PARENB) - cval |= UART_LCR_PARITY; - if (!(termios->c_cflag & PARODD)) - cval |= UART_LCR_EPAR; - - /* - * Ask the core to calculate the divisor for us. - */ - baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); - quot = uart_get_divisor(port, baud); - - if ((up->port.uartclk / quot) < (2400 * 16)) - fcr = UART_FCR_ENABLE_FIFO | UART_FCR_PXAR1; - else if ((up->port.uartclk / quot) < (230400 * 16)) - fcr = UART_FCR_ENABLE_FIFO | UART_FCR_PXAR8; - else - fcr = UART_FCR_ENABLE_FIFO | UART_FCR_PXAR32; - - /* - * Ok, we're now changing the port state. Do it with - * interrupts disabled. - */ - spin_lock_irqsave(&up->port.lock, flags); - - /* - * Ensure the port will be enabled. - * This is required especially for serial console. - */ - up->ier |= UART_IER_UUE; - - /* - * Update the per-port timeout. - */ - uart_update_timeout(port, termios->c_cflag, baud); - - up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR; - if (termios->c_iflag & INPCK) - up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE; - if (termios->c_iflag & (BRKINT | PARMRK)) - up->port.read_status_mask |= UART_LSR_BI; - - /* - * Characters to ignore - */ - up->port.ignore_status_mask = 0; - if (termios->c_iflag & IGNPAR) - up->port.ignore_status_mask |= UART_LSR_PE | UART_LSR_FE; - if (termios->c_iflag & IGNBRK) { - up->port.ignore_status_mask |= UART_LSR_BI; - /* - * If we're ignoring parity and break indicators, - * ignore overruns too (for real raw support). - */ - if (termios->c_iflag & IGNPAR) - up->port.ignore_status_mask |= UART_LSR_OE; - } - - /* - * ignore all characters if CREAD is not set - */ - if ((termios->c_cflag & CREAD) == 0) - up->port.ignore_status_mask |= UART_LSR_DR; - - /* - * CTS flow control flag and modem status interrupts - */ - up->ier &= ~UART_IER_MSI; - if (UART_ENABLE_MS(&up->port, termios->c_cflag)) - up->ier |= UART_IER_MSI; - - serial_out(up, UART_IER, up->ier); - - if (termios->c_cflag & CRTSCTS) - up->mcr |= UART_MCR_AFE; - else - up->mcr &= ~UART_MCR_AFE; - - serial_out(up, UART_LCR, cval | UART_LCR_DLAB); /* set DLAB */ - serial_out(up, UART_DLL, quot & 0xff); /* LS of divisor */ - - /* - * work around Errata #75 according to Intel(R) PXA27x Processor Family - * Specification Update (Nov 2005) - */ - dll = serial_in(up, UART_DLL); - WARN_ON(dll != (quot & 0xff)); - - serial_out(up, UART_DLM, quot >> 8); /* MS of divisor */ - serial_out(up, UART_LCR, cval); /* reset DLAB */ - up->lcr = cval; /* Save LCR */ - serial_pxa_set_mctrl(&up->port, up->port.mctrl); - serial_out(up, UART_FCR, fcr); - spin_unlock_irqrestore(&up->port.lock, flags); -} - -static void -serial_pxa_pm(struct uart_port *port, unsigned int state, - unsigned int oldstate) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - if (!state) - clk_prepare_enable(up->clk); - else - clk_disable_unprepare(up->clk); -} - -static void serial_pxa_release_port(struct uart_port *port) -{ -} - -static int serial_pxa_request_port(struct uart_port *port) -{ - return 0; -} - -static void serial_pxa_config_port(struct uart_port *port, int flags) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - up->port.type = PORT_PXA; -} - -static int -serial_pxa_verify_port(struct uart_port *port, struct serial_struct *ser) -{ - /* we don't want the core code to modify any port params */ - return -EINVAL; -} - -static const char * -serial_pxa_type(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - return up->name; -} - -static struct uart_pxa_port *serial_pxa_ports[4]; -static struct uart_driver serial_pxa_reg; - -#ifdef CONFIG_SERIAL_PXA_CONSOLE - -#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) - -/* - * Wait for transmitter & holding register to empty - */ -static inline void wait_for_xmitr(struct uart_pxa_port *up) -{ - unsigned int status, tmout = 10000; - - /* Wait up to 10ms for the character(s) to be sent. */ - do { - status = serial_in(up, UART_LSR); - - if (status & UART_LSR_BI) - up->lsr_break_flag = UART_LSR_BI; - - if (--tmout == 0) - break; - udelay(1); - } while ((status & BOTH_EMPTY) != BOTH_EMPTY); - - /* Wait up to 1s for flow control if necessary */ - if (up->port.flags & UPF_CONS_FLOW) { - tmout = 1000000; - while (--tmout && - ((serial_in(up, UART_MSR) & UART_MSR_CTS) == 0)) - udelay(1); - } -} - -static void serial_pxa_console_putchar(struct uart_port *port, int ch) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - wait_for_xmitr(up); - serial_out(up, UART_TX, ch); -} - -/* - * Print a string to the serial port trying not to disturb - * any possible real use of the port... - * - * The console_lock must be held when we get here. - */ -static void -serial_pxa_console_write(struct console *co, const char *s, unsigned int count) -{ - struct uart_pxa_port *up = serial_pxa_ports[co->index]; - unsigned int ier; - unsigned long flags; - int locked = 1; - - clk_enable(up->clk); - local_irq_save(flags); - if (up->port.sysrq) - locked = 0; - else if (oops_in_progress) - locked = spin_trylock(&up->port.lock); - else - spin_lock(&up->port.lock); - - /* - * First save the IER then disable the interrupts - */ - ier = serial_in(up, UART_IER); - serial_out(up, UART_IER, UART_IER_UUE); - - uart_console_write(&up->port, s, count, serial_pxa_console_putchar); - - /* - * Finally, wait for transmitter to become empty - * and restore the IER - */ - wait_for_xmitr(up); - serial_out(up, UART_IER, ier); - - if (locked) - spin_unlock(&up->port.lock); - local_irq_restore(flags); - clk_disable(up->clk); - -} - -#ifdef CONFIG_CONSOLE_POLL -/* - * Console polling routines for writing and reading from the uart while - * in an interrupt or debug context. - */ - -static int serial_pxa_get_poll_char(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned char lsr = serial_in(up, UART_LSR); - - while (!(lsr & UART_LSR_DR)) - lsr = serial_in(up, UART_LSR); - - return serial_in(up, UART_RX); -} - - -static void serial_pxa_put_poll_char(struct uart_port *port, - unsigned char c) -{ - unsigned int ier; - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - /* - * First save the IER then disable the interrupts - */ - ier = serial_in(up, UART_IER); - serial_out(up, UART_IER, UART_IER_UUE); - - wait_for_xmitr(up); - /* - * Send the character out. - * If a LF, also do CR... - */ - serial_out(up, UART_TX, c); - if (c == 10) { - wait_for_xmitr(up); - serial_out(up, UART_TX, 13); - } - - /* - * Finally, wait for transmitter to become empty - * and restore the IER - */ - wait_for_xmitr(up); - serial_out(up, UART_IER, ier); -} - -#endif /* CONFIG_CONSOLE_POLL */ - -static int __init -serial_pxa_console_setup(struct console *co, char *options) -{ - struct uart_pxa_port *up; - int baud = 9600; - int bits = 8; - int parity = 'n'; - int flow = 'n'; - - if (co->index == -1 || co->index >= serial_pxa_reg.nr) - co->index = 0; - up = serial_pxa_ports[co->index]; - if (!up) - return -ENODEV; - - if (options) - uart_parse_options(options, &baud, &parity, &bits, &flow); - - return uart_set_options(&up->port, co, baud, parity, bits, flow); -} - -static struct console serial_pxa_console = { - .name = "ttyS", - .write = serial_pxa_console_write, - .device = uart_console_device, - .setup = serial_pxa_console_setup, - .flags = CON_PRINTBUFFER, - .index = -1, - .data = &serial_pxa_reg, -}; - -#define PXA_CONSOLE &serial_pxa_console -#else -#define PXA_CONSOLE NULL -#endif - -static struct uart_ops serial_pxa_pops = { - .tx_empty = serial_pxa_tx_empty, - .set_mctrl = serial_pxa_set_mctrl, - .get_mctrl = serial_pxa_get_mctrl, - .stop_tx = serial_pxa_stop_tx, - .start_tx = serial_pxa_start_tx, - .stop_rx = serial_pxa_stop_rx, - .enable_ms = serial_pxa_enable_ms, - .break_ctl = serial_pxa_break_ctl, - .startup = serial_pxa_startup, - .shutdown = serial_pxa_shutdown, - .set_termios = serial_pxa_set_termios, - .pm = serial_pxa_pm, - .type = serial_pxa_type, - .release_port = serial_pxa_release_port, - .request_port = serial_pxa_request_port, - .config_port = serial_pxa_config_port, - .verify_port = serial_pxa_verify_port, -#ifdef CONFIG_CONSOLE_POLL - .poll_get_char = serial_pxa_get_poll_char, - .poll_put_char = serial_pxa_put_poll_char, -#endif -}; - -static struct uart_driver serial_pxa_reg = { - .owner = THIS_MODULE, - .driver_name = "PXA serial", - .dev_name = "ttyS", - .major = TTY_MAJOR, - .minor = 64, - .nr = 4, - .cons = PXA_CONSOLE, -}; - -#ifdef CONFIG_PM -static int serial_pxa_suspend(struct device *dev) -{ - struct uart_pxa_port *sport = dev_get_drvdata(dev); - - if (sport) - uart_suspend_port(&serial_pxa_reg, &sport->port); - - return 0; -} - -static int serial_pxa_resume(struct device *dev) -{ - struct uart_pxa_port *sport = dev_get_drvdata(dev); - - if (sport) - uart_resume_port(&serial_pxa_reg, &sport->port); - - return 0; -} - -static const struct dev_pm_ops serial_pxa_pm_ops = { - .suspend = serial_pxa_suspend, - .resume = serial_pxa_resume, -}; -#endif - -static struct of_device_id serial_pxa_dt_ids[] = { - { .compatible = "mrvl,pxa-uart", }, - { .compatible = "mrvl,mmp-uart", }, - {} -}; -MODULE_DEVICE_TABLE(of, serial_pxa_dt_ids); - -static int serial_pxa_probe_dt(struct platform_device *pdev, - struct uart_pxa_port *sport) -{ - struct device_node *np = pdev->dev.of_node; - int ret; - - if (!np) - return 1; - - ret = of_alias_get_id(np, "serial"); - if (ret < 0) { - dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret); - return ret; - } - sport->port.line = ret; - return 0; -} - -static int serial_pxa_probe(struct platform_device *dev) -{ - struct uart_pxa_port *sport; - struct resource *mmres, *irqres; - int ret; - - mmres = platform_get_resource(dev, IORESOURCE_MEM, 0); - irqres = platform_get_resource(dev, IORESOURCE_IRQ, 0); - if (!mmres || !irqres) - return -ENODEV; - - sport = kzalloc(sizeof(struct uart_pxa_port), GFP_KERNEL); - if (!sport) - return -ENOMEM; - - sport->clk = clk_get(&dev->dev, NULL); - if (IS_ERR(sport->clk)) { - ret = PTR_ERR(sport->clk); - goto err_free; - } - - ret = clk_prepare(sport->clk); - if (ret) { - clk_put(sport->clk); - goto err_free; - } - - sport->port.type = PORT_PXA; - sport->port.iotype = UPIO_MEM; - sport->port.mapbase = mmres->start; - sport->port.irq = irqres->start; - sport->port.fifosize = 64; - sport->port.ops = &serial_pxa_pops; - sport->port.dev = &dev->dev; - sport->port.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF; - sport->port.uartclk = clk_get_rate(sport->clk); - - ret = serial_pxa_probe_dt(dev, sport); - if (ret > 0) - sport->port.line = dev->id; - else if (ret < 0) - goto err_clk; - snprintf(sport->name, PXA_NAME_LEN - 1, "UART%d", sport->port.line + 1); - - sport->port.membase = ioremap(mmres->start, resource_size(mmres)); - if (!sport->port.membase) { - ret = -ENOMEM; - goto err_clk; - } - - serial_pxa_ports[sport->port.line] = sport; - - uart_add_one_port(&serial_pxa_reg, &sport->port); - platform_set_drvdata(dev, sport); - - return 0; - - err_clk: - clk_unprepare(sport->clk); - clk_put(sport->clk); - err_free: - kfree(sport); - return ret; -} - -static int serial_pxa_remove(struct platform_device *dev) -{ - struct uart_pxa_port *sport = platform_get_drvdata(dev); - - uart_remove_one_port(&serial_pxa_reg, &sport->port); - - clk_unprepare(sport->clk); - clk_put(sport->clk); - kfree(sport); - - return 0; -} - -static struct platform_driver serial_pxa_driver = { - .probe = serial_pxa_probe, - .remove = serial_pxa_remove, - - .driver = { - .name = "pxa2xx-uart", - .owner = THIS_MODULE, -#ifdef CONFIG_PM - .pm = &serial_pxa_pm_ops, -#endif - .of_match_table = serial_pxa_dt_ids, - }, -}; - -static int __init serial_pxa_init(void) -{ - int ret; - - ret = uart_register_driver(&serial_pxa_reg); - if (ret != 0) - return ret; - - ret = platform_driver_register(&serial_pxa_driver); - if (ret != 0) - uart_unregister_driver(&serial_pxa_reg); - - return ret; -} - -static void __exit serial_pxa_exit(void) -{ - platform_driver_unregister(&serial_pxa_driver); - uart_unregister_driver(&serial_pxa_reg); -} - -module_init(serial_pxa_init); -module_exit(serial_pxa_exit); - -MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:pxa2xx-uart"); -- 1.8.4.2 ^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [PATCH v4 01/21] serial: rewrite pxa2xx-uart to use 8250_core 2014-04-16 17:13 ` [PATCH v4 01/21] serial: rewrite pxa2xx-uart to use 8250_core Sergei Ianovich @ 2015-01-19 18:08 ` Rob Herring 0 siblings, 0 replies; 31+ messages in thread From: Rob Herring @ 2015-01-19 18:08 UTC (permalink / raw) To: Sergei Ianovich Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Russell King, Greg Kroah-Hartman, Jiri Slaby, Grant Likely, Rob Herring, James Cameron, Heikki Krogerus, Paul Bolle, Arnd Bergmann, Randy Dunlap, Stefan Seyfried, open list:SERIAL DRIVERS, open list:OPEN FIRMWARE AND... On Wed, Apr 16, 2014 at 12:13 PM, Sergei Ianovich <ynvich@gmail.com> wrote: > pxa2xx-uart was a separate uart platform driver. It was declaring > the same device names and numbers as 8250 driver. As a result, > it was impossible to use 8250 driver on PXA SoCs. > > Upon closer examination pxa2xx-uart turned out to be a clone of > 8250_core driver. > > Workaround for Erratum #19 according to Marvel(R) PXA270M Processor > Specification Update (April 19, 2010) is dropped. 8250_core reads > from FIFO immediately after checking DR bit in LSR. > > Signed-off-by: Sergei Ianovich <ynvich@gmail.com> > Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > Reviewed-by: James Cameron <quozl@laptop.org> > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > --- > Resenging together with the rest of the series as the series > breaks without this one at [PATCH 12/21] Whatever happened with merging this? I'm asking because either this or fixes to PXA uart are needed to coexist with the 8250 driver and for earlycon to work. Rob ^ permalink raw reply [flat|nested] 31+ messages in thread
[parent not found: <1449700088-28076-1-git-send-email-ynvich@gmail.com>]
* [PATCH v4 1/2] serial: rewrite pxa2xx-uart to use 8250_core [not found] ` <1449700088-28076-1-git-send-email-ynvich@gmail.com> @ 2015-12-09 22:28 ` Sergei Ianovich 2015-12-19 12:45 ` Robert Jarzmik 2015-12-23 18:59 ` [PATCH v5] " Sergei Ianovich 0 siblings, 2 replies; 31+ messages in thread From: Sergei Ianovich @ 2015-12-09 22:28 UTC (permalink / raw) To: linux-kernel Cc: Sergei Ianovich, Russell King, Greg Kroah-Hartman, Jiri Slaby, Heikki Krogerus, James Cameron, Alexandre Belloni, Robert Jarzmik, Rob Herring, Ulf Hansson, Rafael J. Wysocki, Kevin Hilman, Andy Shevchenko, Arnd Bergmann, Paul Gortmaker, Scott Wood, Sebastian Andrzej Siewior, Paul Burton, Joachim Eastwood, Mans Rullgard, Masahiro Yamada, Peter pxa2xx-uart was a separate uart platform driver. It was declaring the same device names and numbers as 8250 driver. As a result, it was impossible to use 8250 driver on PXA SoCs. Upon closer examination pxa2xx-uart turned out to be a clone of 8250_core driver. Workaround for Erratum #19 according to Marvel(R) PXA270M Processor Specification Update (April 19, 2010) is dropped. 8250_core reads from FIFO immediately after checking DR bit in LSR. Signed-off-by: Sergei Ianovich <ynvich@gmail.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Reviewed-by: James Cameron <quozl@laptop.org> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> --- The patch was reviewed/acked at version 3. Changes in version 4 are simple unbitrotting, so the flags are carried over. changes v3..v4 * remove owner field from platform_driver structure * make of_device_id structure constant * use CONFIG_SERIAL_8250_PXA instead of CONFIG_SERIAL_PXA changes v2..v3 * remove devm_free/put as suggested by Heikki Krogerus * use SET_SYSTEM_SLEEP_PM_OPS macro to set pm ops as suggested by Heikki Krogerus changes v1..v2 * actually implement workaround for E74 in dl_write as spooted by James Cameron * added comment about E19 in commit message arch/arm/configs/am200epdkit_defconfig | 5 +- arch/arm/configs/cm_x2xx_defconfig | 5 +- arch/arm/configs/cm_x300_defconfig | 5 +- arch/arm/configs/colibri_pxa270_defconfig | 5 +- arch/arm/configs/colibri_pxa300_defconfig | 5 +- arch/arm/configs/corgi_defconfig | 6 +- arch/arm/configs/em_x270_defconfig | 5 +- arch/arm/configs/ezx_defconfig | 5 +- arch/arm/configs/h5000_defconfig | 5 +- arch/arm/configs/imote2_defconfig | 5 +- arch/arm/configs/lpd270_defconfig | 5 +- arch/arm/configs/lubbock_defconfig | 5 +- arch/arm/configs/mainstone_defconfig | 5 +- arch/arm/configs/mmp2_defconfig | 5 +- arch/arm/configs/pcm027_defconfig | 5 +- arch/arm/configs/pxa168_defconfig | 5 +- arch/arm/configs/pxa255-idp_defconfig | 5 +- arch/arm/configs/pxa3xx_defconfig | 5 +- arch/arm/configs/pxa910_defconfig | 5 +- arch/arm/configs/raumfeld_defconfig | 5 +- arch/arm/configs/spitz_defconfig | 6 +- arch/arm/configs/trizeps4_defconfig | 5 +- arch/arm/configs/viper_defconfig | 6 +- arch/arm/configs/xcep_defconfig | 5 +- drivers/tty/serial/8250/8250_pxa.c | 177 ++++++ drivers/tty/serial/8250/Kconfig | 9 + drivers/tty/serial/8250/Makefile | 1 + drivers/tty/serial/Kconfig | 23 - drivers/tty/serial/Makefile | 1 - drivers/tty/serial/pxa.c | 968 ------------------------------ 30 files changed, 259 insertions(+), 1043 deletions(-) create mode 100644 drivers/tty/serial/8250/8250_pxa.c delete mode 100644 drivers/tty/serial/pxa.c diff --git a/arch/arm/configs/am200epdkit_defconfig b/arch/arm/configs/am200epdkit_defconfig index f0dea52..5f78ee7 100644 --- a/arch/arm/configs/am200epdkit_defconfig +++ b/arch/arm/configs/am200epdkit_defconfig @@ -60,8 +60,9 @@ CONFIG_BLK_DEV_IDECS=m CONFIG_NETDEVICES=y CONFIG_NET_ETHERNET=y CONFIG_SMC91X=m -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set # CONFIG_HWMON is not set diff --git a/arch/arm/configs/cm_x2xx_defconfig b/arch/arm/configs/cm_x2xx_defconfig index 3b32d5f..f1ae370 100644 --- a/arch/arm/configs/cm_x2xx_defconfig +++ b/arch/arm/configs/cm_x2xx_defconfig @@ -96,8 +96,9 @@ CONFIG_KEYBOARD_PXA27x=m CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_UCB1400=m # CONFIG_SERIO_SERPORT is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y CONFIG_LEGACY_PTY_COUNT=16 # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/cm_x300_defconfig b/arch/arm/configs/cm_x300_defconfig index 7df040e..07bf9b2 100644 --- a/arch/arm/configs/cm_x300_defconfig +++ b/arch/arm/configs/cm_x300_defconfig @@ -80,8 +80,9 @@ CONFIG_TOUCHSCREEN_WM97XX=m # CONFIG_TOUCHSCREEN_WM9713 is not set # CONFIG_SERIO is not set # CONFIG_LEGACY_PTYS is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y # CONFIG_HW_RANDOM is not set CONFIG_I2C=y CONFIG_I2C_PXA=y diff --git a/arch/arm/configs/colibri_pxa270_defconfig b/arch/arm/configs/colibri_pxa270_defconfig index 18c311a..5ea17d4 100644 --- a/arch/arm/configs/colibri_pxa270_defconfig +++ b/arch/arm/configs/colibri_pxa270_defconfig @@ -103,8 +103,9 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m CONFIG_SERIO_LIBPS2=y -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y CONFIG_HW_RANDOM=y CONFIG_I2C=y CONFIG_I2C_CHARDEV=y diff --git a/arch/arm/configs/colibri_pxa300_defconfig b/arch/arm/configs/colibri_pxa300_defconfig index be02fe2..e12af54 100644 --- a/arch/arm/configs/colibri_pxa300_defconfig +++ b/arch/arm/configs/colibri_pxa300_defconfig @@ -31,8 +31,9 @@ CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_MOUSE is not set CONFIG_INPUT_MISC=y CONFIG_INPUT_GPIO_ROTARY_ENCODER=y -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y CONFIG_HW_RANDOM=y CONFIG_DEBUG_GPIO=y # CONFIG_HWMON is not set diff --git a/arch/arm/configs/corgi_defconfig b/arch/arm/configs/corgi_defconfig index c1470a0..d94212b 100644 --- a/arch/arm/configs/corgi_defconfig +++ b/arch/arm/configs/corgi_defconfig @@ -131,10 +131,10 @@ CONFIG_TOUCHSCREEN_ADS7846=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m # CONFIG_SERIO is not set -CONFIG_SERIAL_8250=m +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CS=m -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y # CONFIG_LEGACY_PTYS is not set CONFIG_I2C=y CONFIG_I2C_PXA=y diff --git a/arch/arm/configs/em_x270_defconfig b/arch/arm/configs/em_x270_defconfig index 8e10df7..8ac6b84 100644 --- a/arch/arm/configs/em_x270_defconfig +++ b/arch/arm/configs/em_x270_defconfig @@ -90,8 +90,9 @@ CONFIG_TOUCHSCREEN_WM97XX=m # CONFIG_TOUCHSCREEN_WM9705 is not set # CONFIG_TOUCHSCREEN_WM9713 is not set # CONFIG_SERIO_SERPORT is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y CONFIG_LEGACY_PTY_COUNT=16 # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/ezx_defconfig b/arch/arm/configs/ezx_defconfig index ea316c4..5d365f4 100644 --- a/arch/arm/configs/ezx_defconfig +++ b/arch/arm/configs/ezx_defconfig @@ -214,8 +214,9 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y CONFIG_INPUT_PCAP=y # CONFIG_SERIO is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y CONFIG_LEGACY_PTY_COUNT=8 # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/h5000_defconfig b/arch/arm/configs/h5000_defconfig index 37903e3..d366c87 100644 --- a/arch/arm/configs/h5000_defconfig +++ b/arch/arm/configs/h5000_defconfig @@ -47,8 +47,9 @@ CONFIG_MTD_PHYSMAP=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y CONFIG_LEGACY_PTY_COUNT=32 # CONFIG_HW_RANDOM is not set # CONFIG_HWMON is not set diff --git a/arch/arm/configs/imote2_defconfig b/arch/arm/configs/imote2_defconfig index 18e59fe..0cc503b 100644 --- a/arch/arm/configs/imote2_defconfig +++ b/arch/arm/configs/imote2_defconfig @@ -192,8 +192,9 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=y # CONFIG_SERIO is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y CONFIG_LEGACY_PTY_COUNT=8 # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/lpd270_defconfig b/arch/arm/configs/lpd270_defconfig index 1c8c9ee..7774fb2 100644 --- a/arch/arm/configs/lpd270_defconfig +++ b/arch/arm/configs/lpd270_defconfig @@ -38,8 +38,9 @@ CONFIG_SMC91X=y CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO_SERPORT is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y # CONFIG_HW_RANDOM is not set CONFIG_FB=y CONFIG_FB_PXA=y diff --git a/arch/arm/configs/lubbock_defconfig b/arch/arm/configs/lubbock_defconfig index c4ba274..d2c18e6 100644 --- a/arch/arm/configs/lubbock_defconfig +++ b/arch/arm/configs/lubbock_defconfig @@ -37,8 +37,9 @@ CONFIG_PCMCIA_PCNET=y CONFIG_INPUT_EVDEV=y # CONFIG_SERIO_SERPORT is not set CONFIG_SERIO_SA1111=y -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y # CONFIG_VGA_CONSOLE is not set CONFIG_USB_GADGET=y CONFIG_USB_G_SERIAL=m diff --git a/arch/arm/configs/mainstone_defconfig b/arch/arm/configs/mainstone_defconfig index 04efa1b..ece034c 100644 --- a/arch/arm/configs/mainstone_defconfig +++ b/arch/arm/configs/mainstone_defconfig @@ -34,8 +34,9 @@ CONFIG_SMC91X=y CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO_SERPORT is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y CONFIG_FB=y CONFIG_FB_PXA=y # CONFIG_VGA_CONSOLE is not set diff --git a/arch/arm/configs/mmp2_defconfig b/arch/arm/configs/mmp2_defconfig index f1cb95e..a56f2a0 100644 --- a/arch/arm/configs/mmp2_defconfig +++ b/arch/arm/configs/mmp2_defconfig @@ -44,8 +44,9 @@ CONFIG_SMC91X=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/pcm027_defconfig b/arch/arm/configs/pcm027_defconfig index b5624e3..93bc85c 100644 --- a/arch/arm/configs/pcm027_defconfig +++ b/arch/arm/configs/pcm027_defconfig @@ -60,8 +60,9 @@ CONFIG_SMC91X=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/pxa168_defconfig b/arch/arm/configs/pxa168_defconfig index 74d7e01..8dc8a99 100644 --- a/arch/arm/configs/pxa168_defconfig +++ b/arch/arm/configs/pxa168_defconfig @@ -40,8 +40,9 @@ CONFIG_SMC91X=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set # CONFIG_HWMON is not set diff --git a/arch/arm/configs/pxa255-idp_defconfig b/arch/arm/configs/pxa255-idp_defconfig index 917a070b..688578d 100644 --- a/arch/arm/configs/pxa255-idp_defconfig +++ b/arch/arm/configs/pxa255-idp_defconfig @@ -35,8 +35,9 @@ CONFIG_SMC91X=y CONFIG_INPUT_EVDEV=y # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO_SERPORT is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y CONFIG_FB=y CONFIG_FB_PXA=y # CONFIG_VGA_CONSOLE is not set diff --git a/arch/arm/configs/pxa3xx_defconfig b/arch/arm/configs/pxa3xx_defconfig index 5f337d7..1dedeaf 100644 --- a/arch/arm/configs/pxa3xx_defconfig +++ b/arch/arm/configs/pxa3xx_defconfig @@ -56,8 +56,9 @@ CONFIG_KEYBOARD_PXA27x=y CONFIG_KEYBOARD_PXA930_ROTARY=y CONFIG_MOUSE_PXA930_TRKBALL=y CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_I2C=y diff --git a/arch/arm/configs/pxa910_defconfig b/arch/arm/configs/pxa910_defconfig index 3bb7771..9be8045 100644 --- a/arch/arm/configs/pxa910_defconfig +++ b/arch/arm/configs/pxa910_defconfig @@ -40,8 +40,9 @@ CONFIG_SMC91X=y # CONFIG_INPUT_KEYBOARD is not set # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y CONFIG_SPI=y CONFIG_FB=y CONFIG_MMP_DISP=y diff --git a/arch/arm/configs/raumfeld_defconfig b/arch/arm/configs/raumfeld_defconfig index 3d833ae..b4c23e3 100644 --- a/arch/arm/configs/raumfeld_defconfig +++ b/arch/arm/configs/raumfeld_defconfig @@ -67,8 +67,9 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_TOUCHSCREEN_EETI=m CONFIG_INPUT_MISC=y CONFIG_INPUT_GPIO_ROTARY_ENCODER=y -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y CONFIG_HW_RANDOM=y CONFIG_I2C=y CONFIG_I2C_CHARDEV=y diff --git a/arch/arm/configs/spitz_defconfig b/arch/arm/configs/spitz_defconfig index a1ede19..fb07d0b 100644 --- a/arch/arm/configs/spitz_defconfig +++ b/arch/arm/configs/spitz_defconfig @@ -128,10 +128,10 @@ CONFIG_TOUCHSCREEN_ADS7846=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m # CONFIG_SERIO is not set -CONFIG_SERIAL_8250=m +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_CS=m -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y # CONFIG_LEGACY_PTYS is not set CONFIG_SPI=y CONFIG_SPI_PXA2XX=y diff --git a/arch/arm/configs/trizeps4_defconfig b/arch/arm/configs/trizeps4_defconfig index 4bc8700..cbd0226 100644 --- a/arch/arm/configs/trizeps4_defconfig +++ b/arch/arm/configs/trizeps4_defconfig @@ -132,8 +132,9 @@ CONFIG_INPUT_TOUCHSCREEN=y CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m CONFIG_SERIO_LIBPS2=y -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y CONFIG_HW_RANDOM=y CONFIG_I2C=y CONFIG_I2C_CHARDEV=y diff --git a/arch/arm/configs/viper_defconfig b/arch/arm/configs/viper_defconfig index 0d717a5..6e5ca7e 100644 --- a/arch/arm/configs/viper_defconfig +++ b/arch/arm/configs/viper_defconfig @@ -101,11 +101,11 @@ CONFIG_INPUT_MISC=y CONFIG_INPUT_UINPUT=m # CONFIG_CONSOLE_TRANSLATIONS is not set # CONFIG_VT_CONSOLE is not set -CONFIG_SERIAL_8250=m +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y CONFIG_SERIAL_8250_NR_UARTS=5 CONFIG_SERIAL_8250_RUNTIME_UARTS=5 -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y # CONFIG_LEGACY_PTYS is not set CONFIG_I2C=y CONFIG_I2C_CHARDEV=y diff --git a/arch/arm/configs/xcep_defconfig b/arch/arm/configs/xcep_defconfig index 721832f..007967a 100644 --- a/arch/arm/configs/xcep_defconfig +++ b/arch/arm/configs/xcep_defconfig @@ -60,8 +60,9 @@ CONFIG_NET_ETHERNET=y # CONFIG_INPUT_MOUSE is not set # CONFIG_SERIO is not set # CONFIG_DEVKMEM is not set -CONFIG_SERIAL_PXA=y -CONFIG_SERIAL_PXA_CONSOLE=y +CONFIG_SERIAL_8250=y +CONFIG_SERIAL_8250_CONSOLE=y +CONFIG_SERIAL_8250_PXA=y # CONFIG_LEGACY_PTYS is not set # CONFIG_HW_RANDOM is not set CONFIG_I2C=m diff --git a/drivers/tty/serial/8250/8250_pxa.c b/drivers/tty/serial/8250/8250_pxa.c new file mode 100644 index 0000000..6a14df0 --- /dev/null +++ b/drivers/tty/serial/8250/8250_pxa.c @@ -0,0 +1,177 @@ +/* + * drivers/tty/serial/8250/8250_pxa.c -- driver for PXA on-board UARTS + * Copyright: (C) 2013 Sergei Ianovich <ynvich@gmail.com> + * + * replaces drivers/serial/pxa.c by Nicolas Pitre + * Created: Feb 20, 2003 + * Copyright: (C) 2003 Monta Vista Software, Inc. + * + * Based on drivers/serial/8250.c by Russell King. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + +#include <linux/device.h> +#include <linux/init.h> +#include <linux/io.h> +#include <linux/module.h> +#include <linux/serial_8250.h> +#include <linux/serial_core.h> +#include <linux/serial_reg.h> +#include <linux/of.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/clk.h> +#include <linux/pm_runtime.h> + +#include "8250.h" + +struct pxa8250_data { + int line; + struct clk *clk; +}; + +#ifdef CONFIG_PM +static int serial_pxa_suspend(struct device *dev) +{ + struct pxa8250_data *data = dev_get_drvdata(dev); + + serial8250_suspend_port(data->line); + + return 0; +} + +static int serial_pxa_resume(struct device *dev) +{ + struct pxa8250_data *data = dev_get_drvdata(dev); + + serial8250_resume_port(data->line); + + return 0; +} +#endif + +static const struct dev_pm_ops serial_pxa_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(serial_pxa_suspend, serial_pxa_resume) +}; + +static const struct of_device_id serial_pxa_dt_ids[] = { + { .compatible = "mrvl,pxa-uart", }, + { .compatible = "mrvl,mmp-uart", }, + {} +}; +MODULE_DEVICE_TABLE(of, serial_pxa_dt_ids); + +/* Uart divisor latch write */ +static void serial_pxa_dl_write(struct uart_8250_port *up, int value) +{ + unsigned int dll; + + serial_out(up, UART_DLL, value & 0xff); + /* + * work around Erratum #74 according to Marvel(R) PXA270M Processor + * Specification Update (April 19, 2010) + */ + dll = serial_in(up, UART_DLL); + WARN_ON(dll != (value & 0xff)); + + serial_out(up, UART_DLM, value >> 8 & 0xff); +} + + +static void serial_pxa_pm(struct uart_port *port, unsigned int state, + unsigned int oldstate) +{ + struct pxa8250_data *data = port->private_data; + + if (!state) + clk_prepare_enable(data->clk); + else + clk_disable_unprepare(data->clk); +} + +static int serial_pxa_probe(struct platform_device *pdev) +{ + struct uart_8250_port uart = {}; + struct pxa8250_data *data; + struct resource *mmres, *irqres; + int ret; + + mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0); + irqres = platform_get_resource(pdev, IORESOURCE_IRQ, 0); + if (!mmres || !irqres) + return -ENODEV; + + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(data->clk)) + return PTR_ERR(data->clk); + + ret = clk_prepare(data->clk); + if (ret) + return ret; + + uart.port.type = PORT_XSCALE; + uart.port.iotype = UPIO_MEM32; + uart.port.mapbase = mmres->start; + uart.port.regshift = 2; + uart.port.irq = irqres->start; + uart.port.fifosize = 64; + uart.port.flags = UPF_IOREMAP | UPF_SKIP_TEST; + uart.port.dev = &pdev->dev; + uart.port.uartclk = clk_get_rate(data->clk); + uart.port.pm = serial_pxa_pm; + uart.port.private_data = data; + uart.dl_write = serial_pxa_dl_write; + + ret = serial8250_register_8250_port(&uart); + if (ret < 0) + goto err_clk; + + data->line = ret; + + platform_set_drvdata(pdev, data); + + return 0; + + err_clk: + clk_unprepare(data->clk); + return ret; +} + +static int serial_pxa_remove(struct platform_device *pdev) +{ + struct pxa8250_data *data = platform_get_drvdata(pdev); + + serial8250_unregister_port(data->line); + + clk_unprepare(data->clk); + + return 0; +} + +static struct platform_driver serial_pxa_driver = { + .probe = serial_pxa_probe, + .remove = serial_pxa_remove, + + .driver = { + .name = "pxa2xx-uart", + .pm = &serial_pxa_pm_ops, + .of_match_table = serial_pxa_dt_ids, + }, +}; + +module_platform_driver(serial_pxa_driver); + +MODULE_AUTHOR("Sergei Ianovich"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:pxa2xx-uart"); diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig index 6412f14..48b6253 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig @@ -378,3 +378,12 @@ config SERIAL_8250_MID Selecting this option will enable handling of the extra features present on the UART found on Intel Medfield SOC and various other Intel platforms. + +config SERIAL_8250_PXA + tristate "PXA serial port support" + depends on SERIAL_8250 && (ARCH_PXA || ARCH_MMP) + help + If you have a machine based on an Intel XScale PXA2xx CPU you + can enable its onboard serial ports by enabling this option. + + If you choose M here, the module name will be 8250_pxa. diff --git a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Makefile index e177f86..7e54413 100644 --- a/drivers/tty/serial/8250/Makefile +++ b/drivers/tty/serial/8250/Makefile @@ -28,5 +28,6 @@ obj-$(CONFIG_SERIAL_8250_MT6577) += 8250_mtk.o obj-$(CONFIG_SERIAL_8250_UNIPHIER) += 8250_uniphier.o obj-$(CONFIG_SERIAL_8250_INGENIC) += 8250_ingenic.o obj-$(CONFIG_SERIAL_8250_MID) += 8250_mid.o +obj-$(CONFIG_SERIAL_8250_PXA) += 8250_pxa.o CFLAGS_8250_ingenic.o += -I$(srctree)/scripts/dtc/libfdt diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index f38beb2..8c40c83 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -435,29 +435,6 @@ config SERIAL_MPSC_CONSOLE help Say Y here if you want to support a serial console on a Marvell MPSC. -config SERIAL_PXA - bool "PXA serial port support" - depends on ARCH_PXA || ARCH_MMP - select SERIAL_CORE - help - If you have a machine based on an Intel XScale PXA2xx CPU you - can enable its onboard serial ports by enabling this option. - -config SERIAL_PXA_CONSOLE - bool "Console on PXA serial port" - depends on SERIAL_PXA - select SERIAL_CORE_CONSOLE - help - If you have enabled the serial port on the Intel XScale PXA - CPU you can make it the console by answering Y to this option. - - Even if you say Y here, the currently visible virtual console - (/dev/tty0) will still be used as the system console by default, but - you can alter that using a kernel command line option such as - "console=ttySA0". (Try "man bootparam" or see the documentation of - your boot loader (lilo or loadlin) about how to pass options to the - kernel at boot time.) - config SERIAL_SA1100 bool "SA1100 serial port support" depends on ARCH_SA1100 diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile index 5ab4111..5cd5c68 100644 --- a/drivers/tty/serial/Makefile +++ b/drivers/tty/serial/Makefile @@ -23,7 +23,6 @@ obj-$(CONFIG_SERIAL_8250) += 8250/ obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o -obj-$(CONFIG_SERIAL_PXA) += pxa.o obj-$(CONFIG_SERIAL_PNX8XXX) += pnx8xxx_uart.o obj-$(CONFIG_SERIAL_SA1100) += sa1100.o obj-$(CONFIG_SERIAL_BCM63XX) += bcm63xx_uart.o diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c deleted file mode 100644 index 9becba6..0000000 --- a/drivers/tty/serial/pxa.c +++ /dev/null @@ -1,968 +0,0 @@ -/* - * Based on drivers/serial/8250.c by Russell King. - * - * Author: Nicolas Pitre - * Created: Feb 20, 2003 - * Copyright: (C) 2003 Monta Vista Software, Inc. - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * Note 1: This driver is made separate from the already too overloaded - * 8250.c because it needs some kirks of its own and that'll make it - * easier to add DMA support. - * - * Note 2: I'm too sick of device allocation policies for serial ports. - * If someone else wants to request an "official" allocation of major/minor - * for this driver please be my guest. And don't forget that new hardware - * to come from Intel might have more than 3 or 4 of those UARTs. Let's - * hope for a better port registration and dynamic device allocation scheme - * with the serial core maintainer satisfaction to appear soon. - */ - - -#if defined(CONFIG_SERIAL_PXA_CONSOLE) && defined(CONFIG_MAGIC_SYSRQ) -#define SUPPORT_SYSRQ -#endif - -#include <linux/module.h> -#include <linux/ioport.h> -#include <linux/init.h> -#include <linux/console.h> -#include <linux/sysrq.h> -#include <linux/serial_reg.h> -#include <linux/circ_buf.h> -#include <linux/delay.h> -#include <linux/interrupt.h> -#include <linux/of.h> -#include <linux/platform_device.h> -#include <linux/tty.h> -#include <linux/tty_flip.h> -#include <linux/serial_core.h> -#include <linux/clk.h> -#include <linux/io.h> -#include <linux/slab.h> - -#define PXA_NAME_LEN 8 - -struct uart_pxa_port { - struct uart_port port; - unsigned char ier; - unsigned char lcr; - unsigned char mcr; - unsigned int lsr_break_flag; - struct clk *clk; - char name[PXA_NAME_LEN]; -}; - -static inline unsigned int serial_in(struct uart_pxa_port *up, int offset) -{ - offset <<= 2; - return readl(up->port.membase + offset); -} - -static inline void serial_out(struct uart_pxa_port *up, int offset, int value) -{ - offset <<= 2; - writel(value, up->port.membase + offset); -} - -static void serial_pxa_enable_ms(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - up->ier |= UART_IER_MSI; - serial_out(up, UART_IER, up->ier); -} - -static void serial_pxa_stop_tx(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - if (up->ier & UART_IER_THRI) { - up->ier &= ~UART_IER_THRI; - serial_out(up, UART_IER, up->ier); - } -} - -static void serial_pxa_stop_rx(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - up->ier &= ~UART_IER_RLSI; - up->port.read_status_mask &= ~UART_LSR_DR; - serial_out(up, UART_IER, up->ier); -} - -static inline void receive_chars(struct uart_pxa_port *up, int *status) -{ - unsigned int ch, flag; - int max_count = 256; - - do { - /* work around Errata #20 according to - * Intel(R) PXA27x Processor Family - * Specification Update (May 2005) - * - * Step 2 - * Disable the Reciever Time Out Interrupt via IER[RTOEI] - */ - up->ier &= ~UART_IER_RTOIE; - serial_out(up, UART_IER, up->ier); - - ch = serial_in(up, UART_RX); - flag = TTY_NORMAL; - up->port.icount.rx++; - - if (unlikely(*status & (UART_LSR_BI | UART_LSR_PE | - UART_LSR_FE | UART_LSR_OE))) { - /* - * For statistics only - */ - if (*status & UART_LSR_BI) { - *status &= ~(UART_LSR_FE | UART_LSR_PE); - up->port.icount.brk++; - /* - * We do the SysRQ and SAK checking - * here because otherwise the break - * may get masked by ignore_status_mask - * or read_status_mask. - */ - if (uart_handle_break(&up->port)) - goto ignore_char; - } else if (*status & UART_LSR_PE) - up->port.icount.parity++; - else if (*status & UART_LSR_FE) - up->port.icount.frame++; - if (*status & UART_LSR_OE) - up->port.icount.overrun++; - - /* - * Mask off conditions which should be ignored. - */ - *status &= up->port.read_status_mask; - -#ifdef CONFIG_SERIAL_PXA_CONSOLE - if (up->port.line == up->port.cons->index) { - /* Recover the break flag from console xmit */ - *status |= up->lsr_break_flag; - up->lsr_break_flag = 0; - } -#endif - if (*status & UART_LSR_BI) { - flag = TTY_BREAK; - } else if (*status & UART_LSR_PE) - flag = TTY_PARITY; - else if (*status & UART_LSR_FE) - flag = TTY_FRAME; - } - - if (uart_handle_sysrq_char(&up->port, ch)) - goto ignore_char; - - uart_insert_char(&up->port, *status, UART_LSR_OE, ch, flag); - - ignore_char: - *status = serial_in(up, UART_LSR); - } while ((*status & UART_LSR_DR) && (max_count-- > 0)); - tty_flip_buffer_push(&up->port.state->port); - - /* work around Errata #20 according to - * Intel(R) PXA27x Processor Family - * Specification Update (May 2005) - * - * Step 6: - * No more data in FIFO: Re-enable RTO interrupt via IER[RTOIE] - */ - up->ier |= UART_IER_RTOIE; - serial_out(up, UART_IER, up->ier); -} - -static void transmit_chars(struct uart_pxa_port *up) -{ - struct circ_buf *xmit = &up->port.state->xmit; - int count; - - if (up->port.x_char) { - serial_out(up, UART_TX, up->port.x_char); - up->port.icount.tx++; - up->port.x_char = 0; - return; - } - if (uart_circ_empty(xmit) || uart_tx_stopped(&up->port)) { - serial_pxa_stop_tx(&up->port); - return; - } - - count = up->port.fifosize / 2; - do { - serial_out(up, UART_TX, xmit->buf[xmit->tail]); - xmit->tail = (xmit->tail + 1) & (UART_XMIT_SIZE - 1); - up->port.icount.tx++; - if (uart_circ_empty(xmit)) - break; - } while (--count > 0); - - if (uart_circ_chars_pending(xmit) < WAKEUP_CHARS) - uart_write_wakeup(&up->port); - - - if (uart_circ_empty(xmit)) - serial_pxa_stop_tx(&up->port); -} - -static void serial_pxa_start_tx(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - if (!(up->ier & UART_IER_THRI)) { - up->ier |= UART_IER_THRI; - serial_out(up, UART_IER, up->ier); - } -} - -/* should hold up->port.lock */ -static inline void check_modem_status(struct uart_pxa_port *up) -{ - int status; - - status = serial_in(up, UART_MSR); - - if ((status & UART_MSR_ANY_DELTA) == 0) - return; - - if (status & UART_MSR_TERI) - up->port.icount.rng++; - if (status & UART_MSR_DDSR) - up->port.icount.dsr++; - if (status & UART_MSR_DDCD) - uart_handle_dcd_change(&up->port, status & UART_MSR_DCD); - if (status & UART_MSR_DCTS) - uart_handle_cts_change(&up->port, status & UART_MSR_CTS); - - wake_up_interruptible(&up->port.state->port.delta_msr_wait); -} - -/* - * This handles the interrupt from one port. - */ -static inline irqreturn_t serial_pxa_irq(int irq, void *dev_id) -{ - struct uart_pxa_port *up = dev_id; - unsigned int iir, lsr; - - iir = serial_in(up, UART_IIR); - if (iir & UART_IIR_NO_INT) - return IRQ_NONE; - spin_lock(&up->port.lock); - lsr = serial_in(up, UART_LSR); - if (lsr & UART_LSR_DR) - receive_chars(up, &lsr); - check_modem_status(up); - if (lsr & UART_LSR_THRE) - transmit_chars(up); - spin_unlock(&up->port.lock); - return IRQ_HANDLED; -} - -static unsigned int serial_pxa_tx_empty(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned long flags; - unsigned int ret; - - spin_lock_irqsave(&up->port.lock, flags); - ret = serial_in(up, UART_LSR) & UART_LSR_TEMT ? TIOCSER_TEMT : 0; - spin_unlock_irqrestore(&up->port.lock, flags); - - return ret; -} - -static unsigned int serial_pxa_get_mctrl(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned char status; - unsigned int ret; - - status = serial_in(up, UART_MSR); - - ret = 0; - if (status & UART_MSR_DCD) - ret |= TIOCM_CAR; - if (status & UART_MSR_RI) - ret |= TIOCM_RNG; - if (status & UART_MSR_DSR) - ret |= TIOCM_DSR; - if (status & UART_MSR_CTS) - ret |= TIOCM_CTS; - return ret; -} - -static void serial_pxa_set_mctrl(struct uart_port *port, unsigned int mctrl) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned char mcr = 0; - - if (mctrl & TIOCM_RTS) - mcr |= UART_MCR_RTS; - if (mctrl & TIOCM_DTR) - mcr |= UART_MCR_DTR; - if (mctrl & TIOCM_OUT1) - mcr |= UART_MCR_OUT1; - if (mctrl & TIOCM_OUT2) - mcr |= UART_MCR_OUT2; - if (mctrl & TIOCM_LOOP) - mcr |= UART_MCR_LOOP; - - mcr |= up->mcr; - - serial_out(up, UART_MCR, mcr); -} - -static void serial_pxa_break_ctl(struct uart_port *port, int break_state) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned long flags; - - spin_lock_irqsave(&up->port.lock, flags); - if (break_state == -1) - up->lcr |= UART_LCR_SBC; - else - up->lcr &= ~UART_LCR_SBC; - serial_out(up, UART_LCR, up->lcr); - spin_unlock_irqrestore(&up->port.lock, flags); -} - -static int serial_pxa_startup(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned long flags; - int retval; - - if (port->line == 3) /* HWUART */ - up->mcr |= UART_MCR_AFE; - else - up->mcr = 0; - - up->port.uartclk = clk_get_rate(up->clk); - - /* - * Allocate the IRQ - */ - retval = request_irq(up->port.irq, serial_pxa_irq, 0, up->name, up); - if (retval) - return retval; - - /* - * Clear the FIFO buffers and disable them. - * (they will be reenabled in set_termios()) - */ - serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO); - serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO | - UART_FCR_CLEAR_RCVR | UART_FCR_CLEAR_XMIT); - serial_out(up, UART_FCR, 0); - - /* - * Clear the interrupt registers. - */ - (void) serial_in(up, UART_LSR); - (void) serial_in(up, UART_RX); - (void) serial_in(up, UART_IIR); - (void) serial_in(up, UART_MSR); - - /* - * Now, initialize the UART - */ - serial_out(up, UART_LCR, UART_LCR_WLEN8); - - spin_lock_irqsave(&up->port.lock, flags); - up->port.mctrl |= TIOCM_OUT2; - serial_pxa_set_mctrl(&up->port, up->port.mctrl); - spin_unlock_irqrestore(&up->port.lock, flags); - - /* - * Finally, enable interrupts. Note: Modem status interrupts - * are set via set_termios(), which will be occurring imminently - * anyway, so we don't enable them here. - */ - up->ier = UART_IER_RLSI | UART_IER_RDI | UART_IER_RTOIE | UART_IER_UUE; - serial_out(up, UART_IER, up->ier); - - /* - * And clear the interrupt registers again for luck. - */ - (void) serial_in(up, UART_LSR); - (void) serial_in(up, UART_RX); - (void) serial_in(up, UART_IIR); - (void) serial_in(up, UART_MSR); - - return 0; -} - -static void serial_pxa_shutdown(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned long flags; - - free_irq(up->port.irq, up); - - /* - * Disable interrupts from this port - */ - up->ier = 0; - serial_out(up, UART_IER, 0); - - spin_lock_irqsave(&up->port.lock, flags); - up->port.mctrl &= ~TIOCM_OUT2; - serial_pxa_set_mctrl(&up->port, up->port.mctrl); - spin_unlock_irqrestore(&up->port.lock, flags); - - /* - * Disable break condition and FIFOs - */ - serial_out(up, UART_LCR, serial_in(up, UART_LCR) & ~UART_LCR_SBC); - serial_out(up, UART_FCR, UART_FCR_ENABLE_FIFO | - UART_FCR_CLEAR_RCVR | - UART_FCR_CLEAR_XMIT); - serial_out(up, UART_FCR, 0); -} - -static void -serial_pxa_set_termios(struct uart_port *port, struct ktermios *termios, - struct ktermios *old) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned char cval, fcr = 0; - unsigned long flags; - unsigned int baud, quot; - unsigned int dll; - - switch (termios->c_cflag & CSIZE) { - case CS5: - cval = UART_LCR_WLEN5; - break; - case CS6: - cval = UART_LCR_WLEN6; - break; - case CS7: - cval = UART_LCR_WLEN7; - break; - default: - case CS8: - cval = UART_LCR_WLEN8; - break; - } - - if (termios->c_cflag & CSTOPB) - cval |= UART_LCR_STOP; - if (termios->c_cflag & PARENB) - cval |= UART_LCR_PARITY; - if (!(termios->c_cflag & PARODD)) - cval |= UART_LCR_EPAR; - - /* - * Ask the core to calculate the divisor for us. - */ - baud = uart_get_baud_rate(port, termios, old, 0, port->uartclk/16); - quot = uart_get_divisor(port, baud); - - if ((up->port.uartclk / quot) < (2400 * 16)) - fcr = UART_FCR_ENABLE_FIFO | UART_FCR_PXAR1; - else if ((up->port.uartclk / quot) < (230400 * 16)) - fcr = UART_FCR_ENABLE_FIFO | UART_FCR_PXAR8; - else - fcr = UART_FCR_ENABLE_FIFO | UART_FCR_PXAR32; - - /* - * Ok, we're now changing the port state. Do it with - * interrupts disabled. - */ - spin_lock_irqsave(&up->port.lock, flags); - - /* - * Ensure the port will be enabled. - * This is required especially for serial console. - */ - up->ier |= UART_IER_UUE; - - /* - * Update the per-port timeout. - */ - uart_update_timeout(port, termios->c_cflag, baud); - - up->port.read_status_mask = UART_LSR_OE | UART_LSR_THRE | UART_LSR_DR; - if (termios->c_iflag & INPCK) - up->port.read_status_mask |= UART_LSR_FE | UART_LSR_PE; - if (termios->c_iflag & (IGNBRK | BRKINT | PARMRK)) - up->port.read_status_mask |= UART_LSR_BI; - - /* - * Characters to ignore - */ - up->port.ignore_status_mask = 0; - if (termios->c_iflag & IGNPAR) - up->port.ignore_status_mask |= UART_LSR_PE | UART_LSR_FE; - if (termios->c_iflag & IGNBRK) { - up->port.ignore_status_mask |= UART_LSR_BI; - /* - * If we're ignoring parity and break indicators, - * ignore overruns too (for real raw support). - */ - if (termios->c_iflag & IGNPAR) - up->port.ignore_status_mask |= UART_LSR_OE; - } - - /* - * ignore all characters if CREAD is not set - */ - if ((termios->c_cflag & CREAD) == 0) - up->port.ignore_status_mask |= UART_LSR_DR; - - /* - * CTS flow control flag and modem status interrupts - */ - up->ier &= ~UART_IER_MSI; - if (UART_ENABLE_MS(&up->port, termios->c_cflag)) - up->ier |= UART_IER_MSI; - - serial_out(up, UART_IER, up->ier); - - if (termios->c_cflag & CRTSCTS) - up->mcr |= UART_MCR_AFE; - else - up->mcr &= ~UART_MCR_AFE; - - serial_out(up, UART_LCR, cval | UART_LCR_DLAB); /* set DLAB */ - serial_out(up, UART_DLL, quot & 0xff); /* LS of divisor */ - - /* - * work around Errata #75 according to Intel(R) PXA27x Processor Family - * Specification Update (Nov 2005) - */ - dll = serial_in(up, UART_DLL); - WARN_ON(dll != (quot & 0xff)); - - serial_out(up, UART_DLM, quot >> 8); /* MS of divisor */ - serial_out(up, UART_LCR, cval); /* reset DLAB */ - up->lcr = cval; /* Save LCR */ - serial_pxa_set_mctrl(&up->port, up->port.mctrl); - serial_out(up, UART_FCR, fcr); - spin_unlock_irqrestore(&up->port.lock, flags); -} - -static void -serial_pxa_pm(struct uart_port *port, unsigned int state, - unsigned int oldstate) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - if (!state) - clk_prepare_enable(up->clk); - else - clk_disable_unprepare(up->clk); -} - -static void serial_pxa_release_port(struct uart_port *port) -{ -} - -static int serial_pxa_request_port(struct uart_port *port) -{ - return 0; -} - -static void serial_pxa_config_port(struct uart_port *port, int flags) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - up->port.type = PORT_PXA; -} - -static int -serial_pxa_verify_port(struct uart_port *port, struct serial_struct *ser) -{ - /* we don't want the core code to modify any port params */ - return -EINVAL; -} - -static const char * -serial_pxa_type(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - return up->name; -} - -static struct uart_pxa_port *serial_pxa_ports[4]; -static struct uart_driver serial_pxa_reg; - -#ifdef CONFIG_SERIAL_PXA_CONSOLE - -#define BOTH_EMPTY (UART_LSR_TEMT | UART_LSR_THRE) - -/* - * Wait for transmitter & holding register to empty - */ -static inline void wait_for_xmitr(struct uart_pxa_port *up) -{ - unsigned int status, tmout = 10000; - - /* Wait up to 10ms for the character(s) to be sent. */ - do { - status = serial_in(up, UART_LSR); - - if (status & UART_LSR_BI) - up->lsr_break_flag = UART_LSR_BI; - - if (--tmout == 0) - break; - udelay(1); - } while ((status & BOTH_EMPTY) != BOTH_EMPTY); - - /* Wait up to 1s for flow control if necessary */ - if (up->port.flags & UPF_CONS_FLOW) { - tmout = 1000000; - while (--tmout && - ((serial_in(up, UART_MSR) & UART_MSR_CTS) == 0)) - udelay(1); - } -} - -static void serial_pxa_console_putchar(struct uart_port *port, int ch) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - wait_for_xmitr(up); - serial_out(up, UART_TX, ch); -} - -/* - * Print a string to the serial port trying not to disturb - * any possible real use of the port... - * - * The console_lock must be held when we get here. - */ -static void -serial_pxa_console_write(struct console *co, const char *s, unsigned int count) -{ - struct uart_pxa_port *up = serial_pxa_ports[co->index]; - unsigned int ier; - unsigned long flags; - int locked = 1; - - clk_enable(up->clk); - local_irq_save(flags); - if (up->port.sysrq) - locked = 0; - else if (oops_in_progress) - locked = spin_trylock(&up->port.lock); - else - spin_lock(&up->port.lock); - - /* - * First save the IER then disable the interrupts - */ - ier = serial_in(up, UART_IER); - serial_out(up, UART_IER, UART_IER_UUE); - - uart_console_write(&up->port, s, count, serial_pxa_console_putchar); - - /* - * Finally, wait for transmitter to become empty - * and restore the IER - */ - wait_for_xmitr(up); - serial_out(up, UART_IER, ier); - - if (locked) - spin_unlock(&up->port.lock); - local_irq_restore(flags); - clk_disable(up->clk); - -} - -#ifdef CONFIG_CONSOLE_POLL -/* - * Console polling routines for writing and reading from the uart while - * in an interrupt or debug context. - */ - -static int serial_pxa_get_poll_char(struct uart_port *port) -{ - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - unsigned char lsr = serial_in(up, UART_LSR); - - while (!(lsr & UART_LSR_DR)) - lsr = serial_in(up, UART_LSR); - - return serial_in(up, UART_RX); -} - - -static void serial_pxa_put_poll_char(struct uart_port *port, - unsigned char c) -{ - unsigned int ier; - struct uart_pxa_port *up = (struct uart_pxa_port *)port; - - /* - * First save the IER then disable the interrupts - */ - ier = serial_in(up, UART_IER); - serial_out(up, UART_IER, UART_IER_UUE); - - wait_for_xmitr(up); - /* - * Send the character out. - */ - serial_out(up, UART_TX, c); - - /* - * Finally, wait for transmitter to become empty - * and restore the IER - */ - wait_for_xmitr(up); - serial_out(up, UART_IER, ier); -} - -#endif /* CONFIG_CONSOLE_POLL */ - -static int __init -serial_pxa_console_setup(struct console *co, char *options) -{ - struct uart_pxa_port *up; - int baud = 9600; - int bits = 8; - int parity = 'n'; - int flow = 'n'; - - if (co->index == -1 || co->index >= serial_pxa_reg.nr) - co->index = 0; - up = serial_pxa_ports[co->index]; - if (!up) - return -ENODEV; - - if (options) - uart_parse_options(options, &baud, &parity, &bits, &flow); - - return uart_set_options(&up->port, co, baud, parity, bits, flow); -} - -static struct console serial_pxa_console = { - .name = "ttyS", - .write = serial_pxa_console_write, - .device = uart_console_device, - .setup = serial_pxa_console_setup, - .flags = CON_PRINTBUFFER, - .index = -1, - .data = &serial_pxa_reg, -}; - -#define PXA_CONSOLE &serial_pxa_console -#else -#define PXA_CONSOLE NULL -#endif - -static struct uart_ops serial_pxa_pops = { - .tx_empty = serial_pxa_tx_empty, - .set_mctrl = serial_pxa_set_mctrl, - .get_mctrl = serial_pxa_get_mctrl, - .stop_tx = serial_pxa_stop_tx, - .start_tx = serial_pxa_start_tx, - .stop_rx = serial_pxa_stop_rx, - .enable_ms = serial_pxa_enable_ms, - .break_ctl = serial_pxa_break_ctl, - .startup = serial_pxa_startup, - .shutdown = serial_pxa_shutdown, - .set_termios = serial_pxa_set_termios, - .pm = serial_pxa_pm, - .type = serial_pxa_type, - .release_port = serial_pxa_release_port, - .request_port = serial_pxa_request_port, - .config_port = serial_pxa_config_port, - .verify_port = serial_pxa_verify_port, -#if defined(CONFIG_CONSOLE_POLL) && defined(CONFIG_SERIAL_PXA_CONSOLE) - .poll_get_char = serial_pxa_get_poll_char, - .poll_put_char = serial_pxa_put_poll_char, -#endif -}; - -static struct uart_driver serial_pxa_reg = { - .owner = THIS_MODULE, - .driver_name = "PXA serial", - .dev_name = "ttyS", - .major = TTY_MAJOR, - .minor = 64, - .nr = 4, - .cons = PXA_CONSOLE, -}; - -#ifdef CONFIG_PM -static int serial_pxa_suspend(struct device *dev) -{ - struct uart_pxa_port *sport = dev_get_drvdata(dev); - - if (sport) - uart_suspend_port(&serial_pxa_reg, &sport->port); - - return 0; -} - -static int serial_pxa_resume(struct device *dev) -{ - struct uart_pxa_port *sport = dev_get_drvdata(dev); - - if (sport) - uart_resume_port(&serial_pxa_reg, &sport->port); - - return 0; -} - -static const struct dev_pm_ops serial_pxa_pm_ops = { - .suspend = serial_pxa_suspend, - .resume = serial_pxa_resume, -}; -#endif - -static const struct of_device_id serial_pxa_dt_ids[] = { - { .compatible = "mrvl,pxa-uart", }, - { .compatible = "mrvl,mmp-uart", }, - {} -}; -MODULE_DEVICE_TABLE(of, serial_pxa_dt_ids); - -static int serial_pxa_probe_dt(struct platform_device *pdev, - struct uart_pxa_port *sport) -{ - struct device_node *np = pdev->dev.of_node; - int ret; - - if (!np) - return 1; - - ret = of_alias_get_id(np, "serial"); - if (ret < 0) { - dev_err(&pdev->dev, "failed to get alias id, errno %d\n", ret); - return ret; - } - sport->port.line = ret; - return 0; -} - -static int serial_pxa_probe(struct platform_device *dev) -{ - struct uart_pxa_port *sport; - struct resource *mmres, *irqres; - int ret; - - mmres = platform_get_resource(dev, IORESOURCE_MEM, 0); - irqres = platform_get_resource(dev, IORESOURCE_IRQ, 0); - if (!mmres || !irqres) - return -ENODEV; - - sport = kzalloc(sizeof(struct uart_pxa_port), GFP_KERNEL); - if (!sport) - return -ENOMEM; - - sport->clk = clk_get(&dev->dev, NULL); - if (IS_ERR(sport->clk)) { - ret = PTR_ERR(sport->clk); - goto err_free; - } - - ret = clk_prepare(sport->clk); - if (ret) { - clk_put(sport->clk); - goto err_free; - } - - sport->port.type = PORT_PXA; - sport->port.iotype = UPIO_MEM; - sport->port.mapbase = mmres->start; - sport->port.irq = irqres->start; - sport->port.fifosize = 64; - sport->port.ops = &serial_pxa_pops; - sport->port.dev = &dev->dev; - sport->port.flags = UPF_IOREMAP | UPF_BOOT_AUTOCONF; - sport->port.uartclk = clk_get_rate(sport->clk); - - ret = serial_pxa_probe_dt(dev, sport); - if (ret > 0) - sport->port.line = dev->id; - else if (ret < 0) - goto err_clk; - snprintf(sport->name, PXA_NAME_LEN - 1, "UART%d", sport->port.line + 1); - - sport->port.membase = ioremap(mmres->start, resource_size(mmres)); - if (!sport->port.membase) { - ret = -ENOMEM; - goto err_clk; - } - - serial_pxa_ports[sport->port.line] = sport; - - uart_add_one_port(&serial_pxa_reg, &sport->port); - platform_set_drvdata(dev, sport); - - return 0; - - err_clk: - clk_unprepare(sport->clk); - clk_put(sport->clk); - err_free: - kfree(sport); - return ret; -} - -static int serial_pxa_remove(struct platform_device *dev) -{ - struct uart_pxa_port *sport = platform_get_drvdata(dev); - - uart_remove_one_port(&serial_pxa_reg, &sport->port); - - clk_unprepare(sport->clk); - clk_put(sport->clk); - kfree(sport); - - return 0; -} - -static struct platform_driver serial_pxa_driver = { - .probe = serial_pxa_probe, - .remove = serial_pxa_remove, - - .driver = { - .name = "pxa2xx-uart", -#ifdef CONFIG_PM - .pm = &serial_pxa_pm_ops, -#endif - .of_match_table = serial_pxa_dt_ids, - }, -}; - -static int __init serial_pxa_init(void) -{ - int ret; - - ret = uart_register_driver(&serial_pxa_reg); - if (ret != 0) - return ret; - - ret = platform_driver_register(&serial_pxa_driver); - if (ret != 0) - uart_unregister_driver(&serial_pxa_reg); - - return ret; -} - -static void __exit serial_pxa_exit(void) -{ - platform_driver_unregister(&serial_pxa_driver); - uart_unregister_driver(&serial_pxa_reg); -} - -module_init(serial_pxa_init); -module_exit(serial_pxa_exit); - -MODULE_LICENSE("GPL"); -MODULE_ALIAS("platform:pxa2xx-uart"); -- 2.6.2 ^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [PATCH v4 1/2] serial: rewrite pxa2xx-uart to use 8250_core 2015-12-09 22:28 ` [PATCH v4 1/2] " Sergei Ianovich @ 2015-12-19 12:45 ` Robert Jarzmik 2015-12-19 13:26 ` Robert Jarzmik 2015-12-23 18:59 ` [PATCH v5] " Sergei Ianovich 1 sibling, 1 reply; 31+ messages in thread From: Robert Jarzmik @ 2015-12-19 12:45 UTC (permalink / raw) To: Sergei Ianovich Cc: linux-kernel, Russell King, Greg Kroah-Hartman, Jiri Slaby, Heikki Krogerus, James Cameron, Alexandre Belloni, Rob Herring, Ulf Hansson, Rafael J. Wysocki, Kevin Hilman, Andy Shevchenko, Arnd Bergmann, Paul Gortmaker, Scott Wood, Sebastian Andrzej Siewior, Paul Burton, Joachim Eastwood, Mans Rullgard, Masahiro Yamada, Peter Hurley, linux-arm-k Sergei Ianovich <ynvich@gmail.com> writes: > pxa2xx-uart was a separate uart platform driver. It was declaring > the same device names and numbers as 8250 driver. As a result, > it was impossible to use 8250 driver on PXA SoCs. > > Upon closer examination pxa2xx-uart turned out to be a clone of > 8250_core driver. > > Workaround for Erratum #19 according to Marvel(R) PXA270M Processor > Specification Update (April 19, 2010) is dropped. 8250_core reads > from FIFO immediately after checking DR bit in LSR. > > Signed-off-by: Sergei Ianovich <ynvich@gmail.com> > Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > Reviewed-by: James Cameron <quozl@laptop.org> > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> I was wondering if this should go through pxa tree, or through serial tree ? Cheers. -- Robert ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v4 1/2] serial: rewrite pxa2xx-uart to use 8250_core 2015-12-19 12:45 ` Robert Jarzmik @ 2015-12-19 13:26 ` Robert Jarzmik 2015-12-19 18:46 ` Sergei Ianovich 0 siblings, 1 reply; 31+ messages in thread From: Robert Jarzmik @ 2015-12-19 13:26 UTC (permalink / raw) To: Sergei Ianovich Cc: linux-kernel, Kevin Hilman, Arnd Bergmann, moderated list:ARM PORT, open list:SERIAL DRIVERS Robert Jarzmik <robert.jarzmik@free.fr> writes: > Sergei Ianovich <ynvich@gmail.com> writes: > >> pxa2xx-uart was a separate uart platform driver. It was declaring >> the same device names and numbers as 8250 driver. As a result, >> it was impossible to use 8250 driver on PXA SoCs. >> >> Upon closer examination pxa2xx-uart turned out to be a clone of >> 8250_core driver. >> >> Workaround for Erratum #19 according to Marvel(R) PXA270M Processor >> Specification Update (April 19, 2010) is dropped. 8250_core reads >> from FIFO immediately after checking DR bit in LSR. >> >> Signed-off-by: Sergei Ianovich <ynvich@gmail.com> >> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> >> Reviewed-by: James Cameron <quozl@laptop.org> >> Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> Shrunk the list, the following is rather mach-pxa specific. Actually there is a small glitch ... Have a look at arch/arm/mach-pxa/viper.c, line 490: #ifndef CONFIG_SERIAL_PXA ... But that can be handled in an subsequent patch to keep your acks and reviews. Cheers. -- Robert ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v4 1/2] serial: rewrite pxa2xx-uart to use 8250_core 2015-12-19 13:26 ` Robert Jarzmik @ 2015-12-19 18:46 ` Sergei Ianovich 2015-12-19 19:31 ` Robert Jarzmik 0 siblings, 1 reply; 31+ messages in thread From: Sergei Ianovich @ 2015-12-19 18:46 UTC (permalink / raw) To: Robert Jarzmik Cc: linux-kernel, Kevin Hilman, Arnd Bergmann, moderated list:ARM PORT, open list:SERIAL DRIVERS On Sat, 2015-12-19 at 14:26 +0100, Robert Jarzmik wrote: > Robert Jarzmik <robert.jarzmik@free.fr> writes: > > > Sergei Ianovich <ynvich@gmail.com> writes: > > > > > pxa2xx-uart was a separate uart platform driver. It was declaring > > > the same device names and numbers as 8250 driver. As a result, > > > it was impossible to use 8250 driver on PXA SoCs. > > > > > > Upon closer examination pxa2xx-uart turned out to be a clone of > > > 8250_core driver. > > > > > > Workaround for Erratum #19 according to Marvel(R) PXA270M > > > Processor > > > Specification Update (April 19, 2010) is dropped. 8250_core reads > > > from FIFO immediately after checking DR bit in LSR. > > > > > > Signed-off-by: Sergei Ianovich <ynvich@gmail.com> > > > Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > > > Reviewed-by: James Cameron <quozl@laptop.org> > > > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> > > Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> > > Shrunk the list, the following is rather mach-pxa specific. > > Actually there is a small glitch ... > Have a look at arch/arm/mach-pxa/viper.c, line 490: > #ifndef CONFIG_SERIAL_PXA > ... Thanks for spotting this. This is caused by a change in the latest version of the patch (SERIAL_8250_PXA instead of SERIAL_PXA). This change could be reverted. > But that can be handled in an subsequent patch to keep your acks and > reviews. > I will respin the patch. Please comment on the acks and reviews. They were made at an earlier version of the patch. That version no longer applies. Can the updated version carry on the flags? ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v4 1/2] serial: rewrite pxa2xx-uart to use 8250_core 2015-12-19 18:46 ` Sergei Ianovich @ 2015-12-19 19:31 ` Robert Jarzmik 2015-12-19 20:12 ` Sergei Ianovich 0 siblings, 1 reply; 31+ messages in thread From: Robert Jarzmik @ 2015-12-19 19:31 UTC (permalink / raw) To: Sergei Ianovich Cc: linux-kernel, Kevin Hilman, Arnd Bergmann, moderated list:ARM PORT, open list:SERIAL DRIVERS Sergei Ianovich <ynvich@gmail.com> writes: > On Sat, 2015-12-19 at 14:26 +0100, Robert Jarzmik wrote: >> Robert Jarzmik <robert.jarzmik@free.fr> writes: >> >> > Sergei Ianovich <ynvich@gmail.com> writes: >> > >> > > pxa2xx-uart was a separate uart platform driver. It was declaring >> > > the same device names and numbers as 8250 driver. As a result, >> > > it was impossible to use 8250 driver on PXA SoCs. >> > > >> > > Upon closer examination pxa2xx-uart turned out to be a clone of >> > > 8250_core driver. >> > > >> > > Workaround for Erratum #19 according to Marvel(R) PXA270M >> > > Processor >> > > Specification Update (April 19, 2010) is dropped. 8250_core reads >> > > from FIFO immediately after checking DR bit in LSR. >> > > >> > > Signed-off-by: Sergei Ianovich <ynvich@gmail.com> >> > > Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> >> > > Reviewed-by: James Cameron <quozl@laptop.org> >> > > Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> >> > Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> >> >> Shrunk the list, the following is rather mach-pxa specific. >> >> Actually there is a small glitch ... >> Have a look at arch/arm/mach-pxa/viper.c, line 490: >> #ifndef CONFIG_SERIAL_PXA >> ... > > Thanks for spotting this. This is caused by a change in the latest > version of the patch (SERIAL_8250_PXA instead of SERIAL_PXA). This > change could be reverted. Actually I'm against the revert. The name change looks very good to me, please keep it. >> But that can be handled in an subsequent patch to keep your acks and >> reviews. > I will respin the patch. Please comment on the acks and reviews. They > were made at an earlier version of the patch. That version no longer > applies. Can the updated version carry on the flags? I don't get you. If you mean keeping CONFIG_SERIAL_8250_PXA, then yes, please keep it. Cheers. -- Robert ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v4 1/2] serial: rewrite pxa2xx-uart to use 8250_core 2015-12-19 19:31 ` Robert Jarzmik @ 2015-12-19 20:12 ` Sergei Ianovich 2015-12-19 23:12 ` Robert Jarzmik 0 siblings, 1 reply; 31+ messages in thread From: Sergei Ianovich @ 2015-12-19 20:12 UTC (permalink / raw) To: Robert Jarzmik Cc: linux-kernel, Kevin Hilman, Arnd Bergmann, moderated list:ARM PORT, open list:SERIAL DRIVERS On Sat, 2015-12-19 at 20:31 +0100, Robert Jarzmik wrote: > Sergei Ianovich <ynvich@gmail.com> writes: > Thanks for spotting this. This is caused by a change in the latest > > version of the patch (SERIAL_8250_PXA instead of SERIAL_PXA). This > > change could be reverted. > Actually I'm against the revert. > The name change looks very good to me, please keep it. Is it worth adding an error if CONFIG_SERIAL_PXA is defined? Or is there any other way of preventing this patch launching Linus' "flag days" as Russel King named it? I understand that people are afraid of taking this patch. If it starts causing troubles at runtime, it will be difficult to diagnose. There will be no console for most people. So it is probably good idea to fail at boot time. > > > But that can be handled in an subsequent patch to keep your acks > > > and > > > reviews. > > I will respin the patch. Please comment on the acks and reviews. > > They > > were made at an earlier version of the patch. That version no longer > > applies. Can the updated version carry on the flags? > I don't get you. If you mean keeping CONFIG_SERIAL_8250_PXA, then yes, > please > keep it. I mean should the patch be re-revied and re-acked? ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v4 1/2] serial: rewrite pxa2xx-uart to use 8250_core 2015-12-19 20:12 ` Sergei Ianovich @ 2015-12-19 23:12 ` Robert Jarzmik 2015-12-20 11:24 ` Sergei Ianovich 0 siblings, 1 reply; 31+ messages in thread From: Robert Jarzmik @ 2015-12-19 23:12 UTC (permalink / raw) To: Sergei Ianovich, Kevin Hilman, Arnd Bergmann Cc: linux-kernel, moderated list:ARM PORT, open list:SERIAL DRIVERS Sergei Ianovich <ynvich@gmail.com> writes: > On Sat, 2015-12-19 at 20:31 +0100, Robert Jarzmik wrote: >> Sergei Ianovich <ynvich@gmail.com> writes: >> Thanks for spotting this. This is caused by a change in the latest >> > version of the patch (SERIAL_8250_PXA instead of SERIAL_PXA). This >> > change could be reverted. >> Actually I'm against the revert. >> The name change looks very good to me, please keep it. > > Is it worth adding an error if CONFIG_SERIAL_PXA is defined? I don't think so. > Or is there any other way of preventing this patch launching Linus' "flag > days" as Russel King named it? I must think about it, and test a bit more. Ah and a small hint : if you include back Russell in the conversation, don't forget the double "ll" if you wish him to answer. > I understand that people are afraid of taking this patch. If it starts > causing troubles at runtime, it will be difficult to diagnose. There > will be no console for most people. So it is probably good idea to fail > at boot time. Who are "the people" ? If it's about something already written in a mailing list, please point me to it so that it can help me think about it. >> > > But that can be handled in an subsequent patch to keep your acks >> > > and >> > > reviews. >> > I will respin the patch. Please comment on the acks and reviews. >> > They >> > were made at an earlier version of the patch. That version no longer >> > applies. Can the updated version carry on the flags? >> I don't get you. If you mean keeping CONFIG_SERIAL_8250_PXA, then yes, >> please >> keep it. > > I mean should the patch be re-revied and re-acked? Well it depends on what was since then. If it's a trivial commit message fix or a typo, I don't think it's necessary. If it's the algorithm, the code logic, or even I think you should ask again. For a name change in CONFIG_SERIAL_PXA into CONFIG_SERIAL_8250_PXA (change from v3 to v4), I must admit I don't know. Maybe Kevin or Arnd might give a clue. Cheers. -- Robert ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v4 1/2] serial: rewrite pxa2xx-uart to use 8250_core 2015-12-19 23:12 ` Robert Jarzmik @ 2015-12-20 11:24 ` Sergei Ianovich 2015-12-22 19:27 ` Robert Jarzmik 0 siblings, 1 reply; 31+ messages in thread From: Sergei Ianovich @ 2015-12-20 11:24 UTC (permalink / raw) To: Robert Jarzmik, Kevin Hilman, Arnd Bergmann Cc: Greg Kroah-Hartman, Russell King - ARM Linux, linux-kernel, moderated list:ARM PORT, open list:SERIAL DRIVERS On Sun, 2015-12-20 at 00:12 +0100, Robert Jarzmik wrote: > Sergei Ianovich <ynvich@gmail.com> writes: > > > On Sat, 2015-12-19 at 20:31 +0100, Robert Jarzmik wrote: > > > Sergei Ianovich <ynvich@gmail.com> writes: > > > Thanks for spotting this. This is caused by a change in the latest > > > > version of the patch (SERIAL_8250_PXA instead of SERIAL_PXA). > > > > This > > > > change could be reverted. > > > Actually I'm against the revert. > > > The name change looks very good to me, please keep it. > > > > Is it worth adding an error if CONFIG_SERIAL_PXA is defined? > I don't think so. ... > > > I understand that people are afraid of taking this patch. If it > > starts > > causing troubles at runtime, it will be difficult to diagnose. There > > will be no console for most people. So it is probably good idea to > > fail > > at boot time. > Who are "the people" ? I think "the people" are at least Greg Kroah-Hartman and Russell King. > If it's about something already written in a mailing > list, please point me to it so that it can help me think about it. http://lists.infradead.org/pipermail/linux-arm-kernel/2013-December/2167 73.html I can explain why I think so. Greg acked the patch, but hasn't merged it since then. He has good reasons for this most probably. Russell's comment pointed by the link seems to be the reason. I think the problem raised by Russell could be addressed. My best guess is compile time error, despite your comment above. I have one more plan. For transition period, we can introduce a temporary Kconfig option SERIAL_8250_PXA_OFF, and fail at build time if neither SERIAL_8250_PXA nor SERIAL_8250_PXA_OFF is set. This way all interested parties will be notified of this driver update. ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v4 1/2] serial: rewrite pxa2xx-uart to use 8250_core 2015-12-20 11:24 ` Sergei Ianovich @ 2015-12-22 19:27 ` Robert Jarzmik 0 siblings, 0 replies; 31+ messages in thread From: Robert Jarzmik @ 2015-12-22 19:27 UTC (permalink / raw) To: Sergei Ianovich, Russell King - ARM Linux, Greg Kroah-Hartman Cc: Kevin Hilman, Arnd Bergmann, linux-kernel, moderated list:ARM PORT, open list:SERIAL DRIVERS Sergei Ianovich <ynvich@gmail.com> writes: > On Sun, 2015-12-20 at 00:12 +0100, Robert Jarzmik wrote: >> Sergei Ianovich <ynvich@gmail.com> writes: >> >> > On Sat, 2015-12-19 at 20:31 +0100, Robert Jarzmik wrote: >> > I understand that people are afraid of taking this patch. If it >> > starts >> > causing troubles at runtime, it will be difficult to diagnose. There >> > will be no console for most people. So it is probably good idea to >> > fail >> > at boot time. >> If it's about something already written in a mailing >> list, please point me to it so that it can help me think about it. > > http://lists.infradead.org/pipermail/linux-arm-kernel/2013-December/2167 > 73.html > > I can explain why I think so. Greg acked the patch, but hasn't merged it > since then. He has good reasons for this most probably. Russell's > comment pointed by the link seems to be the reason. > I think the problem raised by Russell could be addressed. My best guess > is compile time error, despite your comment above. I re-read carefully Russell's answer in [1]. What Russell asked is that for a period of time, the old pxa serial code and the new will be in the kernel, so that maintainers have the option to switch over to the old drivers/tty/serial/pxa.c if the new 8250 based version breaks their userspace getty. Then, once the transition is done, and that for a period (let's say 1 year) no maintainer had complained while its defconfig was switched over to the new 8520 version, then and only then you will remove drivers/tty/serial/pxa.c. > I have one more plan. For transition period, we can introduce a > temporary Kconfig option SERIAL_8250_PXA_OFF, and fail at build time if > neither SERIAL_8250_PXA nor SERIAL_8250_PXA_OFF is set. This way all > interested parties will be notified of this driver update. No, I'd like to stick with Russell's original plan : - phase 1: both SERIAL_8250_PXA and SERIAL_PXA exist in KConfig both are selectable This lasts one year or something like that - phase 2: remove SERIAL_PXA from KConfig and drivers/tty/serial/pxa.c This means a different patch from the one acked by Greg, and a new serie of acks. The diffstat will be way worse (as you won't have the -970 for pxa.c), but in the end it will end up on that -970. That sounds like a good transition plan to me. Cheers. -- Robert [1] http://lists.infradead.org/pipermail/linux-arm-kernel/2013-December/216773.html ^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH v5] serial: rewrite pxa2xx-uart to use 8250_core 2015-12-09 22:28 ` [PATCH v4 1/2] " Sergei Ianovich 2015-12-19 12:45 ` Robert Jarzmik @ 2015-12-23 18:59 ` Sergei Ianovich 2015-12-23 22:50 ` kbuild test robot 2015-12-24 15:15 ` [PATCH v6] " Sergei Ianovich 1 sibling, 2 replies; 31+ messages in thread From: Sergei Ianovich @ 2015-12-23 18:59 UTC (permalink / raw) To: linux-kernel Cc: Sergei Ianovich, Heikki Krogerus, James Cameron, Greg Kroah-Hartman, Robert Jarzmik, Russell King, Jiri Slaby, Andy Shevchenko, Arnd Bergmann, Joachim Eastwood, Paul Burton, Mans Rullgard, Scott Wood, Sebastian Andrzej Siewior, Paul Gortmaker, Matthias Brugger, Peter Hurley, open list:SERIAL DRIVERS pxa2xx-uart was a separate uart platform driver. It was declaring the same device names and numbers as 8250 driver. As a result, it was impossible to use 8250 driver on PXA SoCs. Upon closer examination pxa2xx-uart turned out to be a clone of 8250_core driver. Workaround for Erratum #19 according to Marvel(R) PXA270M Processor Specification Update (April 19, 2010) is dropped. 8250_core reads from FIFO immediately after checking DR bit in LSR. The patch leaves the original SERIAL_PXA driver around. The original driver is just marked DEPRECATED in Kconfig and C source. When the original driver is considered safe to remove, no changes to SERIAL_8250 will be necessary. Compiling SERIAL_8250_CONSOLE and SERIAL_PXA_CONSOLE even without SERIAL_8250_PXA breaks console for SERIAL_PXA. For this reasons, the new and the original drivers are made mutually exclusive. Signed-off-by: Sergei Ianovich <ynvich@gmail.com> CC: Heikki Krogerus <heikki.krogerus@linux.intel.com> CC: James Cameron <quozl@laptop.org> CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org> CC: Robert Jarzmik <robert.jarzmik@free.fr> CC: Russell King <linux@arm.linux.org.uk> The patch was reviewed/acked at version 3. Changes in version 4 are simple unbitrotting. Changes in version 5 require re-review according to Robert Jarzmik comment. changes v4..v5 as suggested by Robert Jarzmik * keep pxa.c until it is considered safe to remove * keep SERIAL_PXA and SERIAL_PXA_CONSOLE Kconfig options, but deprecate them * allow selection of either the new or the original driver by Kconfig * ensure SERIAL_PXA_CONSOLE is respected with either driver changes v3..v4 * remove owner field from platform_driver structure * make of_device_id structure constant * use CONFIG_SERIAL_8250_PXA instead of CONFIG_SERIAL_PXA changes v2..v3 * remove devm_free/put as suggested by Heikki Krogerus * use SET_SYSTEM_SLEEP_PM_OPS macro to set pm ops as suggested by Heikki Krogerus changes v1..v2 * actually implement workaround for E74 in dl_write as spooted by James Cameron * added comment about E19 in commit message --- drivers/tty/serial/8250/8250_pxa.c | 177 +++++++++++++++++++++++++++++++++++++ drivers/tty/serial/8250/Kconfig | 8 ++ drivers/tty/serial/8250/Makefile | 1 + drivers/tty/serial/Kconfig | 17 +++- drivers/tty/serial/Makefile | 2 +- drivers/tty/serial/pxa.c | 4 +- 6 files changed, 205 insertions(+), 4 deletions(-) create mode 100644 drivers/tty/serial/8250/8250_pxa.c diff --git a/drivers/tty/serial/8250/8250_pxa.c b/drivers/tty/serial/8250/8250_pxa.c new file mode 100644 index 0000000..6a14df0 --- /dev/null +++ b/drivers/tty/serial/8250/8250_pxa.c @@ -0,0 +1,177 @@ +/* + * drivers/tty/serial/8250/8250_pxa.c -- driver for PXA on-board UARTS + * Copyright: (C) 2013 Sergei Ianovich <ynvich@gmail.com> + * + * replaces drivers/serial/pxa.c by Nicolas Pitre + * Created: Feb 20, 2003 + * Copyright: (C) 2003 Monta Vista Software, Inc. + * + * Based on drivers/serial/8250.c by Russell King. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + +#include <linux/device.h> +#include <linux/init.h> +#include <linux/io.h> +#include <linux/module.h> +#include <linux/serial_8250.h> +#include <linux/serial_core.h> +#include <linux/serial_reg.h> +#include <linux/of.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/clk.h> +#include <linux/pm_runtime.h> + +#include "8250.h" + +struct pxa8250_data { + int line; + struct clk *clk; +}; + +#ifdef CONFIG_PM +static int serial_pxa_suspend(struct device *dev) +{ + struct pxa8250_data *data = dev_get_drvdata(dev); + + serial8250_suspend_port(data->line); + + return 0; +} + +static int serial_pxa_resume(struct device *dev) +{ + struct pxa8250_data *data = dev_get_drvdata(dev); + + serial8250_resume_port(data->line); + + return 0; +} +#endif + +static const struct dev_pm_ops serial_pxa_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(serial_pxa_suspend, serial_pxa_resume) +}; + +static const struct of_device_id serial_pxa_dt_ids[] = { + { .compatible = "mrvl,pxa-uart", }, + { .compatible = "mrvl,mmp-uart", }, + {} +}; +MODULE_DEVICE_TABLE(of, serial_pxa_dt_ids); + +/* Uart divisor latch write */ +static void serial_pxa_dl_write(struct uart_8250_port *up, int value) +{ + unsigned int dll; + + serial_out(up, UART_DLL, value & 0xff); + /* + * work around Erratum #74 according to Marvel(R) PXA270M Processor + * Specification Update (April 19, 2010) + */ + dll = serial_in(up, UART_DLL); + WARN_ON(dll != (value & 0xff)); + + serial_out(up, UART_DLM, value >> 8 & 0xff); +} + + +static void serial_pxa_pm(struct uart_port *port, unsigned int state, + unsigned int oldstate) +{ + struct pxa8250_data *data = port->private_data; + + if (!state) + clk_prepare_enable(data->clk); + else + clk_disable_unprepare(data->clk); +} + +static int serial_pxa_probe(struct platform_device *pdev) +{ + struct uart_8250_port uart = {}; + struct pxa8250_data *data; + struct resource *mmres, *irqres; + int ret; + + mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0); + irqres = platform_get_resource(pdev, IORESOURCE_IRQ, 0); + if (!mmres || !irqres) + return -ENODEV; + + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(data->clk)) + return PTR_ERR(data->clk); + + ret = clk_prepare(data->clk); + if (ret) + return ret; + + uart.port.type = PORT_XSCALE; + uart.port.iotype = UPIO_MEM32; + uart.port.mapbase = mmres->start; + uart.port.regshift = 2; + uart.port.irq = irqres->start; + uart.port.fifosize = 64; + uart.port.flags = UPF_IOREMAP | UPF_SKIP_TEST; + uart.port.dev = &pdev->dev; + uart.port.uartclk = clk_get_rate(data->clk); + uart.port.pm = serial_pxa_pm; + uart.port.private_data = data; + uart.dl_write = serial_pxa_dl_write; + + ret = serial8250_register_8250_port(&uart); + if (ret < 0) + goto err_clk; + + data->line = ret; + + platform_set_drvdata(pdev, data); + + return 0; + + err_clk: + clk_unprepare(data->clk); + return ret; +} + +static int serial_pxa_remove(struct platform_device *pdev) +{ + struct pxa8250_data *data = platform_get_drvdata(pdev); + + serial8250_unregister_port(data->line); + + clk_unprepare(data->clk); + + return 0; +} + +static struct platform_driver serial_pxa_driver = { + .probe = serial_pxa_probe, + .remove = serial_pxa_remove, + + .driver = { + .name = "pxa2xx-uart", + .pm = &serial_pxa_pm_ops, + .of_match_table = serial_pxa_dt_ids, + }, +}; + +module_platform_driver(serial_pxa_driver); + +MODULE_AUTHOR("Sergei Ianovich"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:pxa2xx-uart"); diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig index 6412f14..4dc45ff 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig @@ -378,3 +378,11 @@ config SERIAL_8250_MID Selecting this option will enable handling of the extra features present on the UART found on Intel Medfield SOC and various other Intel platforms. + +config SERIAL_8250_PXA + tristate "PXA serial port support" + depends on SERIAL_8250 + depends on ARCH_PXA || ARCH_MMP + help + If you have a machine based on an Intel XScale PXA2xx CPU you + can enable its onboard serial ports by enabling this option. diff --git a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Makefile index e177f86..7e54413 100644 --- a/drivers/tty/serial/8250/Makefile +++ b/drivers/tty/serial/8250/Makefile @@ -28,5 +28,6 @@ obj-$(CONFIG_SERIAL_8250_MT6577) += 8250_mtk.o obj-$(CONFIG_SERIAL_8250_UNIPHIER) += 8250_uniphier.o obj-$(CONFIG_SERIAL_8250_INGENIC) += 8250_ingenic.o obj-$(CONFIG_SERIAL_8250_MID) += 8250_mid.o +obj-$(CONFIG_SERIAL_8250_PXA) += 8250_pxa.o CFLAGS_8250_ingenic.o += -I$(srctree)/scripts/dtc/libfdt diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index f38beb2..e477ff5 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -436,17 +436,27 @@ config SERIAL_MPSC_CONSOLE Say Y here if you want to support a serial console on a Marvell MPSC. config SERIAL_PXA - bool "PXA serial port support" + bool "PXA serial port support (DEPRECATED)" depends on ARCH_PXA || ARCH_MMP select SERIAL_CORE + select SERIAL_8250_PXA if SERIAL_8250 + select SERIAL_PXA_NON8250 if !SERIAL_8250 help If you have a machine based on an Intel XScale PXA2xx CPU you can enable its onboard serial ports by enabling this option. + Unless you have a specific need, you should use SERIAL_8250_PXA + instead of this. + +config SERIAL_PXA_NON8250 + bool + depends on !SERIAL_8250 + config SERIAL_PXA_CONSOLE - bool "Console on PXA serial port" + bool "Console on PXA serial port (DEPRECATED)" depends on SERIAL_PXA select SERIAL_CORE_CONSOLE + select SERIAL_8250_CONSOLE if SERIAL_8250 help If you have enabled the serial port on the Intel XScale PXA CPU you can make it the console by answering Y to this option. @@ -458,6 +468,9 @@ config SERIAL_PXA_CONSOLE your boot loader (lilo or loadlin) about how to pass options to the kernel at boot time.) + Unless you have a specific need, you should use SERIAL_8250_PXA + and SERIAL_8250_CONSOLE instead of this. + config SERIAL_SA1100 bool "SA1100 serial port support" depends on ARCH_SA1100 diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile index 5ab4111..96741d5 100644 --- a/drivers/tty/serial/Makefile +++ b/drivers/tty/serial/Makefile @@ -23,7 +23,7 @@ obj-$(CONFIG_SERIAL_8250) += 8250/ obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o -obj-$(CONFIG_SERIAL_PXA) += pxa.o +obj-$(CONFIG_SERIAL_PXA_NON8250) += pxa.o obj-$(CONFIG_SERIAL_PNX8XXX) += pnx8xxx_uart.o obj-$(CONFIG_SERIAL_SA1100) += sa1100.o obj-$(CONFIG_SERIAL_BCM63XX) += bcm63xx_uart.o diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c index 9becba6..74aac45 100644 --- a/drivers/tty/serial/pxa.c +++ b/drivers/tty/serial/pxa.c @@ -940,7 +940,9 @@ static struct platform_driver serial_pxa_driver = { }, }; -static int __init serial_pxa_init(void) + +/* 8250 driver for PXA serial ports should be used */ +static int __deprecated __init serial_pxa_init(void) { int ret; -- 2.6.3 ^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [PATCH v5] serial: rewrite pxa2xx-uart to use 8250_core 2015-12-23 18:59 ` [PATCH v5] " Sergei Ianovich @ 2015-12-23 22:50 ` kbuild test robot 2015-12-24 15:15 ` [PATCH v6] " Sergei Ianovich 1 sibling, 0 replies; 31+ messages in thread From: kbuild test robot @ 2015-12-23 22:50 UTC (permalink / raw) Cc: kbuild-all, linux-kernel, Sergei Ianovich, Heikki Krogerus, James Cameron, Greg Kroah-Hartman, Robert Jarzmik, Russell King, Jiri Slaby, Andy Shevchenko, Arnd Bergmann, Joachim Eastwood, Paul Burton, Mans Rullgard, Scott Wood, Sebastian Andrzej Siewior, Paul Gortmaker, Matthias Brugger, Peter Hurley, open list:SERIAL DRIVERS [-- Attachment #1: Type: text/plain, Size: 5809 bytes --] Hi Sergei, [auto build test ERROR on v4.4-rc6] [cannot apply to tty/tty-testing next-20151223] url: https://github.com/0day-ci/linux/commits/Sergei-Ianovich/serial-rewrite-pxa2xx-uart-to-use-8250_core/20151224-030409 config: arm-spitz_defconfig (attached as .config) reproduce: wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # save the attached .config to linux build tree make.cross ARCH=arm All error/warnings (new ones prefixed by >>): warning: (SERIAL_PXA_CONSOLE) selects SERIAL_8250_CONSOLE which has unmet direct dependencies (TTY && HAS_IOMEM && SERIAL_8250=y) In file included from drivers/tty/serial//8250/8250_core.c:21:0: >> include/linux/module.h:128:27: error: redefinition of '__inittest' static inline initcall_t __inittest(void) \ ^ >> drivers/tty/serial//8250/8250_core.c:1167:1: note: in expansion of macro 'module_init' module_init(serial8250_init); ^ include/linux/module.h:128:27: note: previous definition of '__inittest' was here static inline initcall_t __inittest(void) \ ^ >> include/linux/module.h:123:31: note: in expansion of macro 'module_init' #define console_initcall(fn) module_init(fn) ^ >> drivers/tty/serial//8250/8250_core.c:687:1: note: in expansion of macro 'console_initcall' console_initcall(univ8250_console_init); ^ >> include/linux/module.h:130:6: error: redefinition of 'init_module' int init_module(void) __attribute__((alias(#initfn))); ^ >> drivers/tty/serial//8250/8250_core.c:1167:1: note: in expansion of macro 'module_init' module_init(serial8250_init); ^ include/linux/module.h:130:6: note: previous definition of 'init_module' was here int init_module(void) __attribute__((alias(#initfn))); ^ >> include/linux/module.h:123:31: note: in expansion of macro 'module_init' #define console_initcall(fn) module_init(fn) ^ >> drivers/tty/serial//8250/8250_core.c:687:1: note: in expansion of macro 'console_initcall' console_initcall(univ8250_console_init); ^ -- >> drivers/tty/serial/pxa.c:966:1: warning: 'serial_pxa_init' is deprecated (declared at drivers/tty/serial/pxa.c:945) [-Wdeprecated-declarations] module_init(serial_pxa_init); ^ -- In file included from drivers/tty/serial/8250/8250_core.c:21:0: >> include/linux/module.h:128:27: error: redefinition of '__inittest' static inline initcall_t __inittest(void) \ ^ drivers/tty/serial/8250/8250_core.c:1167:1: note: in expansion of macro 'module_init' module_init(serial8250_init); ^ include/linux/module.h:128:27: note: previous definition of '__inittest' was here static inline initcall_t __inittest(void) \ ^ >> include/linux/module.h:123:31: note: in expansion of macro 'module_init' #define console_initcall(fn) module_init(fn) ^ drivers/tty/serial/8250/8250_core.c:687:1: note: in expansion of macro 'console_initcall' console_initcall(univ8250_console_init); ^ >> include/linux/module.h:130:6: error: redefinition of 'init_module' int init_module(void) __attribute__((alias(#initfn))); ^ drivers/tty/serial/8250/8250_core.c:1167:1: note: in expansion of macro 'module_init' module_init(serial8250_init); ^ include/linux/module.h:130:6: note: previous definition of 'init_module' was here int init_module(void) __attribute__((alias(#initfn))); ^ >> include/linux/module.h:123:31: note: in expansion of macro 'module_init' #define console_initcall(fn) module_init(fn) ^ drivers/tty/serial/8250/8250_core.c:687:1: note: in expansion of macro 'console_initcall' console_initcall(univ8250_console_init); ^ vim +/__inittest +128 include/linux/module.h 0fd972a7 Paul Gortmaker 2015-05-01 117 #define rootfs_initcall(fn) module_init(fn) 0fd972a7 Paul Gortmaker 2015-05-01 118 #define device_initcall(fn) module_init(fn) 0fd972a7 Paul Gortmaker 2015-05-01 119 #define device_initcall_sync(fn) module_init(fn) 0fd972a7 Paul Gortmaker 2015-05-01 120 #define late_initcall(fn) module_init(fn) 0fd972a7 Paul Gortmaker 2015-05-01 121 #define late_initcall_sync(fn) module_init(fn) 0fd972a7 Paul Gortmaker 2015-05-01 122 0fd972a7 Paul Gortmaker 2015-05-01 @123 #define console_initcall(fn) module_init(fn) 0fd972a7 Paul Gortmaker 2015-05-01 124 #define security_initcall(fn) module_init(fn) 0fd972a7 Paul Gortmaker 2015-05-01 125 0fd972a7 Paul Gortmaker 2015-05-01 126 /* Each module must use one module_init(). */ 0fd972a7 Paul Gortmaker 2015-05-01 127 #define module_init(initfn) \ 0fd972a7 Paul Gortmaker 2015-05-01 @128 static inline initcall_t __inittest(void) \ 0fd972a7 Paul Gortmaker 2015-05-01 129 { return initfn; } \ 0fd972a7 Paul Gortmaker 2015-05-01 @130 int init_module(void) __attribute__((alias(#initfn))); 0fd972a7 Paul Gortmaker 2015-05-01 131 0fd972a7 Paul Gortmaker 2015-05-01 132 /* This is only required if you want to be unloadable. */ 0fd972a7 Paul Gortmaker 2015-05-01 133 #define module_exit(exitfn) \ :::::: The code at line 128 was first introduced by commit :::::: 0fd972a7d91d6e15393c449492a04d94c0b89351 module: relocate module_init from init.h to module.h :::::: TO: Paul Gortmaker <paul.gortmaker@windriver.com> :::::: CC: Paul Gortmaker <paul.gortmaker@windriver.com> --- 0-DAY kernel test infrastructure Open Source Technology Center https://lists.01.org/pipermail/kbuild-all Intel Corporation [-- Attachment #2: .config.gz --] [-- Type: application/octet-stream, Size: 18440 bytes --] ^ permalink raw reply [flat|nested] 31+ messages in thread
* [PATCH v6] serial: rewrite pxa2xx-uart to use 8250_core 2015-12-23 18:59 ` [PATCH v5] " Sergei Ianovich 2015-12-23 22:50 ` kbuild test robot @ 2015-12-24 15:15 ` Sergei Ianovich 2015-12-29 11:06 ` Heikki Krogerus 2016-02-07 6:22 ` Greg Kroah-Hartman 1 sibling, 2 replies; 31+ messages in thread From: Sergei Ianovich @ 2015-12-24 15:15 UTC (permalink / raw) To: linux-kernel Cc: Sergei Ianovich, Heikki Krogerus, James Cameron, Greg Kroah-Hartman, Robert Jarzmik, Russell King, Jiri Slaby, Andy Shevchenko, Arnd Bergmann, Joachim Eastwood, Sebastian Andrzej Siewior, Scott Wood, Paul Gortmaker, Paul Burton, Mans Rullgard, Ralf Baechle, Masahiro Yamada, Peter Hurley, open list:SERIAL DRIVERS pxa2xx-uart was a separate uart platform driver. It was declaring the same device names and numbers as 8250 driver. As a result, it was impossible to use 8250 driver on PXA SoCs. Upon closer examination pxa2xx-uart turned out to be a clone of 8250_core driver. Workaround for Erratum #19 according to Marvel(R) PXA270M Processor Specification Update (April 19, 2010) is dropped. 8250_core reads from FIFO immediately after checking DR bit in LSR. The patch leaves the original SERIAL_PXA driver around. The original driver is just marked DEPRECATED in Kconfig and C source. When the original driver is considered safe to remove, no changes to SERIAL_8250 will be necessary. Compiling SERIAL_8250_CONSOLE and SERIAL_PXA_CONSOLE even without SERIAL_8250_PXA breaks console for SERIAL_PXA. For this reasons, the new and the original drivers are made mutually exclusive. Signed-off-by: Sergei Ianovich <ynvich@gmail.com> CC: Heikki Krogerus <heikki.krogerus@linux.intel.com> CC: James Cameron <quozl@laptop.org> CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org> CC: Robert Jarzmik <robert.jarzmik@free.fr> CC: Russell King <linux@arm.linux.org.uk> --- The patch was reviewed/acked at version 3. Changes in version 4 are simple unbitrotting. Changes in version 5 require re-review according to Robert Jarzmik comment. changes v5..v6 suggest by kbuild test robot * narrow SERIAL_8250 to SERIAL_8250=y in Kconfig dependencies changes v4..v5 as suggested by Robert Jarzmik * keep pxa.c until it is considered safe to remove * keep SERIAL_PXA and SERIAL_PXA_CONSOLE Kconfig options, but deprecate them * allow selection of either the new or the original driver by Kconfig * ensure SERIAL_PXA_CONSOLE is respected with either driver changes v3..v4 * remove owner field from platform_driver structure * make of_device_id structure constant * use CONFIG_SERIAL_8250_PXA instead of CONFIG_SERIAL_PXA changes v2..v3 * remove devm_free/put as suggested by Heikki Krogerus * use SET_SYSTEM_SLEEP_PM_OPS macro to set pm ops as suggested by Heikki Krogerus changes v1..v2 * actually implement workaround for E74 in dl_write as spooted by James Cameron * added comment about E19 in commit message drivers/tty/serial/8250/8250_pxa.c | 177 +++++++++++++++++++++++++++++++++++++ drivers/tty/serial/8250/Kconfig | 8 ++ drivers/tty/serial/8250/Makefile | 1 + drivers/tty/serial/Kconfig | 17 +++- drivers/tty/serial/Makefile | 2 +- drivers/tty/serial/pxa.c | 4 +- 6 files changed, 205 insertions(+), 4 deletions(-) create mode 100644 drivers/tty/serial/8250/8250_pxa.c diff --git a/drivers/tty/serial/8250/8250_pxa.c b/drivers/tty/serial/8250/8250_pxa.c new file mode 100644 index 0000000..6a14df0 --- /dev/null +++ b/drivers/tty/serial/8250/8250_pxa.c @@ -0,0 +1,177 @@ +/* + * drivers/tty/serial/8250/8250_pxa.c -- driver for PXA on-board UARTS + * Copyright: (C) 2013 Sergei Ianovich <ynvich@gmail.com> + * + * replaces drivers/serial/pxa.c by Nicolas Pitre + * Created: Feb 20, 2003 + * Copyright: (C) 2003 Monta Vista Software, Inc. + * + * Based on drivers/serial/8250.c by Russell King. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + +#include <linux/device.h> +#include <linux/init.h> +#include <linux/io.h> +#include <linux/module.h> +#include <linux/serial_8250.h> +#include <linux/serial_core.h> +#include <linux/serial_reg.h> +#include <linux/of.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/clk.h> +#include <linux/pm_runtime.h> + +#include "8250.h" + +struct pxa8250_data { + int line; + struct clk *clk; +}; + +#ifdef CONFIG_PM +static int serial_pxa_suspend(struct device *dev) +{ + struct pxa8250_data *data = dev_get_drvdata(dev); + + serial8250_suspend_port(data->line); + + return 0; +} + +static int serial_pxa_resume(struct device *dev) +{ + struct pxa8250_data *data = dev_get_drvdata(dev); + + serial8250_resume_port(data->line); + + return 0; +} +#endif + +static const struct dev_pm_ops serial_pxa_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(serial_pxa_suspend, serial_pxa_resume) +}; + +static const struct of_device_id serial_pxa_dt_ids[] = { + { .compatible = "mrvl,pxa-uart", }, + { .compatible = "mrvl,mmp-uart", }, + {} +}; +MODULE_DEVICE_TABLE(of, serial_pxa_dt_ids); + +/* Uart divisor latch write */ +static void serial_pxa_dl_write(struct uart_8250_port *up, int value) +{ + unsigned int dll; + + serial_out(up, UART_DLL, value & 0xff); + /* + * work around Erratum #74 according to Marvel(R) PXA270M Processor + * Specification Update (April 19, 2010) + */ + dll = serial_in(up, UART_DLL); + WARN_ON(dll != (value & 0xff)); + + serial_out(up, UART_DLM, value >> 8 & 0xff); +} + + +static void serial_pxa_pm(struct uart_port *port, unsigned int state, + unsigned int oldstate) +{ + struct pxa8250_data *data = port->private_data; + + if (!state) + clk_prepare_enable(data->clk); + else + clk_disable_unprepare(data->clk); +} + +static int serial_pxa_probe(struct platform_device *pdev) +{ + struct uart_8250_port uart = {}; + struct pxa8250_data *data; + struct resource *mmres, *irqres; + int ret; + + mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0); + irqres = platform_get_resource(pdev, IORESOURCE_IRQ, 0); + if (!mmres || !irqres) + return -ENODEV; + + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(data->clk)) + return PTR_ERR(data->clk); + + ret = clk_prepare(data->clk); + if (ret) + return ret; + + uart.port.type = PORT_XSCALE; + uart.port.iotype = UPIO_MEM32; + uart.port.mapbase = mmres->start; + uart.port.regshift = 2; + uart.port.irq = irqres->start; + uart.port.fifosize = 64; + uart.port.flags = UPF_IOREMAP | UPF_SKIP_TEST; + uart.port.dev = &pdev->dev; + uart.port.uartclk = clk_get_rate(data->clk); + uart.port.pm = serial_pxa_pm; + uart.port.private_data = data; + uart.dl_write = serial_pxa_dl_write; + + ret = serial8250_register_8250_port(&uart); + if (ret < 0) + goto err_clk; + + data->line = ret; + + platform_set_drvdata(pdev, data); + + return 0; + + err_clk: + clk_unprepare(data->clk); + return ret; +} + +static int serial_pxa_remove(struct platform_device *pdev) +{ + struct pxa8250_data *data = platform_get_drvdata(pdev); + + serial8250_unregister_port(data->line); + + clk_unprepare(data->clk); + + return 0; +} + +static struct platform_driver serial_pxa_driver = { + .probe = serial_pxa_probe, + .remove = serial_pxa_remove, + + .driver = { + .name = "pxa2xx-uart", + .pm = &serial_pxa_pm_ops, + .of_match_table = serial_pxa_dt_ids, + }, +}; + +module_platform_driver(serial_pxa_driver); + +MODULE_AUTHOR("Sergei Ianovich"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:pxa2xx-uart"); diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig index 6412f14..4dc45ff 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig @@ -378,3 +378,11 @@ config SERIAL_8250_MID Selecting this option will enable handling of the extra features present on the UART found on Intel Medfield SOC and various other Intel platforms. + +config SERIAL_8250_PXA + tristate "PXA serial port support" + depends on SERIAL_8250 + depends on ARCH_PXA || ARCH_MMP + help + If you have a machine based on an Intel XScale PXA2xx CPU you + can enable its onboard serial ports by enabling this option. diff --git a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Makefile index e177f86..7e54413 100644 --- a/drivers/tty/serial/8250/Makefile +++ b/drivers/tty/serial/8250/Makefile @@ -28,5 +28,6 @@ obj-$(CONFIG_SERIAL_8250_MT6577) += 8250_mtk.o obj-$(CONFIG_SERIAL_8250_UNIPHIER) += 8250_uniphier.o obj-$(CONFIG_SERIAL_8250_INGENIC) += 8250_ingenic.o obj-$(CONFIG_SERIAL_8250_MID) += 8250_mid.o +obj-$(CONFIG_SERIAL_8250_PXA) += 8250_pxa.o CFLAGS_8250_ingenic.o += -I$(srctree)/scripts/dtc/libfdt diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index f38beb2..161f33f 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -436,17 +436,27 @@ config SERIAL_MPSC_CONSOLE Say Y here if you want to support a serial console on a Marvell MPSC. config SERIAL_PXA - bool "PXA serial port support" + bool "PXA serial port support (DEPRECATED)" depends on ARCH_PXA || ARCH_MMP select SERIAL_CORE + select SERIAL_8250_PXA if SERIAL_8250=y + select SERIAL_PXA_NON8250 if !SERIAL_8250=y help If you have a machine based on an Intel XScale PXA2xx CPU you can enable its onboard serial ports by enabling this option. + Unless you have a specific need, you should use SERIAL_8250_PXA + instead of this. + +config SERIAL_PXA_NON8250 + bool + depends on !SERIAL_8250 + config SERIAL_PXA_CONSOLE - bool "Console on PXA serial port" + bool "Console on PXA serial port (DEPRECATED)" depends on SERIAL_PXA select SERIAL_CORE_CONSOLE + select SERIAL_8250_CONSOLE if SERIAL_8250=y help If you have enabled the serial port on the Intel XScale PXA CPU you can make it the console by answering Y to this option. @@ -458,6 +468,9 @@ config SERIAL_PXA_CONSOLE your boot loader (lilo or loadlin) about how to pass options to the kernel at boot time.) + Unless you have a specific need, you should use SERIAL_8250_PXA + and SERIAL_8250_CONSOLE instead of this. + config SERIAL_SA1100 bool "SA1100 serial port support" depends on ARCH_SA1100 diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile index 5ab4111..96741d5 100644 --- a/drivers/tty/serial/Makefile +++ b/drivers/tty/serial/Makefile @@ -23,7 +23,7 @@ obj-$(CONFIG_SERIAL_8250) += 8250/ obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o -obj-$(CONFIG_SERIAL_PXA) += pxa.o +obj-$(CONFIG_SERIAL_PXA_NON8250) += pxa.o obj-$(CONFIG_SERIAL_PNX8XXX) += pnx8xxx_uart.o obj-$(CONFIG_SERIAL_SA1100) += sa1100.o obj-$(CONFIG_SERIAL_BCM63XX) += bcm63xx_uart.o diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c index 9becba6..74aac45 100644 --- a/drivers/tty/serial/pxa.c +++ b/drivers/tty/serial/pxa.c @@ -940,7 +940,9 @@ static struct platform_driver serial_pxa_driver = { }, }; -static int __init serial_pxa_init(void) + +/* 8250 driver for PXA serial ports should be used */ +static int __deprecated __init serial_pxa_init(void) { int ret; -- 2.6.3 ^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [PATCH v6] serial: rewrite pxa2xx-uart to use 8250_core 2015-12-24 15:15 ` [PATCH v6] " Sergei Ianovich @ 2015-12-29 11:06 ` Heikki Krogerus 2015-12-29 16:50 ` Robert Jarzmik 2016-02-07 6:22 ` Greg Kroah-Hartman 1 sibling, 1 reply; 31+ messages in thread From: Heikki Krogerus @ 2015-12-29 11:06 UTC (permalink / raw) To: Sergei Ianovich Cc: linux-kernel, James Cameron, Greg Kroah-Hartman, Robert Jarzmik, Russell King, Jiri Slaby, Andy Shevchenko, Arnd Bergmann, Joachim Eastwood, Sebastian Andrzej Siewior, Scott Wood, Paul Gortmaker, Paul Burton, Mans Rullgard, Ralf Baechle, Masahiro Yamada, Peter Hurley, open list:SERIAL DRIVERS On Thu, Dec 24, 2015 at 06:15:14PM +0300, Sergei Ianovich wrote: > pxa2xx-uart was a separate uart platform driver. It was declaring > the same device names and numbers as 8250 driver. As a result, > it was impossible to use 8250 driver on PXA SoCs. > > Upon closer examination pxa2xx-uart turned out to be a clone of > 8250_core driver. > > Workaround for Erratum #19 according to Marvel(R) PXA270M Processor > Specification Update (April 19, 2010) is dropped. 8250_core reads > from FIFO immediately after checking DR bit in LSR. > > The patch leaves the original SERIAL_PXA driver around. The original > driver is just marked DEPRECATED in Kconfig and C source. When > the original driver is considered safe to remove, no changes > to SERIAL_8250 will be necessary. > > Compiling SERIAL_8250_CONSOLE and SERIAL_PXA_CONSOLE even without > SERIAL_8250_PXA breaks console for SERIAL_PXA. For this reasons, the new > and the original drivers are made mutually exclusive. > > Signed-off-by: Sergei Ianovich <ynvich@gmail.com> > CC: Heikki Krogerus <heikki.krogerus@linux.intel.com> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Thanks, -- heikki ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v6] serial: rewrite pxa2xx-uart to use 8250_core 2015-12-29 11:06 ` Heikki Krogerus @ 2015-12-29 16:50 ` Robert Jarzmik 0 siblings, 0 replies; 31+ messages in thread From: Robert Jarzmik @ 2015-12-29 16:50 UTC (permalink / raw) To: Heikki Krogerus, Sergei Ianovich Cc: linux-kernel, James Cameron, Greg Kroah-Hartman, Russell King, Jiri Slaby, Andy Shevchenko, Arnd Bergmann, Joachim Eastwood, Sebastian Andrzej Siewior, Scott Wood, Paul Gortmaker, Paul Burton, Mans Rullgard, Ralf Baechle, Masahiro Yamada, Peter Hurley, open list:SERIAL DRIVERS Heikki Krogerus <heikki.krogerus@linux.intel.com> writes: > On Thu, Dec 24, 2015 at 06:15:14PM +0300, Sergei Ianovich wrote: >> pxa2xx-uart was a separate uart platform driver. It was declaring >> the same device names and numbers as 8250 driver. As a result, >> it was impossible to use 8250 driver on PXA SoCs. >> >> Upon closer examination pxa2xx-uart turned out to be a clone of >> 8250_core driver. >> >> Workaround for Erratum #19 according to Marvel(R) PXA270M Processor >> Specification Update (April 19, 2010) is dropped. 8250_core reads >> from FIFO immediately after checking DR bit in LSR. >> >> The patch leaves the original SERIAL_PXA driver around. The original >> driver is just marked DEPRECATED in Kconfig and C source. When >> the original driver is considered safe to remove, no changes >> to SERIAL_8250 will be necessary. >> >> Compiling SERIAL_8250_CONSOLE and SERIAL_PXA_CONSOLE even without >> SERIAL_8250_PXA breaks console for SERIAL_PXA. For this reasons, the new >> and the original drivers are made mutually exclusive. >> >> Signed-off-by: Sergei Ianovich <ynvich@gmail.com> >> CC: Heikki Krogerus <heikki.krogerus@linux.intel.com> > > Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> The tests were done on lubbock(pxa25x), mainstone(pxa27x) and zylonite(pxa3xx) boards. I don't expect any breakage in PXA architecture. There might be issues with : - arch/arm/mach-pxa/capc7117.c - arch/arm/mach-pxa/viper.c -arch/arm/mach-pxa/zeus.c (very small probability for this one) The mitigation plan if any concern arises is to fallback on the CONFIG_SERIAL_PXA configuration. I find a bit misleading this chunk, but I'm not very good at KConfig : config SERIAL_PXA - bool "PXA serial port support" + bool "PXA serial port support (DEPRECATED)" depends on ARCH_PXA || ARCH_MMP select SERIAL_CORE + select SERIAL_8250_PXA if SERIAL_8250=y + select SERIAL_PXA_NON8250 if !SERIAL_8250=y What bothers me a bit is that selecting this option has a different effect whether SERIAL_8250 is set or not. Somebody selecting the deprecated option obviously wants the old driver, but will be provided the new one if his config has SERIAL_8250 set. Maybe someone else can comment on this ... This apart, from pxa perspective, it's good to go. Cheers. -- Robert ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v6] serial: rewrite pxa2xx-uart to use 8250_core 2015-12-24 15:15 ` [PATCH v6] " Sergei Ianovich 2015-12-29 11:06 ` Heikki Krogerus @ 2016-02-07 6:22 ` Greg Kroah-Hartman 2016-02-22 1:56 ` Sergei Ianovich 1 sibling, 1 reply; 31+ messages in thread From: Greg Kroah-Hartman @ 2016-02-07 6:22 UTC (permalink / raw) To: Sergei Ianovich Cc: linux-kernel, Heikki Krogerus, James Cameron, Robert Jarzmik, Russell King, Jiri Slaby, Andy Shevchenko, Arnd Bergmann, Joachim Eastwood, Sebastian Andrzej Siewior, Scott Wood, Paul Gortmaker, Paul Burton, Mans Rullgard, Ralf Baechle, Masahiro Yamada, Peter Hurley, open list:SERIAL DRIVERS On Thu, Dec 24, 2015 at 06:15:14PM +0300, Sergei Ianovich wrote: > pxa2xx-uart was a separate uart platform driver. It was declaring > the same device names and numbers as 8250 driver. As a result, > it was impossible to use 8250 driver on PXA SoCs. > > Upon closer examination pxa2xx-uart turned out to be a clone of > 8250_core driver. > > Workaround for Erratum #19 according to Marvel(R) PXA270M Processor > Specification Update (April 19, 2010) is dropped. 8250_core reads > from FIFO immediately after checking DR bit in LSR. > > The patch leaves the original SERIAL_PXA driver around. The original > driver is just marked DEPRECATED in Kconfig and C source. When > the original driver is considered safe to remove, no changes > to SERIAL_8250 will be necessary. But, you just broke existing configurations, right? The serial port is a different name now, are you willing to handle the angry users? If so, great, get the platform maintainer to sign off on this please and then resend it. thanks, greg k-h ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v6] serial: rewrite pxa2xx-uart to use 8250_core 2016-02-07 6:22 ` Greg Kroah-Hartman @ 2016-02-22 1:56 ` Sergei Ianovich 2016-02-22 7:17 ` Robert Jarzmik 0 siblings, 1 reply; 31+ messages in thread From: Sergei Ianovich @ 2016-02-22 1:56 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: linux-kernel, Heikki Krogerus, James Cameron, Robert Jarzmik, Russell King, Jiri Slaby, Andy Shevchenko, Arnd Bergmann, Joachim Eastwood, Sebastian Andrzej Siewior, Scott Wood, Paul Gortmaker, Paul Burton, Mans Rullgard, Ralf Baechle, Masahiro Yamada, Peter Hurley, open list:SERIAL DRIVERS On Sat, 2016-02-06 at 22:22 -0800, Greg Kroah-Hartman wrote: > On Thu, Dec 24, 2015 at 06:15:14PM +0300, Sergei Ianovich wrote: > > pxa2xx-uart was a separate uart platform driver. It was declaring > > the same device names and numbers as 8250 driver. As a result, > > it was impossible to use 8250 driver on PXA SoCs. > > > > Upon closer examination pxa2xx-uart turned out to be a clone of > > 8250_core driver. > > > > Workaround for Erratum #19 according to Marvel(R) PXA270M Processor > > Specification Update (April 19, 2010) is dropped. 8250_core reads > > from FIFO immediately after checking DR bit in LSR. > > > > The patch leaves the original SERIAL_PXA driver around. The > > original > > driver is just marked DEPRECATED in Kconfig and C source. When > > the original driver is considered safe to remove, no changes > > to SERIAL_8250 will be necessary. > > But, you just broke existing configurations, right? The serial port is > a different name now, are you willing to handle the angry users? No, the port name remains /dev/ttyS0. In fact, this conflict (both drivers use the same name and char major) is the reason for the patch. Noone should notice the change at runtime. There will be a warning at compile time which should make the transition to the new driver faster. > If so, great, get the platform maintainer to sign off on this please and > then resend it. The previous version of the patch has been around for 2 years with half a dozen of Acks and Reviews, but it hasn't landed. Could you suggest a better approach? -- Sergei Ianovich <ynvich@gmail.com> ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v6] serial: rewrite pxa2xx-uart to use 8250_core 2016-02-22 1:56 ` Sergei Ianovich @ 2016-02-22 7:17 ` Robert Jarzmik 2016-09-27 15:47 ` Robert Jarzmik 0 siblings, 1 reply; 31+ messages in thread From: Robert Jarzmik @ 2016-02-22 7:17 UTC (permalink / raw) To: Greg Kroah-Hartman, Sergei Ianovich Cc: linux-kernel, Heikki Krogerus, James Cameron, Russell King, Jiri Slaby, Andy Shevchenko, Arnd Bergmann, Joachim Eastwood, Sebastian Andrzej Siewior, Scott Wood, Paul Gortmaker, Paul Burton, Mans Rullgard, Ralf Baechle, Masahiro Yamada, Peter Hurley, open list:SERIAL DRIVERS Sergei Ianovich <ynvich@gmail.com> writes: > On Sat, 2016-02-06 at 22:22 -0800, Greg Kroah-Hartman wrote: >> On Thu, Dec 24, 2015 at 06:15:14PM +0300, Sergei Ianovich wrote: >> > pxa2xx-uart was a separate uart platform driver. It was declaring >> > the same device names and numbers as 8250 driver. As a result, >> > it was impossible to use 8250 driver on PXA SoCs. >> > >> > Upon closer examination pxa2xx-uart turned out to be a clone of >> > 8250_core driver. >> > >> > Workaround for Erratum #19 according to Marvel(R) PXA270M Processor >> > Specification Update (April 19, 2010) is dropped. 8250_core reads >> > from FIFO immediately after checking DR bit in LSR. >> > >> > The patch leaves the original SERIAL_PXA driver around. The >> > original >> > driver is just marked DEPRECATED in Kconfig and C source. When >> > the original driver is considered safe to remove, no changes >> > to SERIAL_8250 will be necessary. >> >> But, you just broke existing configurations, right? The serial port is >> a different name now, are you willing to handle the angry users? > > No, the port name remains /dev/ttyS0. In fact, this conflict (both > drivers use the same name and char major) is the reason for the patch. > Noone should notice the change at runtime. There will be a warning at > compile time which should make the transition to the new driver faster. > >> If so, great, get the platform maintainer to sign off on this please and >> then resend it. If you're talking about the PXA maintainer, then : Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> I'm happy with the patch, all pxa board maintainers have been warned, and there exists a fallback solution. So let's go forward, and if people complain, let them complain and forward them to me. Cheers. -- Robert ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v6] serial: rewrite pxa2xx-uart to use 8250_core 2016-02-22 7:17 ` Robert Jarzmik @ 2016-09-27 15:47 ` Robert Jarzmik 2016-09-27 16:12 ` Greg Kroah-Hartman 0 siblings, 1 reply; 31+ messages in thread From: Robert Jarzmik @ 2016-09-27 15:47 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Sergei Ianovich, linux-kernel, Heikki Krogerus, James Cameron, Russell King, Jiri Slaby, Andy Shevchenko, Arnd Bergmann, Joachim Eastwood, Sebastian Andrzej Siewior, Scott Wood, Paul Gortmaker, Paul Burton, Mans Rullgard, Ralf Baechle, Masahiro Yamada, Peter Hurley, open list:SERIAL DRIVERS Robert Jarzmik <robert.jarzmik@free.fr> writes: >>> If so, great, get the platform maintainer to sign off on this please and >>> then resend it. > > If you're talking about the PXA maintainer, then : > Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> > > I'm happy with the patch, all pxa board maintainers have been warned, and there > exists a fallback solution. > > So let's go forward, and if people complain, let them complain and forward them > to me. Hi Greg, I rebased and retested the patch (both devicetree and legacy boards, multiple pxa variants, early console and standard console), and it does work. The fallback on the old driver works as well. I also signed it as the pxa maintainer, and I'm pushing it now, in [2]. If you want context, it's archived in [1]. If you're overburdened and feel there won't be a merge conflict in your serial tree, I can take it through pxa tree provided you ack it, or you can take it, just let me know. Cheers. -- Robert [1] Original discussion https://patchwork.kernel.org/patch/7918421/ [2] The patch ---8>--- >From 6d9bd0c05c9c7bf42ee1655f3a50dcff959bc87d Mon Sep 17 00:00:00 2001 From: Sergey Yanovich <ynvich@gmail.com> Date: Thu, 24 Dec 2015 18:15:14 +0300 Subject: [PATCH] serial: rewrite pxa2xx-uart to use 8250_core pxa2xx-uart was a separate uart platform driver. It was declaring the same device names and numbers as 8250 driver. As a result, it was impossible to use 8250 driver on PXA SoCs. Upon closer examination pxa2xx-uart turned out to be a clone of 8250_core driver. Workaround for Erratum #19 according to Marvel(R) PXA270M Processor Specification Update (April 19, 2010) is dropped. 8250_core reads from FIFO immediately after checking DR bit in LSR. The patch leaves the original SERIAL_PXA driver around. The original driver is just marked DEPRECATED in Kconfig and C source. When the original driver is considered safe to remove, no changes to SERIAL_8250 will be necessary. Compiling SERIAL_8250_CONSOLE and SERIAL_PXA_CONSOLE even without SERIAL_8250_PXA breaks console for SERIAL_PXA. For this reasons, the new and the original drivers are made mutually exclusive. Signed-off-by: Sergei Ianovich <ynvich@gmail.com> CC: Heikki Krogerus <heikki.krogerus@linux.intel.com> CC: James Cameron <quozl@laptop.org> CC: Greg Kroah-Hartman <gregkh@linuxfoundation.org> CC: Robert Jarzmik <robert.jarzmik@free.fr> CC: Russell King <linux@arm.linux.org.uk> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> [rebased on v4.8] Tested-by: Robert Jarzmik <robert.jarzmik@free.fr> Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr> --- drivers/tty/serial/8250/8250_pxa.c | 177 +++++++++++++++++++++++++++++++++++++ drivers/tty/serial/8250/Kconfig | 10 +++ drivers/tty/serial/8250/Makefile | 1 + drivers/tty/serial/Kconfig | 17 +++- drivers/tty/serial/Makefile | 2 +- drivers/tty/serial/pxa.c | 4 +- 6 files changed, 207 insertions(+), 4 deletions(-) create mode 100644 drivers/tty/serial/8250/8250_pxa.c diff --git a/drivers/tty/serial/8250/8250_pxa.c b/drivers/tty/serial/8250/8250_pxa.c new file mode 100644 index 000000000000..6a14df013754 --- /dev/null +++ b/drivers/tty/serial/8250/8250_pxa.c @@ -0,0 +1,177 @@ +/* + * drivers/tty/serial/8250/8250_pxa.c -- driver for PXA on-board UARTS + * Copyright: (C) 2013 Sergei Ianovich <ynvich@gmail.com> + * + * replaces drivers/serial/pxa.c by Nicolas Pitre + * Created: Feb 20, 2003 + * Copyright: (C) 2003 Monta Vista Software, Inc. + * + * Based on drivers/serial/8250.c by Russell King. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + */ + +#include <linux/device.h> +#include <linux/init.h> +#include <linux/io.h> +#include <linux/module.h> +#include <linux/serial_8250.h> +#include <linux/serial_core.h> +#include <linux/serial_reg.h> +#include <linux/of.h> +#include <linux/of_irq.h> +#include <linux/of_platform.h> +#include <linux/platform_device.h> +#include <linux/slab.h> +#include <linux/clk.h> +#include <linux/pm_runtime.h> + +#include "8250.h" + +struct pxa8250_data { + int line; + struct clk *clk; +}; + +#ifdef CONFIG_PM +static int serial_pxa_suspend(struct device *dev) +{ + struct pxa8250_data *data = dev_get_drvdata(dev); + + serial8250_suspend_port(data->line); + + return 0; +} + +static int serial_pxa_resume(struct device *dev) +{ + struct pxa8250_data *data = dev_get_drvdata(dev); + + serial8250_resume_port(data->line); + + return 0; +} +#endif + +static const struct dev_pm_ops serial_pxa_pm_ops = { + SET_SYSTEM_SLEEP_PM_OPS(serial_pxa_suspend, serial_pxa_resume) +}; + +static const struct of_device_id serial_pxa_dt_ids[] = { + { .compatible = "mrvl,pxa-uart", }, + { .compatible = "mrvl,mmp-uart", }, + {} +}; +MODULE_DEVICE_TABLE(of, serial_pxa_dt_ids); + +/* Uart divisor latch write */ +static void serial_pxa_dl_write(struct uart_8250_port *up, int value) +{ + unsigned int dll; + + serial_out(up, UART_DLL, value & 0xff); + /* + * work around Erratum #74 according to Marvel(R) PXA270M Processor + * Specification Update (April 19, 2010) + */ + dll = serial_in(up, UART_DLL); + WARN_ON(dll != (value & 0xff)); + + serial_out(up, UART_DLM, value >> 8 & 0xff); +} + + +static void serial_pxa_pm(struct uart_port *port, unsigned int state, + unsigned int oldstate) +{ + struct pxa8250_data *data = port->private_data; + + if (!state) + clk_prepare_enable(data->clk); + else + clk_disable_unprepare(data->clk); +} + +static int serial_pxa_probe(struct platform_device *pdev) +{ + struct uart_8250_port uart = {}; + struct pxa8250_data *data; + struct resource *mmres, *irqres; + int ret; + + mmres = platform_get_resource(pdev, IORESOURCE_MEM, 0); + irqres = platform_get_resource(pdev, IORESOURCE_IRQ, 0); + if (!mmres || !irqres) + return -ENODEV; + + data = devm_kzalloc(&pdev->dev, sizeof(*data), GFP_KERNEL); + if (!data) + return -ENOMEM; + + data->clk = devm_clk_get(&pdev->dev, NULL); + if (IS_ERR(data->clk)) + return PTR_ERR(data->clk); + + ret = clk_prepare(data->clk); + if (ret) + return ret; + + uart.port.type = PORT_XSCALE; + uart.port.iotype = UPIO_MEM32; + uart.port.mapbase = mmres->start; + uart.port.regshift = 2; + uart.port.irq = irqres->start; + uart.port.fifosize = 64; + uart.port.flags = UPF_IOREMAP | UPF_SKIP_TEST; + uart.port.dev = &pdev->dev; + uart.port.uartclk = clk_get_rate(data->clk); + uart.port.pm = serial_pxa_pm; + uart.port.private_data = data; + uart.dl_write = serial_pxa_dl_write; + + ret = serial8250_register_8250_port(&uart); + if (ret < 0) + goto err_clk; + + data->line = ret; + + platform_set_drvdata(pdev, data); + + return 0; + + err_clk: + clk_unprepare(data->clk); + return ret; +} + +static int serial_pxa_remove(struct platform_device *pdev) +{ + struct pxa8250_data *data = platform_get_drvdata(pdev); + + serial8250_unregister_port(data->line); + + clk_unprepare(data->clk); + + return 0; +} + +static struct platform_driver serial_pxa_driver = { + .probe = serial_pxa_probe, + .remove = serial_pxa_remove, + + .driver = { + .name = "pxa2xx-uart", + .pm = &serial_pxa_pm_ops, + .of_match_table = serial_pxa_dt_ids, + }, +}; + +module_platform_driver(serial_pxa_driver); + +MODULE_AUTHOR("Sergei Ianovich"); +MODULE_LICENSE("GPL"); +MODULE_ALIAS("platform:pxa2xx-uart"); diff --git a/drivers/tty/serial/8250/Kconfig b/drivers/tty/serial/8250/Kconfig index c9ec839a5ddf..a294e858e16b 100644 --- a/drivers/tty/serial/8250/Kconfig +++ b/drivers/tty/serial/8250/Kconfig @@ -426,6 +426,16 @@ config SERIAL_8250_MOXA This driver can also be built as a module. The module will be called 8250_moxa. If you want to do that, say M here. +config SERIAL_8250_PXA + tristate "PXA serial port support" + depends on SERIAL_8250 + depends on ARCH_PXA || ARCH_MMP + help + If you have a machine based on an Intel XScale PXA2xx CPU you can + enable its onboard serial ports by enabling this option. The option is + applicable to both devicetree and legacy boards, and early console is + part of its support. + config SERIAL_OF_PLATFORM tristate "Devicetree based probing for 8250 ports" depends on SERIAL_8250 && OF diff --git a/drivers/tty/serial/8250/Makefile b/drivers/tty/serial/8250/Makefile index 367d403d28d5..30745c94ae45 100644 --- a/drivers/tty/serial/8250/Makefile +++ b/drivers/tty/serial/8250/Makefile @@ -30,6 +30,7 @@ obj-$(CONFIG_SERIAL_8250_UNIPHIER) += 8250_uniphier.o obj-$(CONFIG_SERIAL_8250_INGENIC) += 8250_ingenic.o obj-$(CONFIG_SERIAL_8250_MID) += 8250_mid.o obj-$(CONFIG_SERIAL_8250_MOXA) += 8250_moxa.o +obj-$(CONFIG_SERIAL_8250_PXA) += 8250_pxa.o obj-$(CONFIG_SERIAL_OF_PLATFORM) += 8250_of.o CFLAGS_8250_ingenic.o += -I$(srctree)/scripts/dtc/libfdt diff --git a/drivers/tty/serial/Kconfig b/drivers/tty/serial/Kconfig index 518db24a5b36..543cdd58232d 100644 --- a/drivers/tty/serial/Kconfig +++ b/drivers/tty/serial/Kconfig @@ -438,17 +438,27 @@ config SERIAL_MPSC_CONSOLE Say Y here if you want to support a serial console on a Marvell MPSC. config SERIAL_PXA - bool "PXA serial port support" + bool "PXA serial port support (DEPRECATED)" depends on ARCH_PXA || ARCH_MMP select SERIAL_CORE + select SERIAL_8250_PXA if SERIAL_8250=y + select SERIAL_PXA_NON8250 if !SERIAL_8250=y help If you have a machine based on an Intel XScale PXA2xx CPU you can enable its onboard serial ports by enabling this option. + Unless you have a specific need, you should use SERIAL_8250_PXA + instead of this. + +config SERIAL_PXA_NON8250 + bool + depends on !SERIAL_8250 + config SERIAL_PXA_CONSOLE - bool "Console on PXA serial port" + bool "Console on PXA serial port (DEPRECATED)" depends on SERIAL_PXA select SERIAL_CORE_CONSOLE + select SERIAL_8250_CONSOLE if SERIAL_8250=y help If you have enabled the serial port on the Intel XScale PXA CPU you can make it the console by answering Y to this option. @@ -460,6 +470,9 @@ config SERIAL_PXA_CONSOLE your boot loader (lilo or loadlin) about how to pass options to the kernel at boot time.) + Unless you have a specific need, you should use SERIAL_8250_PXA + and SERIAL_8250_CONSOLE instead of this. + config SERIAL_SA1100 bool "SA1100 serial port support" depends on ARCH_SA1100 diff --git a/drivers/tty/serial/Makefile b/drivers/tty/serial/Makefile index 1278d376da50..1fa21ec616bd 100644 --- a/drivers/tty/serial/Makefile +++ b/drivers/tty/serial/Makefile @@ -23,7 +23,7 @@ obj-$(CONFIG_SERIAL_8250) += 8250/ obj-$(CONFIG_SERIAL_AMBA_PL010) += amba-pl010.o obj-$(CONFIG_SERIAL_AMBA_PL011) += amba-pl011.o obj-$(CONFIG_SERIAL_CLPS711X) += clps711x.o -obj-$(CONFIG_SERIAL_PXA) += pxa.o +obj-$(CONFIG_SERIAL_PXA_NON8250) += pxa.o obj-$(CONFIG_SERIAL_PNX8XXX) += pnx8xxx_uart.o obj-$(CONFIG_SERIAL_SA1100) += sa1100.o obj-$(CONFIG_SERIAL_BCM63XX) += bcm63xx_uart.o diff --git a/drivers/tty/serial/pxa.c b/drivers/tty/serial/pxa.c index cd9d9e878475..b9dd787cb561 100644 --- a/drivers/tty/serial/pxa.c +++ b/drivers/tty/serial/pxa.c @@ -925,7 +925,9 @@ static struct platform_driver serial_pxa_driver = { }, }; -static int __init serial_pxa_init(void) + +/* 8250 driver for PXA serial ports should be used */ +static int __deprecated __init serial_pxa_init(void) { int ret; -- 2.1.4 ^ permalink raw reply related [flat|nested] 31+ messages in thread
* Re: [PATCH v6] serial: rewrite pxa2xx-uart to use 8250_core 2016-09-27 15:47 ` Robert Jarzmik @ 2016-09-27 16:12 ` Greg Kroah-Hartman 2016-09-27 16:24 ` Robert Jarzmik 0 siblings, 1 reply; 31+ messages in thread From: Greg Kroah-Hartman @ 2016-09-27 16:12 UTC (permalink / raw) To: Robert Jarzmik Cc: Sergei Ianovich, linux-kernel, Heikki Krogerus, James Cameron, Russell King, Jiri Slaby, Andy Shevchenko, Arnd Bergmann, Joachim Eastwood, Sebastian Andrzej Siewior, Scott Wood, Paul Gortmaker, Paul Burton, Mans Rullgard, Ralf Baechle, Masahiro Yamada, Peter Hurley, open list:SERIAL DRIVERS On Tue, Sep 27, 2016 at 05:47:54PM +0200, Robert Jarzmik wrote: > Robert Jarzmik <robert.jarzmik@free.fr> writes: > > >>> If so, great, get the platform maintainer to sign off on this please and > >>> then resend it. > > > > If you're talking about the PXA maintainer, then : > > Acked-by: Robert Jarzmik <robert.jarzmik@free.fr> > > > > I'm happy with the patch, all pxa board maintainers have been warned, and there > > exists a fallback solution. > > > > So let's go forward, and if people complain, let them complain and forward them > > to me. > > Hi Greg, > > I rebased and retested the patch (both devicetree and legacy boards, multiple > pxa variants, early console and standard console), and it does work. The > fallback on the old driver works as well. > > I also signed it as the pxa maintainer, and I'm pushing it now, in [2]. > > If you want context, it's archived in [1]. > > If you're overburdened and feel there won't be a merge conflict in your serial > tree, I can take it through pxa tree provided you ack it, or you can take it, > just let me know. I'll be glad to take it, can you send it in a proper format? thanks, greg k-h ^ permalink raw reply [flat|nested] 31+ messages in thread
* Re: [PATCH v6] serial: rewrite pxa2xx-uart to use 8250_core 2016-09-27 16:12 ` Greg Kroah-Hartman @ 2016-09-27 16:24 ` Robert Jarzmik 0 siblings, 0 replies; 31+ messages in thread From: Robert Jarzmik @ 2016-09-27 16:24 UTC (permalink / raw) To: Greg Kroah-Hartman Cc: Sergei Ianovich, linux-kernel, Heikki Krogerus, James Cameron, Russell King, Jiri Slaby, Andy Shevchenko, Arnd Bergmann, Joachim Eastwood, Sebastian Andrzej Siewior, Scott Wood, Paul Gortmaker, Paul Burton, Mans Rullgard, Ralf Baechle, Masahiro Yamada, Peter Hurley, open list:SERIAL DRIVERS Greg Kroah-Hartman <gregkh@linuxfoundation.org> writes: > On Tue, Sep 27, 2016 at 05:47:54PM +0200, Robert Jarzmik wrote: >> If you're overburdened and feel there won't be a merge conflict in your serial >> tree, I can take it through pxa tree provided you ack it, or you can take it, >> just let me know. > > I'll be glad to take it, can you send it in a proper format? Most certainly. Done with the title "[PATCH v6 RESEND] serial: rewrite pxa2xx-uart to use 8250_core". Thanks. -- Robert ^ permalink raw reply [flat|nested] 31+ messages in thread
end of thread, other threads:[~2016-09-27 16:24 UTC | newest]
Thread overview: 31+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <1386543229-1542-1-git-send-email-ynvich@gmail.com>
[not found] ` <1386901645-28895-1-git-send-email-ynvich@gmail.com>
2013-12-13 2:27 ` [PATCH v2 10/16] serial: support for 16550A serial ports on LP-8x4x Sergei Ianovich
[not found] ` <1387309071-22382-1-git-send-email-ynvich@gmail.com>
2013-12-17 19:37 ` [PATCH v3 01/21 resend] serial: rewrite pxa2xx-uart to use 8250_core Sergei Ianovich
2013-12-18 23:55 ` Greg Kroah-Hartman
2013-12-19 8:51 ` Heikki Krogerus
2013-12-19 9:35 ` Sergei Ianovich
2013-12-19 10:01 ` Sergei Ianovich
2013-12-19 11:05 ` Heikki Krogerus
2013-12-17 19:37 ` [PATCH v3 12/21] serial: support for 16550A serial ports on LP-8x4x Sergei Ianovich
2013-12-19 11:18 ` Heikki Krogerus
[not found] ` <1397668411-27162-1-git-send-email-ynvich@gmail.com>
2014-04-16 17:13 ` [PATCH v4 01/21] serial: rewrite pxa2xx-uart to use 8250_core Sergei Ianovich
2015-01-19 18:08 ` Rob Herring
[not found] ` <1449700088-28076-1-git-send-email-ynvich@gmail.com>
2015-12-09 22:28 ` [PATCH v4 1/2] " Sergei Ianovich
2015-12-19 12:45 ` Robert Jarzmik
2015-12-19 13:26 ` Robert Jarzmik
2015-12-19 18:46 ` Sergei Ianovich
2015-12-19 19:31 ` Robert Jarzmik
2015-12-19 20:12 ` Sergei Ianovich
2015-12-19 23:12 ` Robert Jarzmik
2015-12-20 11:24 ` Sergei Ianovich
2015-12-22 19:27 ` Robert Jarzmik
2015-12-23 18:59 ` [PATCH v5] " Sergei Ianovich
2015-12-23 22:50 ` kbuild test robot
2015-12-24 15:15 ` [PATCH v6] " Sergei Ianovich
2015-12-29 11:06 ` Heikki Krogerus
2015-12-29 16:50 ` Robert Jarzmik
2016-02-07 6:22 ` Greg Kroah-Hartman
2016-02-22 1:56 ` Sergei Ianovich
2016-02-22 7:17 ` Robert Jarzmik
2016-09-27 15:47 ` Robert Jarzmik
2016-09-27 16:12 ` Greg Kroah-Hartman
2016-09-27 16:24 ` Robert Jarzmik
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).