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: a403997c1201 ("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>

diff --git a/drivers/spi/spi-airoha-snfi.c b/drivers/spi/spi-airoha-snfi.c
index 9d97ec98881cc91c9d619b074a5a2a5877e5728c..be3e4ac42153e91b9cf47c0ed7128768d675a70b 100644 (file)
--- a/drivers/spi/spi-airoha-snfi.c
+++ b/drivers/spi/spi-airoha-snfi.c
@@ -739,8 +739,13 @@ static ssize_t airoha_snand_dirmap_read(struct spi_mem_dirmap_desc *desc,
        if (err)
                return err;
 
-       err = regmap_set_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_SNF_STA_CTL1,
-                             SPI_NFI_READ_FROM_CACHE_DONE);
+       /*
+        * SPI_NFI_READ_FROM_CACHE_DONE bit must be written at the end
+        * of dirmap_read operation even if it is already set.
+        */
+       err = regmap_write_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_SNF_STA_CTL1,
+                               SPI_NFI_READ_FROM_CACHE_DONE,
+                               SPI_NFI_READ_FROM_CACHE_DONE);
        if (err)
                return err;
 
@@ -870,8 +875,13 @@ static ssize_t airoha_snand_dirmap_write(struct spi_mem_dirmap_desc *desc,
        if (err)
                return err;
 
-       err = regmap_set_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_SNF_STA_CTL1,
-                             SPI_NFI_LOAD_TO_CACHE_DONE);
+       /*
+        * SPI_NFI_LOAD_TO_CACHE_DONE bit must be written at the end
+        * of dirmap_write operation even if it is already set.
+        */
+       err = regmap_write_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_SNF_STA_CTL1,
+                               SPI_NFI_LOAD_TO_CACHE_DONE,
+                               SPI_NFI_LOAD_TO_CACHE_DONE);
        if (err)
                return err;