> Current dirmap code does not switch back to non-dma mode in the case of
> error. This is wrong.
Can you please add proper Fixes tag here? Probably to make backport easier,
this patch should be moved before patch 5/13. Anyway:
Acked-by: Lorenzo Bianconi <lorenzo@kernel.org>
Regards,
Lorenzo
>
> This patch fixes dirmap read/write error path.
>
> Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
> ---
> drivers/spi/spi-airoha-snfi.c | 12 ++++++++----
> 1 file changed, 8 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/spi/spi-airoha-snfi.c b/drivers/spi/spi-airoha-snfi.c
> index ce4026611e26..3431a9c84679 100644
> --- a/drivers/spi/spi-airoha-snfi.c
> +++ b/drivers/spi/spi-airoha-snfi.c
> @@ -692,13 +692,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,
> @@ -798,6 +798,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;
> }
>
> @@ -836,13 +838,13 @@ static ssize_t airoha_snand_dirmap_write(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_TO_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,
> @@ -939,6 +941,8 @@ 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);
> +error_dma_mode_off:
> + airoha_snand_set_mode(as_ctrl, SPI_MODE_MANUAL);
> return err;
> }
>
> --
> 2.50.1
>