Re: [PATCH v1 08/14] mtd: spi-nor: micron-st: convert USE_FSR to a manufacturer flag

From: Tudor.Ambarus
Date: Wed Feb 09 2022 - 22:37:51 EST

Next message: Tudor.Ambarus: "Re: [PATCH v1 14/14] mtd: spi-nor: renumber flags"
Previous message: kernel test robot: "[saeed:net-next-mlx5 113/149] undefined reference to `ioread64_lo_hi'"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

On 2/2/22 16:58, Michael Walle wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> Now that all functions using that flag are local to the micron module,
> we can convert the flag to a manufacturer one.
>
> Signed-off-by: Michael Walle <michael@xxxxxxxx>
> ---
> drivers/mtd/spi-nor/core.c | 3 --
> drivers/mtd/spi-nor/core.h | 3 --
> drivers/mtd/spi-nor/micron-st.c | 92 +++++++++++++++++++++------------
> 3 files changed, 59 insertions(+), 39 deletions(-)
>
> diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c
> index e9d9880149d2..be65aaa954ca 100644
> --- a/drivers/mtd/spi-nor/core.c
> +++ b/drivers/mtd/spi-nor/core.c
> @@ -2499,9 +2499,6 @@ static void spi_nor_init_flags(struct spi_nor *nor)
>
> if (flags & USE_CLSR)
> nor->flags |= SNOR_F_USE_CLSR;
> -
> - if (flags & USE_FSR)
> - nor->flags |= SNOR_F_USE_FSR;
> }
>
> /**
> diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h
> index fabc01ae9a81..a02bf54289fb 100644
> --- a/drivers/mtd/spi-nor/core.h
> +++ b/drivers/mtd/spi-nor/core.h
> @@ -12,7 +12,6 @@
> #define SPI_NOR_MAX_ID_LEN 6
>
> enum spi_nor_option_flags {
> - SNOR_F_USE_FSR = BIT(0),
> SNOR_F_HAS_SR_TB = BIT(1),
> SNOR_F_NO_OP_CHIP_ERASE = BIT(2),
> SNOR_F_USE_CLSR = BIT(4),
> @@ -349,7 +348,6 @@ struct spi_nor_fixups {
> * NO_CHIP_ERASE: chip does not support chip erase.
> * SPI_NOR_NO_FR: can't do fastread.
> * USE_CLSR: use CLSR command.
> - * USE_FSR: use flag status register
> *
> * @no_sfdp_flags: flags that indicate support that can be discovered via SFDP.
> * Used when SFDP tables are not defined in the flash. These
> @@ -401,7 +399,6 @@ struct flash_info {
> #define NO_CHIP_ERASE BIT(7)
> #define SPI_NOR_NO_FR BIT(8)
> #define USE_CLSR BIT(9)
> -#define USE_FSR BIT(10)
>
> u8 no_sfdp_flags;
> #define SPI_NOR_SKIP_SFDP BIT(0)
> diff --git a/drivers/mtd/spi-nor/micron-st.c b/drivers/mtd/spi-nor/micron-st.c
> index c66580e8aa00..33531c101ccb 100644
> --- a/drivers/mtd/spi-nor/micron-st.c
> +++ b/drivers/mtd/spi-nor/micron-st.c
> @@ -8,6 +8,8 @@
>
> #include "core.h"
>
> +#define USE_FSR BIT(0)

please add a description and inform the reader that this is a manufacturer specific
flash_info flag.
Reviewed-by: Tudor Ambarus <tudor.ambarus@xxxxxxxxxxxxx>

> +
> #define SPINOR_OP_RDFSR 0x70 /* Read flag status register */
> #define SPINOR_OP_CLFSR 0x50 /* Clear flag status register */
> #define SPINOR_OP_MT_DTR_RD 0xfd /* Fast Read opcode in DTR mode */
> @@ -140,15 +142,17 @@ static const struct spi_nor_fixups mt35xu512aba_fixups = {
>
> static const struct flash_info micron_parts[] = {
> { "mt35xu512aba", INFO(0x2c5b1a, 0, 128 * 1024, 512)
> - FLAGS(USE_FSR)
> NO_SFDP_FLAGS(SECT_4K | SPI_NOR_OCTAL_READ |
> SPI_NOR_OCTAL_DTR_READ | SPI_NOR_OCTAL_DTR_PP)
> FIXUP_FLAGS(SPI_NOR_4B_OPCODES | SPI_NOR_IO_MODE_EN_VOLATILE)
> - .fixups = &mt35xu512aba_fixups},
> + MFR_FLAGS(USE_FSR)
> + .fixups = &mt35xu512aba_fixups
> + },
> { "mt35xu02g", INFO(0x2c5b1c, 0, 128 * 1024, 2048)
> - FLAGS(USE_FSR)
> NO_SFDP_FLAGS(SECT_4K | SPI_NOR_OCTAL_READ)
> - FIXUP_FLAGS(SPI_NOR_4B_OPCODES) },
> + FIXUP_FLAGS(SPI_NOR_4B_OPCODES)
> + MFR_FLAGS(USE_FSR)
> + },
> };
>
> static const struct flash_info st_parts[] = {
> @@ -164,57 +168,79 @@ static const struct flash_info st_parts[] = {
> NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ) },
> { "n25q128a11", INFO(0x20bb18, 0, 64 * 1024, 256)
> FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB | SPI_NOR_4BIT_BP |
> - SPI_NOR_BP3_SR_BIT6 | USE_FSR)
> - NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ) },
> + SPI_NOR_BP3_SR_BIT6)
> + NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ)
> + MFR_FLAGS(USE_FSR)
> + },
> { "n25q128a13", INFO(0x20ba18, 0, 64 * 1024, 256)
> FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB | SPI_NOR_4BIT_BP |
> - SPI_NOR_BP3_SR_BIT6 | USE_FSR)
> - NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ) },
> + SPI_NOR_BP3_SR_BIT6)
> + NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ)
> + MFR_FLAGS(USE_FSR)
> + },
> { "mt25ql256a", INFO6(0x20ba19, 0x104400, 64 * 1024, 512)
> - FLAGS(USE_FSR)
> NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ)
> - FIXUP_FLAGS(SPI_NOR_4B_OPCODES) },
> + FIXUP_FLAGS(SPI_NOR_4B_OPCODES)
> + MFR_FLAGS(USE_FSR)
> + },
> { "n25q256a", INFO(0x20ba19, 0, 64 * 1024, 512)
> - FLAGS(USE_FSR)
> NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ |
> - SPI_NOR_QUAD_READ) },
> + SPI_NOR_QUAD_READ)
> + MFR_FLAGS(USE_FSR)
> + },
> { "mt25qu256a", INFO6(0x20bb19, 0x104400, 64 * 1024, 512)
> - FLAGS(USE_FSR)
> NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ)
> - FIXUP_FLAGS(SPI_NOR_4B_OPCODES) },
> + FIXUP_FLAGS(SPI_NOR_4B_OPCODES)
> + MFR_FLAGS(USE_FSR)
> + },
> { "n25q256ax1", INFO(0x20bb19, 0, 64 * 1024, 512)
> - FLAGS(USE_FSR)
> - NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ) },
> + NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ)
> + MFR_FLAGS(USE_FSR)
> + },
> { "mt25ql512a", INFO6(0x20ba20, 0x104400, 64 * 1024, 1024)
> - FLAGS(USE_FSR)
> NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ)
> - FIXUP_FLAGS(SPI_NOR_4B_OPCODES) },
> + FIXUP_FLAGS(SPI_NOR_4B_OPCODES)
> + MFR_FLAGS(USE_FSR)
> + },
> { "n25q512ax3", INFO(0x20ba20, 0, 64 * 1024, 1024)
> FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB | SPI_NOR_4BIT_BP |
> - SPI_NOR_BP3_SR_BIT6 | USE_FSR)
> - NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ) },
> + SPI_NOR_BP3_SR_BIT6)
> + NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ)
> + MFR_FLAGS(USE_FSR)
> + },
> { "mt25qu512a", INFO6(0x20bb20, 0x104400, 64 * 1024, 1024)
> - FLAGS(USE_FSR)
> NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ)
> - FIXUP_FLAGS(SPI_NOR_4B_OPCODES) },
> + FIXUP_FLAGS(SPI_NOR_4B_OPCODES)
> + MFR_FLAGS(USE_FSR)
> + },
> { "n25q512a", INFO(0x20bb20, 0, 64 * 1024, 1024)
> FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB | SPI_NOR_4BIT_BP |
> - SPI_NOR_BP3_SR_BIT6 | USE_FSR)
> - NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ) },
> + SPI_NOR_BP3_SR_BIT6)
> + NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ)
> + MFR_FLAGS(USE_FSR)
> + },
> { "n25q00", INFO(0x20ba21, 0, 64 * 1024, 2048)
> FLAGS(SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB | SPI_NOR_4BIT_BP |
> - SPI_NOR_BP3_SR_BIT6 | NO_CHIP_ERASE | USE_FSR)
> - NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ) },
> + SPI_NOR_BP3_SR_BIT6 | NO_CHIP_ERASE)
> + NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ)
> + MFR_FLAGS(USE_FSR)
> + },
> { "n25q00a", INFO(0x20bb21, 0, 64 * 1024, 2048)
> - FLAGS(NO_CHIP_ERASE | USE_FSR)
> - NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ) },
> + FLAGS(NO_CHIP_ERASE)
> + NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ)
> + MFR_FLAGS(USE_FSR)
> + },
> { "mt25ql02g", INFO(0x20ba22, 0, 64 * 1024, 4096)
> - FLAGS(NO_CHIP_ERASE | USE_FSR)
> - NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ) },
> + FLAGS(NO_CHIP_ERASE)
> + NO_SFDP_FLAGS(SECT_4K | SPI_NOR_QUAD_READ)
> + MFR_FLAGS(USE_FSR)
> + },
> { "mt25qu02g", INFO(0x20bb22, 0, 64 * 1024, 4096)
> - FLAGS(NO_CHIP_ERASE | USE_FSR)
> + FLAGS(NO_CHIP_ERASE)
> NO_SFDP_FLAGS(SECT_4K | SPI_NOR_DUAL_READ |
> - SPI_NOR_QUAD_READ) },
> + SPI_NOR_QUAD_READ)
> + MFR_FLAGS(USE_FSR)
> + },
>
> { "m25p05", INFO(0x202010, 0, 32 * 1024, 2) },
> { "m25p10", INFO(0x202011, 0, 32 * 1024, 4) },
> @@ -406,7 +432,7 @@ static void micron_st_default_init(struct spi_nor *nor)
> nor->params->quad_enable = NULL;
> nor->params->set_4byte_addr_mode = st_micron_set_4byte_addr_mode;
>
> - if (nor->flags & SNOR_F_USE_FSR)
> + if (nor->info->mfr_flags & USE_FSR)
> nor->params->ready = spi_nor_fsr_ready;
> }
>
> --
> 2.30.2
>

Next message: Tudor.Ambarus: "Re: [PATCH v1 14/14] mtd: spi-nor: renumber flags"
Previous message: kernel test robot: "[saeed:net-next-mlx5 113/149] undefined reference to `ioread64_lo_hi'"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]