UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

serial: 8250_dw: Avoid serial_outx code duplicate with new dw8250_check_lcr() 

With the help of Heikki we take common code that
makes sure LCR write wasn't ignored and put it in new function called
dw8250_check_lcr(). This function serves 3 serial_out routines:
dw8250_serial_out(), dw8250_serial_out32(), and dw8250_serial_outq().

This patch only brings better code reuse.

Signed-off-by: Noam Camus <noamc@ezchip.com>
Cc: Heikki Krogerus <heikki.krogerus@linux.intel.com>
Cc: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Noam Camus 2015-12-12 19:18:25 +02:00 committed by Greg Kroah-Hartman
parent 344cee2470
commit cdcea058e5
1 changed files with 42 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -95,25 +95,43 @@ static void dw8250_force_idle(struct uart_port *p)
(void)p->serial_in(p, UART_RX); (void)p->serial_in(p, UART_RX);
} }
static void dw8250_serial_out(struct uart_port *p, int offset, int value) static void dw8250_check_lcr(struct uart_port *p, int value)
{ {
writeb(value, p->membase + (offset << p->regshift)); void __iomem *offset = p->membase + (UART_LCR << p->regshift);
int tries = 1000;
/* Make sure LCR write wasn't ignored */ /* Make sure LCR write wasn't ignored */
if (offset == UART_LCR) { while (tries--) {
int tries = 1000; unsigned int lcr = p->serial_in(p, UART_LCR);
while (tries--) {
unsigned int lcr = p->serial_in(p, UART_LCR); if ((value & ~UART_LCR_SPAR) == (lcr & ~UART_LCR_SPAR))
if ((value & ~UART_LCR_SPAR) == (lcr & ~UART_LCR_SPAR)) return;
return;
dw8250_force_idle(p); dw8250_force_idle(p);
writeb(value, p->membase + (UART_LCR << p->regshift));
} #ifdef CONFIG_64BIT
/* __raw_writeq(value & 0xff, offset);
* FIXME: this deadlocks if port->lock is already held #else
* dev_err(p->dev, "Couldn't set LCR to %d\n", value); if (p->iotype == UPIO_MEM32)
*/ writel(value, offset);
else
writeb(value, offset);
#endif
} }
/*
* FIXME: this deadlocks if port->lock is already held
* dev_err(p->dev, "Couldn't set LCR to %d\n", value);
*/
}
static void dw8250_serial_out(struct uart_port *p, int offset, int value)
{
struct dw8250_data *d = p->private_data;
writeb(value, p->membase + (offset << p->regshift));
if (offset == UART_LCR && !d->uart_16550_compatible)
dw8250_check_lcr(p, value);
} }
static unsigned int dw8250_serial_in(struct uart_port *p, int offset) static unsigned int dw8250_serial_in(struct uart_port *p, int offset)
@ -135,49 +153,26 @@ static unsigned int dw8250_serial_inq(struct uart_port *p, int offset)
static void dw8250_serial_outq(struct uart_port *p, int offset, int value) static void dw8250_serial_outq(struct uart_port *p, int offset, int value)
{ {
struct dw8250_data *d = p->private_data;
value &= 0xff; value &= 0xff;
__raw_writeq(value, p->membase + (offset << p->regshift)); __raw_writeq(value, p->membase + (offset << p->regshift));
/* Read back to ensure register write ordering. */ /* Read back to ensure register write ordering. */
__raw_readq(p->membase + (UART_LCR << p->regshift)); __raw_readq(p->membase + (UART_LCR << p->regshift));
/* Make sure LCR write wasn't ignored */ if (offset == UART_LCR && !d->uart_16550_compatible)
if (offset == UART_LCR) { dw8250_check_lcr(p, value);
int tries = 1000;
while (tries--) {
unsigned int lcr = p->serial_in(p, UART_LCR);
if ((value & ~UART_LCR_SPAR) == (lcr & ~UART_LCR_SPAR))
return;
dw8250_force_idle(p);
__raw_writeq(value & 0xff,
p->membase + (UART_LCR << p->regshift));
}
/*
* FIXME: this deadlocks if port->lock is already held
* dev_err(p->dev, "Couldn't set LCR to %d\n", value);
*/
}
} }
#endif /* CONFIG_64BIT */ #endif /* CONFIG_64BIT */
static void dw8250_serial_out32(struct uart_port *p, int offset, int value) static void dw8250_serial_out32(struct uart_port *p, int offset, int value)
{ {
struct dw8250_data *d = p->private_data;
writel(value, p->membase + (offset << p->regshift)); writel(value, p->membase + (offset << p->regshift));
/* Make sure LCR write wasn't ignored */ if (offset == UART_LCR && !d->uart_16550_compatible)
if (offset == UART_LCR) { dw8250_check_lcr(p, value);
int tries = 1000;
while (tries--) {
unsigned int lcr = p->serial_in(p, UART_LCR);
if ((value & ~UART_LCR_SPAR) == (lcr & ~UART_LCR_SPAR))
return;
dw8250_force_idle(p);
writel(value, p->membase + (UART_LCR << p->regshift));
}
/*
* FIXME: this deadlocks if port->lock is already held
* dev_err(p->dev, "Couldn't set LCR to %d\n", value);
*/
}
} }
static unsigned int dw8250_serial_in32(struct uart_port *p, int offset) static unsigned int dw8250_serial_in32(struct uart_port *p, int offset)
@ -463,10 +458,8 @@ static int dw8250_probe(struct platform_device *pdev)
dw8250_quirks(p, data); dw8250_quirks(p, data);
/* If the Busy Functionality is not implemented, don't handle it */ /* If the Busy Functionality is not implemented, don't handle it */
if (data->uart_16550_compatible) { if (data->uart_16550_compatible)
p->serial_out = NULL;
p->handle_irq = NULL; p->handle_irq = NULL;
}
if (!data->skip_autocfg) if (!data->skip_autocfg)
dw8250_setup_port(p); dw8250_setup_port(p);