| Message ID | 1350396562-32579-1-git-send-email-balbi@ti.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
* Felipe Balbi <balbi@ti.com> [121016 07:16]: > This reverts commit 957ee7270d632245b43f6feb0e70d9a5e9ea6cf6 > (serial: omap: fix software flow control). > > As Russell has pointed out, that commit isn't fixing > Software Flow Control at all, and it actually makes > it even more broken. > > It was agreed to revert this commit and use Russell's > latest UART patches instead. > > Cc: Russell King <linux@arm.linux.org.uk> > Signed-off-by: Felipe Balbi <balbi@ti.com> This seems like the best way to go for the -rc series: Acked-by: Tony Lindgren <tony@atomide.com>
Hi Greg, On Tue, Oct 16, 2012 at 08:13:59AM -0700, Tony Lindgren wrote: > * Felipe Balbi <balbi@ti.com> [121016 07:16]: > > This reverts commit 957ee7270d632245b43f6feb0e70d9a5e9ea6cf6 > > (serial: omap: fix software flow control). > > > > As Russell has pointed out, that commit isn't fixing > > Software Flow Control at all, and it actually makes > > it even more broken. > > > > It was agreed to revert this commit and use Russell's > > latest UART patches instead. > > > > Cc: Russell King <linux@arm.linux.org.uk> > > Signed-off-by: Felipe Balbi <balbi@ti.com> > > This seems like the best way to go for the -rc series: > > Acked-by: Tony Lindgren <tony@atomide.com> Any chance you can pick this one up for v3.7-rc3 ? cheers
On Wed, Oct 24, 2012 at 11:57:42AM -0700, Greg KH wrote: > On Wed, Oct 24, 2012 at 01:02:55PM +0300, Felipe Balbi wrote: > > Hi Greg, > > > > On Tue, Oct 16, 2012 at 08:13:59AM -0700, Tony Lindgren wrote: > > > * Felipe Balbi <balbi@ti.com> [121016 07:16]: > > > > This reverts commit 957ee7270d632245b43f6feb0e70d9a5e9ea6cf6 > > > > (serial: omap: fix software flow control). > > > > > > > > As Russell has pointed out, that commit isn't fixing > > > > Software Flow Control at all, and it actually makes > > > > it even more broken. > > > > > > > > It was agreed to revert this commit and use Russell's > > > > latest UART patches instead. > > > > > > > > Cc: Russell King <linux@arm.linux.org.uk> > > > > Signed-off-by: Felipe Balbi <balbi@ti.com> > > > > > > This seems like the best way to go for the -rc series: > > > > > > Acked-by: Tony Lindgren <tony@atomide.com> > > > > Any chance you can pick this one up for v3.7-rc3 ? > > Now queued up, sorry for the delay. no problems, thanks a lot.
On Wed, Oct 24, 2012 at 01:02:55PM +0300, Felipe Balbi wrote: > Hi Greg, > > On Tue, Oct 16, 2012 at 08:13:59AM -0700, Tony Lindgren wrote: > > * Felipe Balbi <balbi@ti.com> [121016 07:16]: > > > This reverts commit 957ee7270d632245b43f6feb0e70d9a5e9ea6cf6 > > > (serial: omap: fix software flow control). > > > > > > As Russell has pointed out, that commit isn't fixing > > > Software Flow Control at all, and it actually makes > > > it even more broken. > > > > > > It was agreed to revert this commit and use Russell's > > > latest UART patches instead. > > > > > > Cc: Russell King <linux@arm.linux.org.uk> > > > Signed-off-by: Felipe Balbi <balbi@ti.com> > > > > This seems like the best way to go for the -rc series: > > > > Acked-by: Tony Lindgren <tony@atomide.com> > > Any chance you can pick this one up for v3.7-rc3 ? Now queued up, sorry for the delay. greg k-h
On 16.10.2012 16:09, Felipe Balbi wrote: > This reverts commit 957ee7270d632245b43f6feb0e70d9a5e9ea6cf6 > (serial: omap: fix software flow control). > > As Russell has pointed out, that commit isn't fixing > Software Flow Control at all, and it actually makes > it even more broken. > > It was agreed to revert this commit and use Russell's > latest UART patches instead. > > Cc: Russell King <linux@arm.linux.org.uk> > Signed-off-by: Felipe Balbi <balbi@ti.com> since 957ee7270d632245b43f6feb0e70d9a5e9ea6cf6 made it into stable (at least 3.4) I think it would be good decision to also apply this revert to stable until a working solution exists. Best regards Andreas Bießmann > --- > > Hi Greg, > > you might prefer to do the revert yourself, in that case just > revert commit 957ee7270d632245b43f6feb0e70d9a5e9ea6cf6. > > thanks > > arch/arm/plat-omap/include/plat/omap-serial.h | 4 ++-- > drivers/tty/serial/omap-serial.c | 12 ++++++------ > 2 files changed, 8 insertions(+), 8 deletions(-) > > diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h > index f4a4cd0..1957a85 100644 > --- a/arch/arm/plat-omap/include/plat/omap-serial.h > +++ b/arch/arm/plat-omap/include/plat/omap-serial.h > @@ -40,10 +40,10 @@ > #define OMAP_UART_WER_MOD_WKUP 0X7F > > /* Enable XON/XOFF flow control on output */ > -#define OMAP_UART_SW_TX 0x8 > +#define OMAP_UART_SW_TX 0x04 > > /* Enable XON/XOFF flow control on input */ > -#define OMAP_UART_SW_RX 0x2 > +#define OMAP_UART_SW_RX 0x04 > > #define OMAP_UART_SYSC_RESET 0X07 > #define OMAP_UART_TCR_TRIG 0X0F > diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c > index 6ede6fd..6d3d26a 100644 > --- a/drivers/tty/serial/omap-serial.c > +++ b/drivers/tty/serial/omap-serial.c > @@ -671,19 +671,19 @@ serial_omap_configure_xonxoff > > /* > * IXON Flag: > - * Flow control for OMAP.TX > - * OMAP.RX should listen for XON/XOFF > + * Enable XON/XOFF flow control on output. > + * Transmit XON1, XOFF1 > */ > if (termios->c_iflag & IXON) > - up->efr |= OMAP_UART_SW_RX; > + up->efr |= OMAP_UART_SW_TX; > > /* > * IXOFF Flag: > - * Flow control for OMAP.RX > - * OMAP.TX should send XON/XOFF > + * Enable XON/XOFF flow control on input. > + * Receiver compares XON1, XOFF1. > */ > if (termios->c_iflag & IXOFF) > - up->efr |= OMAP_UART_SW_TX; > + up->efr |= OMAP_UART_SW_RX; > > serial_out(up, UART_EFR, up->efr | UART_EFR_ECB); > serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A); >
On Wed, Nov 07, 2012 at 10:56:59AM +0100, Andreas Bießmann wrote: > On 16.10.2012 16:09, Felipe Balbi wrote: > > This reverts commit 957ee7270d632245b43f6feb0e70d9a5e9ea6cf6 > > (serial: omap: fix software flow control). > > > > As Russell has pointed out, that commit isn't fixing > > Software Flow Control at all, and it actually makes > > it even more broken. > > > > It was agreed to revert this commit and use Russell's > > latest UART patches instead. > > > > Cc: Russell King <linux@arm.linux.org.uk> > > Signed-off-by: Felipe Balbi <balbi@ti.com> > > since 957ee7270d632245b43f6feb0e70d9a5e9ea6cf6 made it into stable (at > least 3.4) I think it would be good decision to also apply this revert > to stable until a working solution exists. Now queued up for the stable releases, thanks. greg k-h
diff --git a/arch/arm/plat-omap/include/plat/omap-serial.h b/arch/arm/plat-omap/include/plat/omap-serial.h index f4a4cd0..1957a85 100644 --- a/arch/arm/plat-omap/include/plat/omap-serial.h +++ b/arch/arm/plat-omap/include/plat/omap-serial.h @@ -40,10 +40,10 @@ #define OMAP_UART_WER_MOD_WKUP 0X7F /* Enable XON/XOFF flow control on output */ -#define OMAP_UART_SW_TX 0x8 +#define OMAP_UART_SW_TX 0x04 /* Enable XON/XOFF flow control on input */ -#define OMAP_UART_SW_RX 0x2 +#define OMAP_UART_SW_RX 0x04 #define OMAP_UART_SYSC_RESET 0X07 #define OMAP_UART_TCR_TRIG 0X0F diff --git a/drivers/tty/serial/omap-serial.c b/drivers/tty/serial/omap-serial.c index 6ede6fd..6d3d26a 100644 --- a/drivers/tty/serial/omap-serial.c +++ b/drivers/tty/serial/omap-serial.c @@ -671,19 +671,19 @@ serial_omap_configure_xonxoff /* * IXON Flag: - * Flow control for OMAP.TX - * OMAP.RX should listen for XON/XOFF + * Enable XON/XOFF flow control on output. + * Transmit XON1, XOFF1 */ if (termios->c_iflag & IXON) - up->efr |= OMAP_UART_SW_RX; + up->efr |= OMAP_UART_SW_TX; /* * IXOFF Flag: - * Flow control for OMAP.RX - * OMAP.TX should send XON/XOFF + * Enable XON/XOFF flow control on input. + * Receiver compares XON1, XOFF1. */ if (termios->c_iflag & IXOFF) - up->efr |= OMAP_UART_SW_TX; + up->efr |= OMAP_UART_SW_RX; serial_out(up, UART_EFR, up->efr | UART_EFR_ECB); serial_out(up, UART_LCR, UART_LCR_CONF_MODE_A);
This reverts commit 957ee7270d632245b43f6feb0e70d9a5e9ea6cf6 (serial: omap: fix software flow control). As Russell has pointed out, that commit isn't fixing Software Flow Control at all, and it actually makes it even more broken. It was agreed to revert this commit and use Russell's latest UART patches instead. Cc: Russell King <linux@arm.linux.org.uk> Signed-off-by: Felipe Balbi <balbi@ti.com> --- Hi Greg, you might prefer to do the revert yourself, in that case just revert commit 957ee7270d632245b43f6feb0e70d9a5e9ea6cf6. thanks arch/arm/plat-omap/include/plat/omap-serial.h | 4 ++-- drivers/tty/serial/omap-serial.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-)