2022-05-02 13:36:33

by Shubhrajyoti Datta

Subject: [PATCH 6/7] serial: uartps: Fix the ignore_status

Currently the ignore_status is not considered in the isr.
Also the ignore_status is not updated in the set_termios.

Signed-off-by: Shubhrajyoti Datta <[email protected]>
---
drivers/tty/serial/xilinx_uartps.c | 4 ++++
1 file changed, 4 insertions(+)

diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
index 289d70914956..81ba69c57716 100644
--- a/drivers/tty/serial/xilinx_uartps.c
+++ b/drivers/tty/serial/xilinx_uartps.c
@@ -375,6 +375,8 @@ static irqreturn_t cdns_uart_isr(int irq, void *dev_id)
isrstatus &= ~CDNS_UART_IXR_TXEMPTY;
}

+ isrstatus &= port->read_status_mask;
+ isrstatus &= ~port->ignore_status_mask;
/*
* Skip RX processing if RX is disabled as RXEMPTY will never be set
* as read bytes will not be removed from the FIFO.
@@ -1583,6 +1585,8 @@ static int cdns_uart_probe(struct platform_device *pdev)
port->dev = &pdev->dev;
port->uartclk = clk_get_rate(cdns_uart_data->uartclk);
port->private_data = cdns_uart_data;
+ port->read_status_mask = CDNS_UART_IXR_TXEMPTY | CDNS_UART_IXR_RXTRIG |
+ CDNS_UART_IXR_OVERRUN | CDNS_UART_IXR_TOUT;
cdns_uart_data->port = port;
platform_set_drvdata(pdev, port);

--
2.25.1

2022-05-09 05:50:44

by Greg Kroah-Hartman

Subject: Re: [PATCH 6/7] serial: uartps: Fix the ignore_status

On Fri, Apr 29, 2022 at 01:44:21PM +0530, Shubhrajyoti Datta wrote:
> Currently the ignore_status is not considered in the isr.
> Also the ignore_status is not updated in the set_termios.

When you say "also" that's a huge hint that it should be a separate
patch.

>
> Signed-off-by: Shubhrajyoti Datta <[email protected]>
> ---
> drivers/tty/serial/xilinx_uartps.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/drivers/tty/serial/xilinx_uartps.c b/drivers/tty/serial/xilinx_uartps.c
> index 289d70914956..81ba69c57716 100644
> --- a/drivers/tty/serial/xilinx_uartps.c
> +++ b/drivers/tty/serial/xilinx_uartps.c
> @@ -375,6 +375,8 @@ static irqreturn_t cdns_uart_isr(int irq, void *dev_id)
> isrstatus &= ~CDNS_UART_IXR_TXEMPTY;
> }
>
> + isrstatus &= port->read_status_mask;
> + isrstatus &= ~port->ignore_status_mask;
> /*
> * Skip RX processing if RX is disabled as RXEMPTY will never be set
> * as read bytes will not be removed from the FIFO.
> @@ -1583,6 +1585,8 @@ static int cdns_uart_probe(struct platform_device *pdev)
> port->dev = &pdev->dev;
> port->uartclk = clk_get_rate(cdns_uart_data->uartclk);
> port->private_data = cdns_uart_data;
> + port->read_status_mask = CDNS_UART_IXR_TXEMPTY | CDNS_UART_IXR_RXTRIG |
> + CDNS_UART_IXR_OVERRUN | CDNS_UART_IXR_TOUT;

You are doing two different things here, please make this two different
patches.

Also, what commit id does this fix? Does it need to be backported?

thanks,

greg k-h