Commit eb175e06 authored Mar 28, 2022 by Kamal Dasu Committed by Greg Kroah-Hartman Apr 15, 2022

spi: bcm-qspi: fix MSPI only access with bcm_qspi_exec_mem_op()



[ Upstream commit 2c7d1b281286c46049cd22b43435cecba560edde ]

This fixes case where MSPI controller is used to access spi-nor
flash and BSPI block is not present.

Fixes: 5f195ee7 ("spi: bcm-qspi: Implement the spi_mem interface")
Signed-off-by: Kamal Dasu <kdasu.kdev@gmail.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Link: https://lore.kernel.org/r/20220328142442.7553-1-kdasu.kdev@gmail.com


Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

parent 034a92c6

drivers/spi/spi-bcm-qspi.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -960,7 +960,7 @@ static int bcm_qspi_exec_mem_op(struct spi_mem *mem,
		addr = op->addr.val;
		len = op->data.nbytes;

		if (bcm_qspi_bspi_ver_three(qspi) == true) {
		if (has_bspi(qspi) && bcm_qspi_bspi_ver_three(qspi) == true) {
		/*
		* The address coming into this function is a raw flash offset.
		* But for BSPI <= V3, we need to convert it to a remapped BSPI
		@@ -979,7 +979,7 @@ static int bcm_qspi_exec_mem_op(struct spi_mem *mem,
		len < 4)
		mspi_read = true;

		if (mspi_read)
		if (!has_bspi(qspi) \|\| mspi_read)
		return bcm_qspi_mspi_exec_mem_op(spi, op);

		ret = bcm_qspi_bspi_set_mode(qspi, op, 0);