Unverified Commit 26cfc0db authored by Quanyang Wang's avatar Quanyang Wang Committed by Mark Brown
Browse files

spi: spi-zynq-qspi: use wait_for_completion_timeout to make zynq_qspi_exec_mem_op not interruptible 



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: 67dca5e5 ("spi: spi-mem: Add support for Zynq QSPI controller")
Signed-off-by: default avatarQuanyang Wang <quanyang.wang@windriver.com>
Link: https://lore.kernel.org/r/20210826005930.20572-1-quanyang.wang@windriver.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 0f887ac8

drivers/spi/spi-zynq-qspi.c

+4 −4
Original line number Diff line number Diff line
@@ -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;

	}