Re: [PATCH] spi: spi-zynq-qspi: use wait_for_completion_timeout to make zynq_qspi_exec_mem_op not interruptible

[quanyang.wang]

ping.

On 7/30/21 11:17 AM, quanyang.wang@xxxxxxxxxxxxx wrote:
> From: Quanyang Wang <quanyang.wang@xxxxxxxxxxxxx>
>
> The function wait_for_completion_interruptible_timeout will return
> -ERESTARTSYS immediately when receiving SIGKILL signal which is sent
> by "jffs2_gcd_mtd" during umounting jffs2. This will break the SPI memory
> operation because the data transmitting may begin before the command or
> address transmitting completes. Use wait_for_completion_timeout to prevent
> the process from being interruptible.
>
> Fixes: 67dca5e580f1 ("spi: spi-mem: Add support for Zynq QSPI controller")
> Signed-off-by: Quanyang Wang <quanyang.wang@xxxxxxxxxxxxx>
> ---
>   drivers/spi/spi-zynq-qspi.c | 8 ++++----
>   1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/spi/spi-zynq-qspi.c b/drivers/spi/spi-zynq-qspi.c
> index 9262c6418463..cfa222c9bd5e 100644
> --- a/drivers/spi/spi-zynq-qspi.c
> +++ b/drivers/spi/spi-zynq-qspi.c
> @@ -545,7 +545,7 @@ static int zynq_qspi_exec_mem_op(struct spi_mem *mem,
>   		zynq_qspi_write_op(xqspi, ZYNQ_QSPI_FIFO_DEPTH, true);
>   		zynq_qspi_write(xqspi, ZYNQ_QSPI_IEN_OFFSET,
>   				ZYNQ_QSPI_IXR_RXTX_MASK);
> -		if (!wait_for_completion_interruptible_timeout(&xqspi->data_completion,
> +		if (!wait_for_completion_timeout(&xqspi->data_completion,
>   							       msecs_to_jiffies(1000)))
>   			err = -ETIMEDOUT;
>   	}
> @@ -563,7 +563,7 @@ static int zynq_qspi_exec_mem_op(struct spi_mem *mem,
>   		zynq_qspi_write_op(xqspi, ZYNQ_QSPI_FIFO_DEPTH, true);
>   		zynq_qspi_write(xqspi, ZYNQ_QSPI_IEN_OFFSET,
>   				ZYNQ_QSPI_IXR_RXTX_MASK);
> -		if (!wait_for_completion_interruptible_timeout(&xqspi->data_completion,
> +		if (!wait_for_completion_timeout(&xqspi->data_completion,
>   							       msecs_to_jiffies(1000)))
>   			err = -ETIMEDOUT;
>   	}
> @@ -579,7 +579,7 @@ static int zynq_qspi_exec_mem_op(struct spi_mem *mem,
>   		zynq_qspi_write_op(xqspi, ZYNQ_QSPI_FIFO_DEPTH, true);
>   		zynq_qspi_write(xqspi, ZYNQ_QSPI_IEN_OFFSET,
>   				ZYNQ_QSPI_IXR_RXTX_MASK);
> -		if (!wait_for_completion_interruptible_timeout(&xqspi->data_completion,
> +		if (!wait_for_completion_timeout(&xqspi->data_completion,
>   							       msecs_to_jiffies(1000)))
>   			err = -ETIMEDOUT;
>   
> @@ -603,7 +603,7 @@ static int zynq_qspi_exec_mem_op(struct spi_mem *mem,
>   		zynq_qspi_write_op(xqspi, ZYNQ_QSPI_FIFO_DEPTH, true);
>   		zynq_qspi_write(xqspi, ZYNQ_QSPI_IEN_OFFSET,
>   				ZYNQ_QSPI_IXR_RXTX_MASK);
> -		if (!wait_for_completion_interruptible_timeout(&xqspi->data_completion,
> +		if (!wait_for_completion_timeout(&xqspi->data_completion,
>   							       msecs_to_jiffies(1000)))
>   			err = -ETIMEDOUT;
>   	}