2009-10-28 20:37:25

by Manuel Lauss

Subject: [PATCH] serial 8250: fixes for Alchemy uarts.

Limit the amount of address space claimed for Alchemy serial ports
to 0x1000. On the Au1300, ports are only 0x1000 apart, and the
registers only extend to 0x110 at most on all supported alchemy models.

On the Au1300 the autodetect logic no longer works and this makes
it necessary to specify the port type through platform data. Because
of this the MSR quirk needs to be moved outside the autoconfig()
function which will no longer be called when UPF_FIXED_TYPE is
specified.

Signed-off-by: Manuel Lauss <[email protected]>
---
drivers/serial/8250.c | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/serial/8250.c b/drivers/serial/8250.c
index b1ae774..9538e5b 100644
--- a/drivers/serial/8250.c
+++ b/drivers/serial/8250.c
@@ -1214,12 +1214,6 @@ static void autoconfig(struct uart_8250_port *up, unsigned int probeflags)
}
#endif

-#ifdef CONFIG_SERIAL_8250_AU1X00
- /* if access method is AU, it is a 16550 with a quirk */
- if (up->port.type == PORT_16550A && up->port.iotype == UPIO_AU)
- up->bugs |= UART_BUG_NOMSR;
-#endif
-
serial_outp(up, UART_LCR, save_lcr);

if (up->capabilities != uart_config[up->port.type].flags) {
@@ -2429,7 +2423,7 @@ serial8250_pm(struct uart_port *port, unsigned int state,
static unsigned int serial8250_port_size(struct uart_8250_port *pt)
{
if (pt->port.iotype == UPIO_AU)
- return 0x100000;
+ return 0x1000;
#ifdef CONFIG_ARCH_OMAP
if (is_omap_port(pt))
return 0x16 << pt->port.regshift;
@@ -2586,6 +2580,13 @@ static void serial8250_config_port(struct uart_port *port, int flags)

if (flags & UART_CONFIG_TYPE)
autoconfig(up, probeflags);
+
+#ifdef CONFIG_SERIAL_8250_AU1X00
+ /* if access method is AU, it is a 16550 with a quirk */
+ if (up->port.type == PORT_16550A && up->port.iotype == UPIO_AU)
+ up->bugs |= UART_BUG_NOMSR;
+#endif
+
if (up->port.type != PORT_UNKNOWN && flags & UART_CONFIG_IRQ)
autoconfig_irq(up);

--
1.6.5

2009-11-01 07:07:49

by Ralf Baechle

Subject: Re: [PATCH] serial 8250: fixes for Alchemy uarts.

On Wed, Oct 28, 2009 at 09:37:28PM +0100, Manuel Lauss wrote:

> Limit the amount of address space claimed for Alchemy serial ports
> to 0x1000. On the Au1300, ports are only 0x1000 apart, and the
> registers only extend to 0x110 at most on all supported alchemy models.
>
> On the Au1300 the autodetect logic no longer works and this makes
> it necessary to specify the port type through platform data. Because
> of this the MSR quirk needs to be moved outside the autoconfig()
> function which will no longer be called when UPF_FIXED_TYPE is
> specified.

Andrew,

looks sane to me. Since this is a MIPS patch I'd like to funnel it through
the MIPS tree. Ok?

Ralf

2009-11-01 07:16:43

by Andrew Morton

Subject: Re: [PATCH] serial 8250: fixes for Alchemy uarts.

On Sun, 1 Nov 2009 08:09:00 +0100 Ralf Baechle <[email protected]> wrote:

> On Wed, Oct 28, 2009 at 09:37:28PM +0100, Manuel Lauss wrote:
>
> > Limit the amount of address space claimed for Alchemy serial ports
> > to 0x1000. On the Au1300, ports are only 0x1000 apart, and the
> > registers only extend to 0x110 at most on all supported alchemy models.
> >
> > On the Au1300 the autodetect logic no longer works and this makes
> > it necessary to specify the port type through platform data. Because
> > of this the MSR quirk needs to be moved outside the autoconfig()
> > function which will no longer be called when UPF_FIXED_TYPE is
> > specified.
>
> Andrew,
>
> looks sane to me. Since this is a MIPS patch I'd like to funnel it through
> the MIPS tree. Ok?

Sure.