All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH v2] tty: serial: msm_serial: Fix XON/XOFF
@ 2019-05-20 18:38 Jorge Ramirez-Ortiz
  2019-05-20 18:50 ` Bjorn Andersson
  2019-05-21 10:31 ` Vinod Koul
  0 siblings, 2 replies; 5+ messages in thread
From: Jorge Ramirez-Ortiz @ 2019-05-20 18:38 UTC (permalink / raw)
  To: jorge.ramirez-ortiz, agross, david.brown, gregkh, sboyd, bjorn.andersson
  Cc: jslaby, keescook, anton, ccross, tony.luck, linux-arm-msm,
	linux-serial, linux-kernel

When the tty layer requests the uart to throttle, the current code
executing in msm_serial will trigger "Bad mode in Error Handler" and
generate an invalid stack frame in pstore before rebooting (that is if
pstore is indeed configured: otherwise the user shall just notice a
reboot with no further information dumped to the console).

This patch replaces the PIO byte accessor with the word accessor
already used in PIO mode.

Fixes: 68252424a7c7 ("tty: serial: msm: Support big-endian CPUs")
Cc: stable@vger.kernel.org
Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
---
 drivers/tty/serial/msm_serial.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
index 109096033bb1..23833ad952ba 100644
--- a/drivers/tty/serial/msm_serial.c
+++ b/drivers/tty/serial/msm_serial.c
@@ -860,6 +860,7 @@ static void msm_handle_tx(struct uart_port *port)
 	struct circ_buf *xmit = &msm_port->uart.state->xmit;
 	struct msm_dma *dma = &msm_port->tx_dma;
 	unsigned int pio_count, dma_count, dma_min;
+	char buf[4] = { 0 };
 	void __iomem *tf;
 	int err = 0;
 
@@ -869,10 +870,12 @@ static void msm_handle_tx(struct uart_port *port)
 		else
 			tf = port->membase + UART_TF;
 
+		buf[0] = port->x_char;
+
 		if (msm_port->is_uartdm)
 			msm_reset_dm_count(port, 1);
 
-		iowrite8_rep(tf, &port->x_char, 1);
+		iowrite32_rep(tf, buf, 1);
 		port->icount.tx++;
 		port->x_char = 0;
 		return;
-- 
2.21.0


^ permalink raw reply related	[flat|nested] 5+ messages in thread
* Re: [PATCH v2] tty: serial: msm_serial: Fix XON/XOFF
  2019-05-20 18:38 [PATCH v2] tty: serial: msm_serial: Fix XON/XOFF Jorge Ramirez-Ortiz
@ 2019-05-20 18:50 ` Bjorn Andersson
  2019-05-20 18:57   ` Jorge Ramirez
  2019-05-21 10:31 ` Vinod Koul
  1 sibling, 1 reply; 5+ messages in thread
From: Bjorn Andersson @ 2019-05-20 18:50 UTC (permalink / raw)
  To: Jorge Ramirez-Ortiz
  Cc: agross, david.brown, gregkh, sboyd, jslaby, keescook, anton,
	ccross, tony.luck, linux-arm-msm, linux-serial, linux-kernel

On Mon 20 May 11:38 PDT 2019, Jorge Ramirez-Ortiz wrote:

> When the tty layer requests the uart to throttle, the current code
> executing in msm_serial will trigger "Bad mode in Error Handler" and
> generate an invalid stack frame in pstore before rebooting (that is if
> pstore is indeed configured: otherwise the user shall just notice a
> reboot with no further information dumped to the console).
> 
> This patch replaces the PIO byte accessor with the word accessor
> already used in PIO mode.
> 
> Fixes: 68252424a7c7 ("tty: serial: msm: Support big-endian CPUs")
> Cc: stable@vger.kernel.org
> Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

You missed Stephen's

Reviewed-by: Stephen Boyd <swboyd@chromium.org>

Regards,
Bjorn

> ---
>  drivers/tty/serial/msm_serial.c | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
> index 109096033bb1..23833ad952ba 100644
> --- a/drivers/tty/serial/msm_serial.c
> +++ b/drivers/tty/serial/msm_serial.c
> @@ -860,6 +860,7 @@ static void msm_handle_tx(struct uart_port *port)
>  	struct circ_buf *xmit = &msm_port->uart.state->xmit;
>  	struct msm_dma *dma = &msm_port->tx_dma;
>  	unsigned int pio_count, dma_count, dma_min;
> +	char buf[4] = { 0 };
>  	void __iomem *tf;
>  	int err = 0;
>  
> @@ -869,10 +870,12 @@ static void msm_handle_tx(struct uart_port *port)
>  		else
>  			tf = port->membase + UART_TF;
>  
> +		buf[0] = port->x_char;
> +
>  		if (msm_port->is_uartdm)
>  			msm_reset_dm_count(port, 1);
>  
> -		iowrite8_rep(tf, &port->x_char, 1);
> +		iowrite32_rep(tf, buf, 1);
>  		port->icount.tx++;
>  		port->x_char = 0;
>  		return;
> -- 
> 2.21.0
> 

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH v2] tty: serial: msm_serial: Fix XON/XOFF
  2019-05-20 18:50 ` Bjorn Andersson
