Unverified Commit 2e6bbfe7 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Mark Brown
Browse files

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: a403997c ("spi: airoha: add SPI-NAND Flash controller driver")
Tested-by: default avatarChristian Marangi <ansuelsmth@gmail.com>
Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Link: https://patch.msgid.link/20240913-airoha-spi-fixes-v1-1-de2e74ed4664@kernel.org


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

drivers/spi/spi-airoha-snfi.c

+14 −4
Original line number Diff line number Diff line
@@ -739,7 +739,12 @@ 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 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,7 +875,12 @@ 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 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;