spi: airoha: switch back to non-dma mode in the case of error

[ Upstream commit 20d7b236b78c7ec685a22db5689b9c829975e0c3 ]

Current dirmap code does not switch back to non-dma mode in the case of
error. This is wrong.

This patch fixes dirmap read/write error path.

Fixes: a403997c12019 ("spi: airoha: add SPI-NAND Flash controller driver")
Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://patch.msgid.link/20251012121707.2296160-6-mikhail.kshevetskiy@iopsys.eu
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/spi/spi-airoha-snfi.c b/drivers/spi/spi-airoha-snfi.c
index 0b89dc42545b12e2ae4da6a03d7b0cda7f0d415f..8143fbb0cf4e66d4d08b946adec06486dd53f48d 100644 (file)
--- a/drivers/spi/spi-airoha-snfi.c
+++ b/drivers/spi/spi-airoha-snfi.c
@@ -698,13 +698,13 @@ static ssize_t airoha_snand_dirmap_read(struct spi_mem_dirmap_desc *desc,
 
        err = airoha_snand_nfi_config(as_ctrl);
        if (err)
-               return err;
+               goto error_dma_mode_off;
 
        dma_addr = dma_map_single(as_ctrl->dev, txrx_buf, SPI_NAND_CACHE_SIZE,
                                  DMA_FROM_DEVICE);
        err = dma_mapping_error(as_ctrl->dev, dma_addr);
        if (err)
-               return err;
+               goto error_dma_mode_off;
 
        /* set dma addr */
        err = regmap_write(as_ctrl->regmap_nfi, REG_SPI_NFI_STRADDR,
@@ -804,6 +804,8 @@ static ssize_t airoha_snand_dirmap_read(struct spi_mem_dirmap_desc *desc,
 error_dma_unmap:
        dma_unmap_single(as_ctrl->dev, dma_addr, SPI_NAND_CACHE_SIZE,
                         DMA_FROM_DEVICE);
+error_dma_mode_off:
+       airoha_snand_set_mode(as_ctrl, SPI_MODE_MANUAL);
        return err;
 }
 
@@ -936,6 +938,7 @@ static ssize_t airoha_snand_dirmap_write(struct spi_mem_dirmap_desc *desc,
 error_dma_unmap:
        dma_unmap_single(as_ctrl->dev, dma_addr, SPI_NAND_CACHE_SIZE,
                         DMA_TO_DEVICE);
+       airoha_snand_set_mode(as_ctrl, SPI_MODE_MANUAL);
        return err;
 }