@ 2019-05-20 18:57   ` Jorge Ramirez
  2019-05-21 10:11     ` Greg KH
  0 siblings, 1 reply; 5+ messages in thread
From: Jorge Ramirez @ 2019-05-20 18:57 UTC (permalink / raw)
  To: Bjorn Andersson
  Cc: agross, david.brown, gregkh, sboyd, jslaby, keescook, anton,
	ccross, tony.luck, linux-arm-msm, linux-serial, linux-kernel

On 5/20/19 20:50, Bjorn Andersson wrote:
> On Mon 20 May 11:38 PDT 2019, Jorge Ramirez-Ortiz wrote:
> 
>> When the tty layer requests the uart to throttle, the current code
>> executing in msm_serial will trigger "Bad mode in Error Handler" and
>> generate an invalid stack frame in pstore before rebooting (that is if
>> pstore is indeed configured: otherwise the user shall just notice a
>> reboot with no further information dumped to the console).
>>
>> This patch replaces the PIO byte accessor with the word accessor
>> already used in PIO mode.
>>
>> Fixes: 68252424a7c7 ("tty: serial: msm: Support big-endian CPUs")
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
>> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> 
> You missed Stephen's
> 
> Reviewed-by: Stephen Boyd <swboyd@chromium.org>

argh sorry Stephen. can the maintainer add it when it gets merged or
shall I post V3?

> 
> Regards,
> Bjorn
> 
>> ---
>>  drivers/tty/serial/msm_serial.c | 5 ++++-
>>  1 file changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/tty/serial/msm_serial.c b/drivers/tty/serial/msm_serial.c
>> index 109096033bb1..23833ad952ba 100644
>> --- a/drivers/tty/serial/msm_serial.c
>> +++ b/drivers/tty/serial/msm_serial.c
>> @@ -860,6 +860,7 @@ static void msm_handle_tx(struct uart_port *port)
>>  	struct circ_buf *xmit = &msm_port->uart.state->xmit;
>>  	struct msm_dma *dma = &msm_port->tx_dma;
>>  	unsigned int pio_count, dma_count, dma_min;
>> +	char buf[4] = { 0 };
>>  	void __iomem *tf;
>>  	int err = 0;
>>  
>> @@ -869,10 +870,12 @@ static void msm_handle_tx(struct uart_port *port)
>>  		else
>>  			tf = port->membase + UART_TF;
>>  
>> +		buf[0] = port->x_char;
>> +
>>  		if (msm_port->is_uartdm)
>>  			msm_reset_dm_count(port, 1);
>>  
>> -		iowrite8_rep(tf, &port->x_char, 1);
>> +		iowrite32_rep(tf, buf, 1);
>>  		port->icount.tx++;
>>  		port->x_char = 0;
>>  		return;
>> -- 
>> 2.21.0
>>
> 


