b0687062bd
This is an automatically generated commit which aids following Kernel patch history, as git will see the move and copy as a rename thus defeating the purpose. For the original discussion see: https://lists.openwrt.org/pipermail/openwrt-devel/2023-October/041673.html Signed-off-by: Kenneth Kasilag <kenneth@kasilag.me> Link: https://github.com/openwrt/openwrt/pull/21019 Signed-off-by: Jonas Jelonek <jelonek.jonas@gmail.com>
143 lines
5.1 KiB
Diff
143 lines
5.1 KiB
Diff
From fb81b5cecb8553e3ca2b45288cf340d43c9c2991 Mon Sep 17 00:00:00 2001
|
|
From: Mikhail Kshevetskiy <mikhail.kshevetskiy@iopsys.eu>
|
|
Date: Sun, 12 Oct 2025 15:17:02 +0300
|
|
Subject: [PATCH 11/14] spi: airoha: set custom sector size equal to flash page
|
|
size
|
|
|
|
Set custom sector size equal to flash page size including oob. Thus we
|
|
will always read a single sector. The maximum custom sector size is
|
|
8187, so all possible flash sector sizes are supported.
|
|
|
|
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-12-mikhail.kshevetskiy@iopsys.eu
|
|
Signed-off-by: Mark Brown <broonie@kernel.org>
|
|
---
|
|
drivers/spi/spi-airoha-snfi.c | 35 +++++++++++++++++++----------------
|
|
1 file changed, 19 insertions(+), 16 deletions(-)
|
|
|
|
--- a/drivers/spi/spi-airoha-snfi.c
|
|
+++ b/drivers/spi/spi-airoha-snfi.c
|
|
@@ -519,7 +519,7 @@ static int airoha_snand_nfi_config(struc
|
|
return err;
|
|
|
|
/* sec num */
|
|
- val = FIELD_PREP(SPI_NFI_SEC_NUM, as_ctrl->nfi_cfg.sec_num);
|
|
+ val = FIELD_PREP(SPI_NFI_SEC_NUM, 1);
|
|
err = regmap_update_bits(as_ctrl->regmap_nfi, REG_SPI_NFI_CON,
|
|
SPI_NFI_SEC_NUM, val);
|
|
if (err)
|
|
@@ -532,7 +532,8 @@ static int airoha_snand_nfi_config(struc
|
|
return err;
|
|
|
|
/* set cust sec size */
|
|
- val = FIELD_PREP(SPI_NFI_CUS_SEC_SIZE, as_ctrl->nfi_cfg.sec_size);
|
|
+ val = FIELD_PREP(SPI_NFI_CUS_SEC_SIZE,
|
|
+ as_ctrl->nfi_cfg.sec_size * as_ctrl->nfi_cfg.sec_num);
|
|
return regmap_update_bits(as_ctrl->regmap_nfi,
|
|
REG_SPI_NFI_SECCUS_SIZE,
|
|
SPI_NFI_CUS_SEC_SIZE, val);
|
|
@@ -635,10 +636,13 @@ static ssize_t airoha_snand_dirmap_read(
|
|
u8 *txrx_buf = spi_get_ctldata(spi);
|
|
dma_addr_t dma_addr;
|
|
u32 val, rd_mode, opcode;
|
|
+ size_t bytes;
|
|
int err;
|
|
|
|
as_ctrl = spi_controller_get_devdata(spi->controller);
|
|
|
|
+ bytes = as_ctrl->nfi_cfg.sec_num * as_ctrl->nfi_cfg.sec_size;
|
|
+
|
|
/*
|
|
* DUALIO and QUADIO opcodes are not supported by the spi controller,
|
|
* replace them with supported opcodes.
|
|
@@ -697,18 +701,17 @@ static ssize_t airoha_snand_dirmap_read(
|
|
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);
|
|
+ SPI_NFI_SEC_NUM,
|
|
+ FIELD_PREP(SPI_NFI_SEC_NUM, 1));
|
|
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) |
|
|
+ FIELD_PREP(SPI_NFI_CUS_SEC_SIZE, bytes) |
|
|
SPI_NFI_CUS_SEC_SIZE_EN);
|
|
if (err)
|
|
goto error_dma_mode_off;
|
|
@@ -733,11 +736,10 @@ static ssize_t airoha_snand_dirmap_read(
|
|
* = 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,
|
|
REG_SPI_NFI_SNF_MISC_CTL2,
|
|
- SPI_NFI_READ_DATA_BYTE_NUM, val);
|
|
+ SPI_NFI_READ_DATA_BYTE_NUM,
|
|
+ FIELD_PREP(SPI_NFI_READ_DATA_BYTE_NUM, bytes));
|
|
if (err)
|
|
goto error_dma_unmap;
|
|
|
|
@@ -826,10 +828,13 @@ static ssize_t airoha_snand_dirmap_write
|
|
struct airoha_snand_ctrl *as_ctrl;
|
|
dma_addr_t dma_addr;
|
|
u32 wr_mode, val, opcode;
|
|
+ size_t bytes;
|
|
int err;
|
|
|
|
as_ctrl = spi_controller_get_devdata(spi->controller);
|
|
|
|
+ bytes = as_ctrl->nfi_cfg.sec_num * as_ctrl->nfi_cfg.sec_size;
|
|
+
|
|
opcode = desc->info.op_tmpl.cmd.opcode;
|
|
switch (opcode) {
|
|
case SPI_NAND_OP_PROGRAM_LOAD_SINGLE:
|
|
@@ -880,18 +885,17 @@ static ssize_t airoha_snand_dirmap_write
|
|
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);
|
|
+ SPI_NFI_SEC_NUM,
|
|
+ FIELD_PREP(SPI_NFI_SEC_NUM, 1));
|
|
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) |
|
|
+ FIELD_PREP(SPI_NFI_CUS_SEC_SIZE, bytes) |
|
|
SPI_NFI_CUS_SEC_SIZE_EN);
|
|
if (err)
|
|
goto error_dma_mode_off;
|
|
@@ -916,11 +920,10 @@ static ssize_t airoha_snand_dirmap_write
|
|
* = 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);
|
|
+ SPI_NFI_PROG_LOAD_BYTE_NUM,
|
|
+ FIELD_PREP(SPI_NFI_PROG_LOAD_BYTE_NUM, bytes));
|
|
if (err)
|
|
goto error_dma_unmap;
|
|
|