Skip to content

Commit 2e6bbfe

Browse files
LorenzoBianconibroonie
authored andcommitted
spi: airoha: fix dirmap_{read,write} operations
SPI_NFI_READ_FROM_CACHE_DONE bit must be written at the end of dirmap_read operation even if it is already set. In the same way, SPI_NFI_LOAD_TO_CACHE_DONE bit must be written at the end of dirmap_write operation even if it is already set. For this reason use regmap_write_bits() instead of regmap_set_bits(). This patch fixes mtd_pagetest kernel module test. Fixes: a403997 ("spi: airoha: add SPI-NAND Flash controller driver") Tested-by: Christian Marangi <ansuelsmth@gmail.com> Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org> Link: https://patch.msgid.link/20240913-airoha-spi-fixes-v1-1-de2e74ed4664@kernel.org Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent 07f1eb7 commit 2e6bbfe

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

drivers/spi/spi-airoha-snfi.c

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -739,8 +739,13 @@ static ssize_t airoha_snand_dirmap_read(struct spi_mem_dirmap_desc *desc,
739739
if (err)
740740
return err;
741741

742-
err = regmap_set_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_SNF_STA_CTL1,
743-
SPI_NFI_READ_FROM_CACHE_DONE);
742+
/*
743+
* SPI_NFI_READ_FROM_CACHE_DONE bit must be written at the end
744+
* of dirmap_read operation even if it is already set.
745+
*/
746+
err = regmap_write_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_SNF_STA_CTL1,
747+
SPI_NFI_READ_FROM_CACHE_DONE,
748+
SPI_NFI_READ_FROM_CACHE_DONE);
744749
if (err)
745750
return err;
746751

@@ -870,8 +875,13 @@ static ssize_t airoha_snand_dirmap_write(struct spi_mem_dirmap_desc *desc,
870875
if (err)
871876
return err;
872877

873-
err = regmap_set_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_SNF_STA_CTL1,
874-
SPI_NFI_LOAD_TO_CACHE_DONE);
878+
/*
879+
* SPI_NFI_LOAD_TO_CACHE_DONE bit must be written at the end
880+
* of dirmap_write operation even if it is already set.
881+
*/
882+
err = regmap_write_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_SNF_STA_CTL1,
883+
SPI_NFI_LOAD_TO_CACHE_DONE,
884+
SPI_NFI_LOAD_TO_CACHE_DONE);
875885
if (err)
876886
return err;
877887

0 commit comments

Comments
 (0)