mirror of
https://github.com/openwrt/openwrt.git
synced 2026-06-17 14:50:15 +04:00
Mikhail Kshevetskiy
d819a05a8e
Changes:
* use upstream patches for airoha-snfi driver
* update in kernel en7523 dts to add spinand support
Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
Link: https://github.com/openwrt/openwrt/pull/21299
Signed-off-by: Robert Marko <robimarko@gmail.com>
(cherry picked from commit d9b1c74780)
200 lines
6.5 KiB
Diff
200 lines
6.5 KiB
Diff
From d1ff30df1d9a4eb4c067795abb5e2a66910fd108 Mon Sep 17 00:00:00 2001
|
|
From: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
|
|
Date: Sun, 12 Oct 2025 15:17:01 +0300
|
|
Subject: [PATCH 10/14] spi: airoha: reduce the number of modification of
|
|
REG_SPI_NFI_CNFG and REG_SPI_NFI_SECCUS_SIZE registers
|
|
|
|
This just reduce the number of modification of REG_SPI_NFI_CNFG and
|
|
REG_SPI_NFI_SECCUS_SIZE registers during dirmap operation.
|
|
|
|
This patch is a necessary step to avoid reading flash page settings
|
|
from SNFI registers during driver startup.
|
|
|
|
Signed-off-by: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
|
|
Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
|
|
Link: https://patch.msgid.link/20251012121707.2296160-11-mikhail.kshevetskiy@iopsys.eu
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
drivers/spi/spi-airoha-snfi.c | 135 +++++++++++++++++++++++++---------
|
|
1 file changed, 102 insertions(+), 33 deletions(-)
|
|
|
|
--- a/drivers/spi/spi-airoha-snfi.c
|
|
+++ b/drivers/spi/spi-airoha-snfi.c
|
|
@@ -668,7 +668,48 @@ static ssize_t airoha_snand_dirmap_read(
|
|
if (err < 0)
|
|
return err;
|
|
|
|
- err = airoha_snand_nfi_config(as_ctrl);
|
|
+ /* NFI reset */
|
|
+ err = regmap_write(as_ctrl->regmap_nfi, REG_SPI_NFI_CON,
|
|
+ SPI_NFI_FIFO_FLUSH | SPI_NFI_RST);
|
|
+ if (err)
|
|
+ goto error_dma_mode_off;
|
|
+
|
|
+ /* NFI configure:
|
|
+ * - No AutoFDM (custom sector size (SECCUS) register will be used)
|
|
+ * - No SoC's hardware ECC (flash internal ECC will be used)
|
|
+ * - Use burst mode (faster, but requires 16 byte alignment for addresses)
|
|
+ * - Setup for reading (SPI_NFI_READ_MODE)
|
|
+ * - Setup reading command: FIELD_PREP(SPI_NFI_OPMODE, 6)
|
|
+ * - Use DMA instead of PIO for data reading
|
|
+ */
|
|
+ err = regmap_update_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_CNFG,
|
|
+ SPI_NFI_DMA_MODE |
|
|
+ SPI_NFI_READ_MODE |
|
|
+ SPI_NFI_DMA_BURST_EN |
|
|
+ SPI_NFI_HW_ECC_EN |
|
|
+ SPI_NFI_AUTO_FDM_EN |
|
|
+ SPI_NFI_OPMODE,
|
|
+ SPI_NFI_DMA_MODE |
|
|
+ SPI_NFI_READ_MODE |
|
|
+ SPI_NFI_DMA_BURST_EN |
|
|
+ FIELD_PREP(SPI_NFI_OPMODE, 6));
|
|
+ if (err)
|
|
+ goto error_dma_mode_off;
|
|
+
|
|
+ /* Set number of sector will be read */
|
|
+ val = FIELD_PREP(SPI_NFI_SEC_NUM, as_ctrl->nfi_cfg.sec_num);
|
|
+ err = regmap_update_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_CON,
|
|
+ SPI_NFI_SEC_NUM, val);
|
|
+ if (err)
|
|
+ goto error_dma_mode_off;
|
|
+
|
|
+ /* Set custom sector size */
|
|
+ val = as_ctrl->nfi_cfg.sec_size;
|
|
+ err = regmap_update_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_SECCUS_SIZE,
|
|
+ SPI_NFI_CUS_SEC_SIZE |
|
|
+ SPI_NFI_CUS_SEC_SIZE_EN,
|
|
+ FIELD_PREP(SPI_NFI_CUS_SEC_SIZE, val) |
|
|
+ SPI_NFI_CUS_SEC_SIZE_EN);
|
|
if (err)
|
|
goto error_dma_mode_off;
|
|
|
|
@@ -684,7 +725,14 @@ static ssize_t airoha_snand_dirmap_read(
|
|
if (err)
|
|
goto error_dma_unmap;
|
|
|
|
- /* set cust sec size */
|
|
+ /*
|
|
+ * Setup transfer length
|
|
+ * ---------------------
|
|
+ * The following rule MUST be met:
|
|
+ * transfer_length =
|
|
+ * = NFI_SNF_MISC_CTL2.read_data_byte_number =
|
|
+ * = NFI_CON.sector_number * NFI_SECCUS.custom_sector_size
|
|
+ */
|
|
val = as_ctrl->nfi_cfg.sec_size * as_ctrl->nfi_cfg.sec_num;
|
|
val = FIELD_PREP(SPI_NFI_READ_DATA_BYTE_NUM, val);
|
|
err = regmap_update_bits(as_ctrl->regmap_nfi,
|
|
@@ -711,18 +759,6 @@ static ssize_t airoha_snand_dirmap_read(
|
|
if (err)
|
|
goto error_dma_unmap;
|
|
|
|
- /* set nfi read */
|
|
- err = regmap_update_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_CNFG,
|
|
- SPI_NFI_OPMODE,
|
|
- FIELD_PREP(SPI_NFI_OPMODE, 6));
|
|
- if (err)
|
|
- goto error_dma_unmap;
|
|
-
|
|
- err = regmap_set_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_CNFG,
|
|
- SPI_NFI_READ_MODE | SPI_NFI_DMA_MODE);
|
|
- if (err)
|
|
- goto error_dma_unmap;
|
|
-
|
|
err = regmap_write(as_ctrl->regmap_nfi, REG_SPI_NFI_CMD, 0x0);
|
|
if (err)
|
|
goto error_dma_unmap;
|
|
@@ -815,7 +851,48 @@ static ssize_t airoha_snand_dirmap_write
|
|
if (err < 0)
|
|
return err;
|
|
|
|
- err = airoha_snand_nfi_config(as_ctrl);
|
|
+ /* NFI reset */
|
|
+ err = regmap_write(as_ctrl->regmap_nfi, REG_SPI_NFI_CON,
|
|
+ SPI_NFI_FIFO_FLUSH | SPI_NFI_RST);
|
|
+ if (err)
|
|
+ goto error_dma_mode_off;
|
|
+
|
|
+ /*
|
|
+ * NFI configure:
|
|
+ * - No AutoFDM (custom sector size (SECCUS) register will be used)
|
|
+ * - No SoC's hardware ECC (flash internal ECC will be used)
|
|
+ * - Use burst mode (faster, but requires 16 byte alignment for addresses)
|
|
+ * - Setup for writing (SPI_NFI_READ_MODE bit is cleared)
|
|
+ * - Setup writing command: FIELD_PREP(SPI_NFI_OPMODE, 3)
|
|
+ * - Use DMA instead of PIO for data writing
|
|
+ */
|
|
+ err = regmap_update_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_CNFG,
|
|
+ SPI_NFI_DMA_MODE |
|
|
+ SPI_NFI_READ_MODE |
|
|
+ SPI_NFI_DMA_BURST_EN |
|
|
+ SPI_NFI_HW_ECC_EN |
|
|
+ SPI_NFI_AUTO_FDM_EN |
|
|
+ SPI_NFI_OPMODE,
|
|
+ SPI_NFI_DMA_MODE |
|
|
+ SPI_NFI_DMA_BURST_EN |
|
|
+ FIELD_PREP(SPI_NFI_OPMODE, 3));
|
|
+ if (err)
|
|
+ goto error_dma_mode_off;
|
|
+
|
|
+ /* Set number of sector will be written */
|
|
+ val = FIELD_PREP(SPI_NFI_SEC_NUM, as_ctrl->nfi_cfg.sec_num);
|
|
+ err = regmap_update_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_CON,
|
|
+ SPI_NFI_SEC_NUM, val);
|
|
+ if (err)
|
|
+ goto error_dma_mode_off;
|
|
+
|
|
+ /* Set custom sector size */
|
|
+ val = as_ctrl->nfi_cfg.sec_size;
|
|
+ err = regmap_update_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_SECCUS_SIZE,
|
|
+ SPI_NFI_CUS_SEC_SIZE |
|
|
+ SPI_NFI_CUS_SEC_SIZE_EN,
|
|
+ FIELD_PREP(SPI_NFI_CUS_SEC_SIZE, val) |
|
|
+ SPI_NFI_CUS_SEC_SIZE_EN);
|
|
if (err)
|
|
goto error_dma_mode_off;
|
|
|
|
@@ -831,8 +908,16 @@ static ssize_t airoha_snand_dirmap_write
|
|
if (err)
|
|
goto error_dma_unmap;
|
|
|
|
- val = FIELD_PREP(SPI_NFI_PROG_LOAD_BYTE_NUM,
|
|
- as_ctrl->nfi_cfg.sec_size * as_ctrl->nfi_cfg.sec_num);
|
|
+ /*
|
|
+ * Setup transfer length
|
|
+ * ---------------------
|
|
+ * The following rule MUST be met:
|
|
+ * transfer_length =
|
|
+ * = NFI_SNF_MISC_CTL2.write_data_byte_number =
|
|
+ * = NFI_CON.sector_number * NFI_SECCUS.custom_sector_size
|
|
+ */
|
|
+ val = as_ctrl->nfi_cfg.sec_size * as_ctrl->nfi_cfg.sec_num;
|
|
+ val = FIELD_PREP(SPI_NFI_PROG_LOAD_BYTE_NUM, val);
|
|
err = regmap_update_bits(as_ctrl->regmap_nfi,
|
|
REG_SPI_NFI_SNF_MISC_CTL2,
|
|
SPI_NFI_PROG_LOAD_BYTE_NUM, val);
|
|
@@ -857,22 +942,6 @@ static ssize_t airoha_snand_dirmap_write
|
|
if (err)
|
|
goto error_dma_unmap;
|
|
|
|
- err = regmap_clear_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_CNFG,
|
|
- SPI_NFI_READ_MODE);
|
|
- if (err)
|
|
- goto error_dma_unmap;
|
|
-
|
|
- err = regmap_update_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_CNFG,
|
|
- SPI_NFI_OPMODE,
|
|
- FIELD_PREP(SPI_NFI_OPMODE, 3));
|
|
- if (err)
|
|
- goto error_dma_unmap;
|
|
-
|
|
- err = regmap_set_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_CNFG,
|
|
- SPI_NFI_DMA_MODE);
|
|
- if (err)
|
|
- goto error_dma_unmap;
|
|
-
|
|
err = regmap_write(as_ctrl->regmap_nfi, REG_SPI_NFI_CMD, 0x80);
|
|
if (err)
|
|
goto error_dma_unmap;
|