Unverified Commit 41d31093 authored by Quanyang Wang's avatar Quanyang Wang Committed by Mark Brown
Browse files

spi: spi-zynqmp-gqspi: fix incorrect operating mode in zynqmp_qspi_read_op 



When starting a read operation, we should call zynqmp_qspi_setuprxdma
first to set xqspi->mode according to xqspi->bytes_to_receive and
to calculate correct xqspi->dma_rx_bytes. Then in the function
zynqmp_qspi_fillgenfifo, generate the appropriate command with
operating mode and bytes to transfer, and fill the GENFIFO with
the command to perform the read operation.

Calling zynqmp_qspi_fillgenfifo before zynqmp_qspi_setuprxdma will
result in incorrect transfer length and operating mode. So change
the calling order to fix this issue.

Fixes: 1c26372e ("spi: spi-zynqmp-gqspi: Update driver to use spi-mem framework")
Signed-off-by: default avatarQuanyang Wang <quanyang.wang@windriver.com>
Reviewed-by: default avatarAmit Kumar Mahapatra <amit.kumar-mahapatra@xilinx.com>
Link: https://lore.kernel.org/r/20210408040223.23134-5-quanyang.wang@windriver.com


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

drivers/spi/spi-zynqmp-gqspi.c

+1 −1
Original line number Diff line number Diff line
@@ -827,8 +827,8 @@ static void zynqmp_qspi_write_op(struct zynqmp_qspi *xqspi, u8 tx_nbits, 
static void zynqmp_qspi_read_op(struct zynqmp_qspi *xqspi, u8 rx_nbits,

				u32 genfifoentry)

{

	zynqmp_qspi_fillgenfifo(xqspi, rx_nbits, genfifoentry);

	zynqmp_qspi_setuprxdma(xqspi);

	zynqmp_qspi_fillgenfifo(xqspi, rx_nbits, genfifoentry);

}



/**