]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
spi: spi-qpic-snand: handle 'use_ecc' parameter of qcom_spi_config_cw_read()
authorGabor Juhos <j4g8y7@gmail.com>
Fri, 8 Aug 2025 17:15:01 +0000 (19:15 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 13 Nov 2025 20:36:46 +0000 (15:36 -0500)
[ Upstream commit 9c45f95222beecd6a284fd1284d54dd7a772cf59 ]

During raw read, neither the status of the ECC correction nor the erased
state of the codeword gets checked by the qcom_spi_read_cw_raw() function,
so in case of raw access reading the corresponding registers via DMA is
superfluous.

Extend the qcom_spi_config_cw_read() function to evaluate the existing
(but actually unused) 'use_ecc' parameter, and configure reading only
the flash status register when ECC is not used.

With the change, the code gets in line with the corresponding part of
the config_nand_cw_read() function in the qcom_nandc driver.

Signed-off-by: Gabor Juhos <j4g8y7@gmail.com>
Reviewed-by: Konrad Dybcio <konrad.dybcio@oss.qualcomm.com>
Link: https://patch.msgid.link/20250808-qpic-snand-handle-use_ecc-v1-1-67289fbb5e2f@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/spi/spi-qpic-snand.c

index 780abb967822a5ac59b799cf5b942a935ea6deee..5a247eebde4d9b03ba700e18bdd3b6f94667e928 100644 (file)
@@ -494,9 +494,14 @@ qcom_spi_config_cw_read(struct qcom_nand_controller *snandc, bool use_ecc, int c
        qcom_write_reg_dma(snandc, &snandc->regs->cmd, NAND_FLASH_CMD, 1, NAND_BAM_NEXT_SGL);
        qcom_write_reg_dma(snandc, &snandc->regs->exec, NAND_EXEC_CMD, 1, NAND_BAM_NEXT_SGL);
 
-       qcom_read_reg_dma(snandc, NAND_FLASH_STATUS, 2, 0);
-       qcom_read_reg_dma(snandc, NAND_ERASED_CW_DETECT_STATUS, 1,
-                         NAND_BAM_NEXT_SGL);
+       if (use_ecc) {
+               qcom_read_reg_dma(snandc, NAND_FLASH_STATUS, 2, 0);
+               qcom_read_reg_dma(snandc, NAND_ERASED_CW_DETECT_STATUS, 1,
+                                 NAND_BAM_NEXT_SGL);
+       } else {
+               qcom_read_reg_dma(snandc, NAND_FLASH_STATUS, 1,
+                                 NAND_BAM_NEXT_SGL);
+       }
 }
 
 static int qcom_spi_block_erase(struct qcom_nand_controller *snandc)