From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7C2191E47CA; Mon, 27 Oct 2025 19:30:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761593417; cv=none; b=C7tZi81jbUnKvZVXiKxNyvuR/4MsIx+GiG6dagGnxno6NqRUUlnpKOTQCF1XVCwsCDQYginp7/fqOgjJTjmGKdTrlCYrWfdQYleLGieH8ZuvSQWuzb6YgJf/fhwYWrfJp+XcNtHhlT2hNHUrwae2szwX2QmjnhLEvGrby/GmI30= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1761593417; c=relaxed/simple; bh=U1ZcUaYaROAb0GZ85pA95PVlM7pPOq+B3W9ZxCxP1Jw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=u2MnZY/wiU7GrxyhaxeRZYA8aDoNV0VO13smFloVKNUb5LYBSvz52uXeJMiGLZhgdpNwAIz5ZZE2u4JYOc6JP1k5NPioovKwpQQTJFYnv/gEaw5JcdouKoPs9ktCIWLGRFSuNyCSFB1wHuyxKx/gr/s0xEl+IR0S2e45h0fUVwk= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=eEa1QaXe; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="eEa1QaXe" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECA41C113D0; Mon, 27 Oct 2025 19:30:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1761593417; bh=U1ZcUaYaROAb0GZ85pA95PVlM7pPOq+B3W9ZxCxP1Jw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eEa1QaXegg/bCSGdW/+H0vKa8UN/fHoyxzPLakUtOPx7dYLrfQf2vE757hBFKj0FI ZIfWk+bqu7BhNBHQUyBSONeY4zklKeLynz6qZlRYpPd6YSnHUkU1GNmTKph2aZ48xt 3Ntz3fiRnzhgH2KklOTcQAPmvyp8p5cwumplUwK4= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mikhail Kshevetskiy , Lorenzo Bianconi , AngeloGioacchino Del Regno , Mark Brown , Sasha Levin Subject: [PATCH 6.17 128/184] spi: airoha: switch back to non-dma mode in the case of error Date: Mon, 27 Oct 2025 19:36:50 +0100 Message-ID: <20251027183518.391104455@linuxfoundation.org> X-Mailer: git-send-email 2.51.1 In-Reply-To: <20251027183514.934710872@linuxfoundation.org> References: <20251027183514.934710872@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.17-stable review patch. If anyone has any objections, please let me know. ------------------ From: Mikhail Kshevetskiy [ 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 Acked-by: Lorenzo Bianconi Reviewed-by: AngeloGioacchino Del Regno Link: https://patch.msgid.link/20251012121707.2296160-6-mikhail.kshevetskiy@iopsys.eu Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- drivers/spi/spi-airoha-snfi.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/spi/spi-airoha-snfi.c b/drivers/spi/spi-airoha-snfi.c index 0b89dc42545b1..8143fbb0cf4e6 100644 --- 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; } -- 2.51.0