openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

serial: 8250_dw: Do not use readl/writel before checking port iotype 

Direct call to readl()/writel() is checked against iotype
and in case of UPIO_MEM32BE we use ioread32be()/iowrite32be()
instead of them.

Signed-off-by: Noam Camus <noamc@ezchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Noam Camus 2015-12-12 19:18:27 +02:00 committed by Greg Kroah-Hartman
parent 4625090187
commit 5a43140cc4
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/tty/serial/8250/8250_dw.c
View File

@ -114,6 +114,8 @@ static void dw8250_check_lcr(struct uart_port *p, int value)
#else #else
if (p->iotype == UPIO_MEM32) if (p->iotype == UPIO_MEM32)
writel(value, offset); writel(value, offset);
else if (p->iotype == UPIO_MEM32BE)
iowrite32be(value, offset);
else else
writeb(value, offset); writeb(value, offset);
#endif #endif
@ -327,14 +329,20 @@ static void dw8250_setup_port(struct uart_port *p)
* If the Component Version Register returns zero, we know that * If the Component Version Register returns zero, we know that
* ADDITIONAL_FEATURES are not enabled. No need to go any further. * ADDITIONAL_FEATURES are not enabled. No need to go any further.
*/ */
reg = readl(p->membase + DW_UART_UCV); if (p->iotype == UPIO_MEM32BE)
reg = ioread32be(p->membase + DW_UART_UCV);
else
reg = readl(p->membase + DW_UART_UCV);
if (!reg) if (!reg)
return; return;
dev_dbg(p->dev, "Designware UART version %c.%c%c\n", dev_dbg(p->dev, "Designware UART version %c.%c%c\n",
(reg >> 24) & 0xff, (reg >> 16) & 0xff, (reg >> 8) & 0xff); (reg >> 24) & 0xff, (reg >> 16) & 0xff, (reg >> 8) & 0xff);
reg = readl(p->membase + DW_UART_CPR); if (p->iotype == UPIO_MEM32BE)
reg = ioread32be(p->membase + DW_UART_CPR);
else
reg = readl(p->membase + DW_UART_CPR);
if (!reg) if (!reg)
return; return;