Commit d1f2f219 authored by Peter Hurley's avatar Peter Hurley Committed by Greg Kroah-Hartman

serial: 8250: Move UART_BUG_QUOT workaround

The UART_BUG_QUOT workaround adjusts the divisor computed from the
baud rate by serial8250_get_divisor(). Move the workaround into
serial8250_get_divisor(), so that divisor-from-baud computation
is encapsulated.
Signed-off-by: default avatarPeter Hurley <peter@hurleysoftware.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 01ba8d6a
...@@ -2413,8 +2413,9 @@ static void serial8250_shutdown(struct uart_port *port) ...@@ -2413,8 +2413,9 @@ static void serial8250_shutdown(struct uart_port *port)
serial8250_do_shutdown(port); serial8250_do_shutdown(port);
} }
static unsigned int serial8250_get_divisor(struct uart_port *port, unsigned int baud) static unsigned int serial8250_get_divisor(struct uart_8250_port *up, unsigned int baud)
{ {
struct uart_port *port = &up->port;
unsigned int quot; unsigned int quot;
/* /*
...@@ -2430,6 +2431,12 @@ static unsigned int serial8250_get_divisor(struct uart_port *port, unsigned int ...@@ -2430,6 +2431,12 @@ static unsigned int serial8250_get_divisor(struct uart_port *port, unsigned int
else else
quot = uart_get_divisor(port, baud); quot = uart_get_divisor(port, baud);
/*
* Oxford Semi 952 rev B workaround
*/
if (up->bugs & UART_BUG_QUOT && (quot & 0xff) == 0)
quot++;
return quot; return quot;
} }
...@@ -2478,13 +2485,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, ...@@ -2478,13 +2485,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios,
baud = uart_get_baud_rate(port, termios, old, baud = uart_get_baud_rate(port, termios, old,
port->uartclk / 16 / 0xffff, port->uartclk / 16 / 0xffff,
port->uartclk / 16); port->uartclk / 16);
quot = serial8250_get_divisor(port, baud); quot = serial8250_get_divisor(up, baud);
/*
* Oxford Semi 952 rev B workaround
*/
if (up->bugs & UART_BUG_QUOT && (quot & 0xff) == 0)
quot++;
if (up->capabilities & UART_CAP_FIFO && port->fifosize > 1) { if (up->capabilities & UART_CAP_FIFO && port->fifosize > 1) {
/* NOTE: If fifo_bug is not set, a user can set RX_trigger. */ /* NOTE: If fifo_bug is not set, a user can set RX_trigger. */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment