2015-07-16 08:29:24

by Joerg Roedel

[permalink] [raw]
Subject: [PATCH] serial: 8250: Do XR17V35X specific wakeup in serial8250_do_startup

From: Joerg Roedel <[email protected]>

The XR17V35X UART needs the ECB bit set in its XR_EFR
register to enable access to IER [7:5], ISR [5:4], FCR[5:4],
MCR[7:5], and MSR [7:0].

Also reset the IER register to mask interrupts after access
to all bits of this register has been enabled.

This makes my 8-port XR17V35X working with the in-kernel
serial driver.

Cc: Peter Hurley <[email protected]>
Cc: Michael Welling <[email protected]>
Cc: Joe Schultz <[email protected]>
Signed-off-by: Joerg Roedel <[email protected]>
---
drivers/tty/serial/8250/8250_core.c | 15 +++++++++++++++
1 file changed, 15 insertions(+)

diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
index 37fff12..4124a91 100644
--- a/drivers/tty/serial/8250/8250_core.c
+++ b/drivers/tty/serial/8250/8250_core.c
@@ -2164,6 +2164,21 @@ int serial8250_do_startup(struct uart_port *port)
*/
enable_rsa(up);
#endif
+
+ if (port->type == PORT_XR17V35X) {
+ /*
+ * First enable access to IER [7:5], ISR [5:4], FCR [5:4],
+ * MCR [7:5] and MSR [7:0]
+ */
+ serial_port_out(port, UART_XR_EFR, UART_EFR_ECB);
+
+ /*
+ * Make sure all interrups are masked until initialization is
+ * complete and the FIFOs are cleared
+ */
+ serial_port_out(port, UART_IER, 0);
+ }
+
/*
* Clear the FIFO buffers and disable them.
* (they will be reenabled in set_termios())
--
1.9.1


2015-07-16 08:56:01

by Michael Welling

[permalink] [raw]
Subject: Re: [PATCH] serial: 8250: Do XR17V35X specific wakeup in serial8250_do_startup

On Thu, Jul 16, 2015 at 10:29:13AM +0200, Joerg Roedel wrote:
> From: Joerg Roedel <[email protected]>
>
> The XR17V35X UART needs the ECB bit set in its XR_EFR
> register to enable access to IER [7:5], ISR [5:4], FCR[5:4],
> MCR[7:5], and MSR [7:0].
>
> Also reset the IER register to mask interrupts after access
> to all bits of this register has been enabled.
>
> This makes my 8-port XR17V35X working with the in-kernel
> serial driver.
>
> Cc: Peter Hurley <[email protected]>
> Cc: Michael Welling <[email protected]>
> Cc: Joe Schultz <[email protected]>
> Signed-off-by: Joerg Roedel <[email protected]>
> ---
> drivers/tty/serial/8250/8250_core.c | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
> index 37fff12..4124a91 100644
> --- a/drivers/tty/serial/8250/8250_core.c
> +++ b/drivers/tty/serial/8250/8250_core.c
> @@ -2164,6 +2164,21 @@ int serial8250_do_startup(struct uart_port *port)
> */
> enable_rsa(up);
> #endif
> +
> + if (port->type == PORT_XR17V35X) {
> + /*
> + * First enable access to IER [7:5], ISR [5:4], FCR [5:4],
> + * MCR [7:5] and MSR [7:0]
> + */
> + serial_port_out(port, UART_XR_EFR, UART_EFR_ECB);
> +
> + /*
> + * Make sure all interrups are masked until initialization is
> + * complete and the FIFOs are cleared
> + */
> + serial_port_out(port, UART_IER, 0);
> + }
> +

Reviewed-by: Michael Welling <[email protected]>

> /*
> * Clear the FIFO buffers and disable them.
> * (they will be reenabled in set_termios())
> --
> 1.9.1
>

2015-07-17 13:34:45

by Peter Hurley

[permalink] [raw]
Subject: Re: [PATCH] serial: 8250: Do XR17V35X specific wakeup in serial8250_do_startup

On 07/16/2015 04:29 AM, Joerg Roedel wrote:
> From: Joerg Roedel <[email protected]>
>
> The XR17V35X UART needs the ECB bit set in its XR_EFR
> register to enable access to IER [7:5], ISR [5:4], FCR[5:4],
> MCR[7:5], and MSR [7:0].
>
> Also reset the IER register to mask interrupts after access
> to all bits of this register has been enabled.
>
> This makes my 8-port XR17V35X working with the in-kernel
> serial driver.

Reviewed-by: Peter Hurley <[email protected]>

Also, would you please find out what bits are set in the IER
that this fixes and let me know? I don't have this hardware.

Regards,
Peter Hurley

> Cc: Peter Hurley <[email protected]>
> Cc: Michael Welling <[email protected]>
> Cc: Joe Schultz <[email protected]>
> Signed-off-by: Joerg Roedel <[email protected]>
> ---
> drivers/tty/serial/8250/8250_core.c | 15 +++++++++++++++
> 1 file changed, 15 insertions(+)
>
> diff --git a/drivers/tty/serial/8250/8250_core.c b/drivers/tty/serial/8250/8250_core.c
> index 37fff12..4124a91 100644
> --- a/drivers/tty/serial/8250/8250_core.c
> +++ b/drivers/tty/serial/8250/8250_core.c
> @@ -2164,6 +2164,21 @@ int serial8250_do_startup(struct uart_port *port)
> */
> enable_rsa(up);
> #endif
> +
> + if (port->type == PORT_XR17V35X) {
> + /*
> + * First enable access to IER [7:5], ISR [5:4], FCR [5:4],
> + * MCR [7:5] and MSR [7:0]
> + */
> + serial_port_out(port, UART_XR_EFR, UART_EFR_ECB);
> +
> + /*
> + * Make sure all interrups are masked until initialization is
> + * complete and the FIFOs are cleared
> + */
> + serial_port_out(port, UART_IER, 0);
> + }
> +
> /*
> * Clear the FIFO buffers and disable them.
> * (they will be reenabled in set_termios())
>

2015-07-28 07:21:04

by Joerg Roedel

[permalink] [raw]
Subject: Re: [PATCH] serial: 8250: Do XR17V35X specific wakeup in serial8250_do_startup

Hi Peter,

On Fri, Jul 17, 2015 at 09:34:31AM -0400, Peter Hurley wrote:
> On 07/16/2015 04:29 AM, Joerg Roedel wrote:
> > From: Joerg Roedel <[email protected]>
> >
> > The XR17V35X UART needs the ECB bit set in its XR_EFR
> > register to enable access to IER [7:5], ISR [5:4], FCR[5:4],
> > MCR[7:5], and MSR [7:0].
> >
> > Also reset the IER register to mask interrupts after access
> > to all bits of this register has been enabled.
> >
> > This makes my 8-port XR17V35X working with the in-kernel
> > serial driver.
>
> Reviewed-by: Peter Hurley <[email protected]>

Thanks for your review.

> Also, would you please find out what bits are set in the IER
> that this fixes and let me know? I don't have this hardware.

Unfortunatly I put the card back into a production machine and can't
easily check this anymore. But I'll let you know when I update the
kernel on the box next time.


Joerg