Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 32d8a368 authored by Quanyang Wang's avatar Quanyang Wang Committed by Greg Kroah-Hartman
Browse files

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



[ Upstream commit 26cfc0dbe43aae60dc03af27077775244f26c167 ]

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>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 4206dbc9

drivers/spi/spi-zynq-qspi.c

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

	}
@@ -551,7 +551,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;

	}
@@ -567,7 +567,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;
@@ -591,7 +591,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;

	}