mtd: spi-nor: sfdp: Introduce SFDP_DWORD() macro
Subsystems (3)
v2 cover mtd: spi-nor: sfdp: Introduce SFDP_DWORD() macro
From: Takahiro Kuwano <[email protected]>
Existing BFPT_DWORD() converts 1-based indexing to 0-based indexing for C arrays, and is used in BFPT parse. This is applicable to other parameter tables than BFPT.
Based on a suggestion in:
https://patchwork.ozlabs.org/project/linux-mtd/patch/[email protected]/
Confirmed all parameter tables described in JESD216F.02 use the same (1-based) indexing.
Tested with S25HS01GT and S28HS01GT.
---
Changes in v2:
- Add cc: stable to 1/3 patch
- Add Suggested-by: tag to 2/3 and 3/3 patches
- Update commit description in 2/3 patch
Takahiro Kuwano (3):
mtd: spi-nor: sfdp: Fix index value for SCCR dwords
mtd: spi-nor: sfdp: Rename BFPT_DWORD() macro to SFDP_DWORD()
mtd: spi-nor: sfdp: Use SFDP_DWORD() macro for optional parameter
tables
drivers/mtd/spi-nor/issi.c | 2 +- drivers/mtd/spi-nor/macronix.c | 2 +- drivers/mtd/spi-nor/sfdp.c | 72 ++++++++++++++++++---------------- drivers/mtd/spi-nor/sfdp.h | 9 ++--- 4 files changed, 44 insertions(+), 41 deletions(-)
Signature · 6 lines
2.25.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH v2 1/3 mtd: spi-nor: sfdp: Fix index value for SCCR dwords
From: Takahiro Kuwano <[email protected]>
Array index for SCCR 22th DOWRD should be 21.
--- drivers/mtd/spi-nor/sfdp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/mtd/spi-nor/sfdp.c +1 -1
@@ -1228,7 +1228,7 @@ static int spi_nor_parse_sccr(struct spi_nor *nor,le32_to_cpu_array (dwords, sccr_header->length); -if (FIELD_GET (SCCR_DWORD22_OCTAL_DTR_EN_VOLATILE , dwords[22 ])) +if (FIELD_GET (SCCR_DWORD22_OCTAL_DTR_EN_VOLATILE , dwords[21 ])) nor->flags |=SNOR_F_IO_MODE_EN_VOLATILE ; out:
Signature · 1 line
2.25.1
Re: [PATCH v2 1/3] mtd: spi-nor: sfdp: Fix index value for SCCR dwords
Quoted 7 lines · On 26/12/22 01:01PM, [email protected] wrote:
From: Takahiro Kuwano <[email protected]>
Array index for SCCR 22th DOWRD should be 21.
Fixes 981a8d60e01f ("mtd: spi-nor: Parse SFDP SCCR Map")Signed-off-by Takahiro Kuwano <[email protected]>Reviewed-by Michael Walle <[email protected]>
Signature · 2 lines
Regards, Pratyush Yadav
PATCH v2 2/3 mtd: spi-nor: sfdp: Rename BFPT_DWORD() macro to SFDP_DWORD()
In reply to [email protected]From: Takahiro Kuwano <[email protected]>
BFPT_DWORD() converts 1-based indexing to 0-based indexing for C arrays, and is used in BFPT parse. Per JESD216F.02, the conversion is applicable to other parameter tables than BFPT. This patch renames the macro to SFDP_DWORD() so that we can use it for other parameter tables than BFPT.
--- drivers/mtd/spi-nor/issi.c | 2 +- drivers/mtd/spi-nor/macronix.c | 2 +- drivers/mtd/spi-nor/sfdp.c | 44 +++++++++++++++++----------------- drivers/mtd/spi-nor/sfdp.h | 9 ++++--- 4 files changed, 28 insertions(+), 29 deletions(-)
drivers/mtd/spi-nor/issi.c +1 -1
@@ -18,7 +18,7 @@ is25lp256_post_bfpt_fixups(struct spi_nor *nor,* BFPT_DWORD1_ADDRESS_BYTES_3_ONLY. * Overwrite the number of address bytes advertised by the BFPT. */ -if ((bfpt->dwords[BFPT_DWORD (1 )] &BFPT_DWORD1_ADDRESS_BYTES_MASK ) == +if ((bfpt->dwords[SFDP_DWORD (1 )] &BFPT_DWORD1_ADDRESS_BYTES_MASK ) ==BFPT_DWORD1_ADDRESS_BYTES_3_ONLY ) nor->params->addr_nbytes =4 ;
drivers/mtd/spi-nor/macronix.c +1 -1
@@ -22,7 +22,7 @@ mx25l25635_post_bfpt_fixups(struct spi_nor *nor,* seems that the F version advertises support for Fast Read 4-4-4 in * its BFPT table. */ -if (bfpt->dwords[BFPT_DWORD (5 )] &BFPT_DWORD5_FAST_READ_4_4_4 ) +if (bfpt->dwords[SFDP_DWORD (5 )] &BFPT_DWORD5_FAST_READ_4_4_4 ) nor->flags |=SNOR_F_4B_OPCODES ;return 0 ;
drivers/mtd/spi-nor/sfdp.c +22 -22
127 lines not on this page · raw message
drivers/mtd/spi-nor/sfdp.h +4 -5
@@ -13,13 +13,12 @@#define SFDP_JESD216A_MINOR 5#define SFDP_JESD216B_MINOR 6 +/* SFDP DWORDS are indexed from 1 but C arrays are indexed from 0. */ +#define SFDP_DWORD (i) ((i) - 1) +/* Basic Flash Parameter Table */ -/* -* JESD216 rev D defines a Basic Flash Parameter Table of 20 DWORDs. -* They are indexed from 1 but C arrays are indexed from 0. -*/ -#define BFPT_DWORD (i) ((i) - 1) +/* JESD216 rev D defines a Basic Flash Parameter Table of 20 DWORDs. */ #define BFPT_DWORD_MAX 20struct sfdp_bfpt {
Signature · 6 lines
2.25.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v2 2/3] mtd: spi-nor: sfdp: Rename BFPT_DWORD() macro to SFDP_DWORD()
Quoted 9 lines · On 26/12/22 01:01PM, [email protected] wrote:
From: Takahiro Kuwano <[email protected]>
BFPT_DWORD()converts 1-based indexing to 0-based indexing for C arrays, and is used in BFPT parse. Per JESD216F.02, the conversion is applicable to other parameter tables than BFPT. This patch renames the macro toSFDP_DWORD()so that we can use it for other parameter tables than BFPT.Suggested-by Tudor Ambarus <[email protected]>Signed-off-by Takahiro Kuwano <[email protected]>
Signature · 6 lines
Regards, Pratyush Yadav ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
PATCH v2 3/3 mtd: spi-nor: sfdp: Use SFDP_DWORD() macro for optional parameter tables
In reply to [email protected]From: Takahiro Kuwano <[email protected]>
Change 0-based indexing values of parameter tables to 1-based ones by SFDP_DWORD() macro.
--- drivers/mtd/spi-nor/sfdp.c | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-)
drivers/mtd/spi-nor/sfdp.c +16 -12
@@ -1004,7 +1004,7 @@ static int spi_nor_parse_4bait(struct spi_nor *nor, discard_hwcaps |= read->hwcaps;if ((params->hwcaps.mask & read->hwcaps) && - (dwords[0 ] & read->supported_bit)) + (dwords[SFDP_DWORD (1 )] & read->supported_bit)) read_hwcaps |= read->hwcaps; }
@@ -1023,7 +1023,7 @@ static int spi_nor_parse_4bait(struct spi_nor *nor,* authority for specifying Page Program support. */ discard_hwcaps |= program->hwcaps; -if (dwords[0 ] & program->supported_bit) +if (dwords[SFDP_DWORD (1 )] & program->supported_bit) pp_hwcaps |= program->hwcaps; }
@@ -1035,7 +1035,7 @@ static int spi_nor_parse_4bait(struct spi_nor *nor,for (i =0 ; i <SNOR_ERASE_TYPE_MAX ; i++) {const struct sfdp_4bait *erase = &erases[i]; -if (dwords[0 ] & erase->supported_bit) +if (dwords[SFDP_DWORD (1 )] & erase->supported_bit) erase_mask |=BIT (i); }
@@ -1086,7 +1086,7 @@ static int spi_nor_parse_4bait(struct spi_nor *nor,for (i =0 ; i <SNOR_ERASE_TYPE_MAX ; i++) {if (erase_mask &BIT (i)) - erase_type[i].opcode = (dwords[1 ] >> + erase_type[i].opcode = (dwords[SFDP_DWORD (2 )] >> erase_type[i].idx *8 ) &0xFF ;else spi_nor_set_erase_type (&erase_type[i],0u ,0xFF );
@@ -1145,15 +1145,15 @@ static int spi_nor_parse_profile1(struct spi_nor *nor,le32_to_cpu_array (dwords, profile1_header->length);/* Get 8D-8D-8D fast read opcode and dummy cycles. */ - opcode =FIELD_GET (PROFILE1_DWORD1_RD_FAST_CMD , dwords[0 ]); + opcode =FIELD_GET (PROFILE1_DWORD1_RD_FAST_CMD , dwords[SFDP_DWORD (1 )]);/* Set the Read Status Register dummy cycles and dummy address bytes. */ -if (dwords[0 ] &PROFILE1_DWORD1_RDSR_DUMMY ) +if (dwords[SFDP_DWORD (1 )] &PROFILE1_DWORD1_RDSR_DUMMY ) nor->params->rdsr_dummy =8 ;else nor->params->rdsr_dummy =4 ; -if (dwords[0 ] &PROFILE1_DWORD1_RDSR_ADDR_BYTES ) +if (dwords[SFDP_DWORD (1 )] &PROFILE1_DWORD1_RDSR_ADDR_BYTES ) nor->params->rdsr_addr_nbytes =4 ;else nor->params->rdsr_addr_nbytes =0 ;
@@ -1167,13 +1167,16 @@ static int spi_nor_parse_profile1(struct spi_nor *nor,* Default to PROFILE1_DUMMY_DEFAULT if we don't find anything, and let * flashes set the correct value if needed in their fixup hooks. */ - dummy =FIELD_GET (PROFILE1_DWORD4_DUMMY_200MHZ , dwords[3 ]); + dummy =FIELD_GET (PROFILE1_DWORD4_DUMMY_200MHZ , dwords[SFDP_DWORD (4 )]);if (!dummy) - dummy =FIELD_GET (PROFILE1_DWORD5_DUMMY_166MHZ , dwords[4 ]); + dummy =FIELD_GET (PROFILE1_DWORD5_DUMMY_166MHZ , + dwords[SFDP_DWORD (5 )]);if (!dummy) - dummy =FIELD_GET (PROFILE1_DWORD5_DUMMY_133MHZ , dwords[4 ]); + dummy =FIELD_GET (PROFILE1_DWORD5_DUMMY_133MHZ , + dwords[SFDP_DWORD (5 )]);if (!dummy) - dummy =FIELD_GET (PROFILE1_DWORD5_DUMMY_100MHZ , dwords[4 ]); + dummy =FIELD_GET (PROFILE1_DWORD5_DUMMY_100MHZ , + dwords[SFDP_DWORD (5 )]);if (!dummy)dev_dbg (nor->dev,"Can't find dummy cycles from Profile 1.0 table\n" );
@@ -1228,7 +1231,8 @@ static int spi_nor_parse_sccr(struct spi_nor *nor,le32_to_cpu_array (dwords, sccr_header->length); -if (FIELD_GET (SCCR_DWORD22_OCTAL_DTR_EN_VOLATILE , dwords[21 ])) +if (FIELD_GET (SCCR_DWORD22_OCTAL_DTR_EN_VOLATILE , + dwords[SFDP_DWORD (22 )])) nor->flags |=SNOR_F_IO_MODE_EN_VOLATILE ; out:
Signature · 6 lines
2.25.1 ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Re: [PATCH v2 3/3] mtd: spi-nor: sfdp: Use SFDP_DWORD() macro for optional parameter tables
Quoted 7 lines · On 26/12/22 01:02PM, [email protected] wrote:
From: Takahiro Kuwano <[email protected]>
Change 0-based indexing values of parameter tables to 1-based ones by
SFDP_DWORD()macro.Suggested-by Tudor Ambarus <[email protected]>Signed-off-by Takahiro Kuwano <[email protected]>
Signature · 6 lines
Regards, Pratyush Yadav ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/
Tudor Ambarus
AppliedQuoted 10 lines · On Mon, 26 Dec 2022 13:01:57 +0900, [email protected] wrote:
From: Takahiro Kuwano <[email protected]>
Existing
BFPT_DWORD()converts 1-based indexing to 0-based indexing for C arrays, and is used in BFPT parse. This is applicable to other parameter tables than BFPT.Based on a suggestion in:
https://patchwork.ozlabs.org/project/linux-mtd/patch/[email protected]/[...]
Applied to spi-nor/next, thanks!
[1/3] mtd: spi-nor: sfdp: Fix index value for SCCR dwords
https://git.kernel.org/mtd/c/ad9679f38118 [2/3] mtd: spi-nor: sfdp: Rename BFPT_DWORD() macro to SFDP_DWORD() https://git.kernel.org/mtd/c/86d4cdf88c81 [3/3] mtd: spi-nor: sfdp: Use SFDP_DWORD() macro for optional parameter tables https://git.kernel.org/mtd/c/55398beb0846
Best regards,
Signature · 5 lines
Tudor Ambarus <[email protected]> ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/