^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH v2] tty: serial: msm_serial: Fix XON/XOFF
  2019-05-20 18:57   ` Jorge Ramirez
@ 2019-05-21 10:11     ` Greg KH
  0 siblings, 0 replies; 5+ messages in thread
From: Greg KH @ 2019-05-21 10:11 UTC (permalink / raw)
  To: Jorge Ramirez
  Cc: Bjorn Andersson, agross, david.brown, sboyd, jslaby, keescook,
	anton, ccross, tony.luck, linux-arm-msm, linux-serial,
	linux-kernel

On Mon, May 20, 2019 at 08:57:39PM +0200, Jorge Ramirez wrote:
> On 5/20/19 20:50, Bjorn Andersson wrote:
> > On Mon 20 May 11:38 PDT 2019, Jorge Ramirez-Ortiz wrote:
> > 
> >> When the tty layer requests the uart to throttle, the current code
> >> executing in msm_serial will trigger "Bad mode in Error Handler" and
> >> generate an invalid stack frame in pstore before rebooting (that is if
> >> pstore is indeed configured: otherwise the user shall just notice a
> >> reboot with no further information dumped to the console).
> >>
> >> This patch replaces the PIO byte accessor with the word accessor
> >> already used in PIO mode.
> >>
> >> Fixes: 68252424a7c7 ("tty: serial: msm: Support big-endian CPUs")
> >> Cc: stable@vger.kernel.org
> >> Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
> >> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
> > 
> > You missed Stephen's
> > 
> > Reviewed-by: Stephen Boyd <swboyd@chromium.org>
> 
> argh sorry Stephen. can the maintainer add it when it gets merged or
> shall I post V3?

I'll fix it up...

^ permalink raw reply	[flat|nested] 5+ messages in thread
* Re: [PATCH v2] tty: serial: msm_serial: Fix XON/XOFF
  2019-05-20 18:38 [PATCH v2] tty: serial: msm_serial: Fix XON/XOFF Jorge Ramirez-Ortiz
  2019-05-20 18:50 ` Bjorn Andersson
@ 2019-05-21 10:31 ` Vinod Koul
  1 sibling, 0 replies; 5+ messages in thread
From: Vinod Koul @ 2019-05-21 10:31 UTC (permalink / raw)
  To: Jorge Ramirez-Ortiz
  Cc: agross, david.brown, gregkh, sboyd, bjorn.andersson, jslaby,
	keescook, anton, ccross, tony.luck, linux-arm-msm, linux-serial,
	linux-kernel

On 20-05-19, 20:38, Jorge Ramirez-Ortiz wrote:
> When the tty layer requests the uart to throttle, the current code
> executing in msm_serial will trigger "Bad mode in Error Handler" and
> generate an invalid stack frame in pstore before rebooting (that is if
> pstore is indeed configured: otherwise the user shall just notice a
> reboot with no further information dumped to the console).
> 
> This patch replaces the PIO byte accessor with the word accessor
> already used in PIO mode.
> 
> Fixes: 68252424a7c7 ("tty: serial: msm: Support big-endian CPUs")
> Cc: stable@vger.kernel.org
> Signed-off-by: Jorge Ramirez-Ortiz <jorge.ramirez-ortiz@linaro.org>
> Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>

Reviewed-by: Vinod Koul <vkoul@kernel.org>

-- 
~Vinod

^ permalink raw reply	[flat|nested] 5+ messages in thread
end of thread, other threads:[~2019-05-21 10:31 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-20 18:38 [PATCH v2] tty: serial: msm_serial: Fix XON/XOFF Jorge Ramirez-Ortiz
2019-05-20 18:50 ` Bjorn Andersson
2019-05-20 18:57   ` Jorge Ramirez
2019-05-21 10:11     ` Greg KH
2019-05-21 10:31 ` Vinod Koul

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.