Skip to contentSkip to conversation

mtd: spi-nor: sfdp: Get the 1-1-8 protocol from BFPT

PATCH In review Jaime Liao 2 participants 3 messages Dec 7, 2023 – Dec 12, 2023

Subsystems (2)
lore
Share & tools
lore

Jaime Liao

author
#0 lore raw

PATCH 1/1 mtd: spi-nor: sfdp: Get the 1-1-8 protocol from BFPT

From: JaimeLiao <[email protected]>

BFPT 17th DWORD contains the informations about 1-1-8, The difference from Dual and Quad mode is not determined by a single bit indicating support but rather by using 1-byte instruction, which content is the opcode. A value of 0x00 represents not support. Therefore, parse BFPT 17 DWORD instruction to determine whether flash support 1-1-8, and set its dummy cycle accordingly.

---
 drivers/mtd/spi-nor/sfdp.c | 15 ++++++++++++++-
 drivers/mtd/spi-nor/sfdp.h |  3 +++
 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/mtd/spi-nor/sfdp.c +14 -1
index b3b11dfed789..d04dbddb70d6 100644
@@ -446,6 +446,7 @@ static int spi_nor_parse_bfpt(struct spi_nor *nor,
 	u32 dword;
 	u16 half;
 	u8 erase_mask;
+	u8 dummy, opcode;
 
 	/* JESD216 Basic Flash Parameter Table length is at least 9 DWORDs. */
 	if (bfpt_header->length < BFPT_DWORD_MAX_JESD216)
@@ -516,6 +517,18 @@ static int spi_nor_parse_bfpt(struct spi_nor *nor,
 		spi_nor_set_read_settings_from_bfpt(read, half, rd->proto);
 	}
 
+	/* Make sure BFPT provide dwords more than 16 and parsing 1-1-8 information */
+	if (bfpt_header->length > BFPT_DWORD_MAX_JESD216B) {
+		opcode = FIELD_GET(BFPT_DWORD17_RD_1_1_8_CMD, bfpt.dwords[SFDP_DWORD(17)]);
+		dummy = FIELD_GET(BFPT_DWORD17_RD_1_1_8_DUMMY, bfpt.dwords[SFDP_DWORD(17)]);
+		if (opcode) {
+			nor->params->hwcaps.mask |= SNOR_HWCAPS_READ_1_1_8;
+			spi_nor_set_read_settings(&nor->params->reads[SNOR_CMD_READ_1_1_8],
+					  0, dummy, opcode,
+					  SNOR_PROTO_1_1_8);
+		}
+	}
+
 	/*
 	 * Sector Erase settings. Reinitialize the uniform erase map using the
 	 * Erase Types defined in the bfpt table.
@@ -525,7 +538,6 @@ static int spi_nor_parse_bfpt(struct spi_nor *nor,
 	for (i = 0; i < ARRAY_SIZE(sfdp_bfpt_erases); i++) {
 		const struct sfdp_bfpt_erase *er = &sfdp_bfpt_erases[i];
 		u32 erasesize;
-		u8 opcode;
 
 		half = bfpt.dwords[er->dword] >> er->shift;
 		erasesize = half & 0xff;
@@ -968,6 +980,7 @@ static int spi_nor_parse_4bait(struct spi_nor *nor,
 		{ SNOR_HWCAPS_READ_1_1_1_DTR,	BIT(13) },
 		{ SNOR_HWCAPS_READ_1_2_2_DTR,	BIT(14) },
 		{ SNOR_HWCAPS_READ_1_4_4_DTR,	BIT(15) },
+		{ SNOR_HWCAPS_READ_1_1_8,	BIT(20) },
 	};
 	static const struct sfdp_4bait programs[] = {
 		{ SNOR_HWCAPS_PP,		BIT(6) },
drivers/mtd/spi-nor/sfdp.h +3 -0
index 6eb99e1cdd61..584a05f9931d 100644
@@ -118,6 +118,9 @@ struct sfdp_bfpt {
 	(BFPT_DWORD16_EN4B_EN4B | BFPT_DWORD16_EX4B_EX4B)
 #define BFPT_DWORD16_SWRST_EN_RST		BIT(12)
 
+#define BFPT_DWORD17_RD_1_1_8_CMD		GENMASK(31, 24)
+#define BFPT_DWORD17_RD_1_1_8_DUMMY		GENMASK(20, 16)
+
 #define BFPT_DWORD18_CMD_EXT_MASK		GENMASK(30, 29)
 #define BFPT_DWORD18_CMD_EXT_REP		(0x0UL << 29) /* Repeat */
 #define BFPT_DWORD18_CMD_EXT_INV		(0x1UL << 29) /* Invert */
Signature · 6 lines
2.25.1


______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/
#1 lore raw

Hi,

Quoted 1 line

BFPT 17th DWORD contains the informations about 1-1-8,

Ok.

Quoted 3 lines

The difference from Dual and Quad mode is not determined by a single bit indicating support but rather by using 1-byte instruction, which content is the opcode.

I don't get what you try to express here.

Quoted 30 lines

A value of 0x00 represents not support. Therefore, parse BFPT 17 DWORD instruction to determine whether flash support 1-1-8, and set its dummy cycle accordingly.

---
 drivers/mtd/spi-nor/sfdp.c | 15 ++++++++++++++-
 drivers/mtd/spi-nor/sfdp.h |  3 +++
 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/mtd/spi-nor/sfdp.c +1 -0
index b3b11dfed789..d04dbddb70d6 100644
@@ -446,6 +446,7 @@ static int spi_nor_parse_bfpt(struct spi_nor *nor,
 	u32 dword;
 	u16 half;
 	u8 erase_mask;
+	u8 dummy, opcode;
 
 	/* JESD216 Basic Flash Parameter Table length is at least 9 DWORDs. 
 */
drivers/mtd/spi-nor/sfdp.c +1 -0
 	if (bfpt_header->length < BFPT_DWORD_MAX_JESD216)
@@ -516,6 +517,18 @@ static int spi_nor_parse_bfpt(struct spi_nor *nor,
 		spi_nor_set_read_settings_from_bfpt(read, half, rd->proto);
 	}
 
+	/* Make sure BFPT provide dwords more than 16 and parsing 1-1-8 

information */

drivers/mtd/spi-nor/sfdp.c static int spi_nor_parse_bfpt(struct spi_nor *nor, · line 521

Quoted 1 line
drivers/mtd/spi-nor/sfdp.c +1 -0
+	if (bfpt_header->length > BFPT_DWORD_MAX_JESD216B) {

Move that into the JESD216B and later parsing code and you don't need this condition anymore. That is below

if (bfpt_header->length == BFPT_DWORD_MAX_JESD216)

	return spi_nor_post_bfpt_fixups(nor, bfpt_header, &bfpt);

drivers/mtd/spi-nor/sfdp.c static int spi_nor_parse_bfpt(struct spi_nor *nor, · line 524

Quoted 5 lines
drivers/mtd/spi-nor/sfdp.c +1 -0
+		opcode = FIELD_GET(BFPT_DWORD17_RD_1_1_8_CMD, 

bfpt.dwords[SFDP_DWORD(17)]);

drivers/mtd/spi-nor/sfdp.c +1 -0
+		dummy = FIELD_GET(BFPT_DWORD17_RD_1_1_8_DUMMY, 

bfpt.dwords[SFDP_DWORD(17)]);

drivers/mtd/spi-nor/sfdp.c +1 -0
+		if (opcode) {

move the dummy here and you can just declare dummy here.

everything else looks sane to me.

-michael

Quoted 32 lines
drivers/mtd/spi-nor/sfdp.c +7 -0
+			nor->params->hwcaps.mask |= SNOR_HWCAPS_READ_1_1_8;
+			spi_nor_set_read_settings(&nor->params->reads[SNOR_CMD_READ_1_1_8],
+					  0, dummy, opcode,
+					  SNOR_PROTO_1_1_8);
+		}
+	}
+
 	/*
 	 * Sector Erase settings. Reinitialize the uniform erase map using 

the

drivers/mtd/spi-nor/sfdp.c +1 -1
 	 * Erase Types defined in the bfpt table.
@@ -525,7 +538,6 @@ static int spi_nor_parse_bfpt(struct spi_nor *nor,
 	for (i = 0; i < ARRAY_SIZE(sfdp_bfpt_erases); i++) {
 		const struct sfdp_bfpt_erase *er = &sfdp_bfpt_erases[i];
 		u32 erasesize;
-		u8 opcode;
 
 		half = bfpt.dwords[er->dword] >> er->shift;
 		erasesize = half & 0xff;
@@ -968,6 +980,7 @@ static int spi_nor_parse_4bait(struct spi_nor *nor,
 		{ SNOR_HWCAPS_READ_1_1_1_DTR,	BIT(13) },
 		{ SNOR_HWCAPS_READ_1_2_2_DTR,	BIT(14) },
 		{ SNOR_HWCAPS_READ_1_4_4_DTR,	BIT(15) },
+		{ SNOR_HWCAPS_READ_1_1_8,	BIT(20) },
 	};
 	static const struct sfdp_4bait programs[] = {
 		{ SNOR_HWCAPS_PP,		BIT(6) },
drivers/mtd/spi-nor/sfdp.h +0 -0
index 6eb99e1cdd61..584a05f9931d 100644

drivers/mtd/spi-nor/sfdp.h struct sfdp_bfpt { · line 126

Quoted 9 lines
drivers/mtd/spi-nor/sfdp.h +3 -0
@@ -118,6 +118,9 @@ struct sfdp_bfpt {
 	(BFPT_DWORD16_EN4B_EN4B | BFPT_DWORD16_EX4B_EX4B)
 #define BFPT_DWORD16_SWRST_EN_RST		BIT(12)
 
+#define BFPT_DWORD17_RD_1_1_8_CMD		GENMASK(31, 24)
+#define BFPT_DWORD17_RD_1_1_8_DUMMY		GENMASK(20, 16)
+
 #define BFPT_DWORD18_CMD_EXT_MASK		GENMASK(30, 29)
 #define BFPT_DWORD18_CMD_EXT_REP		(0x0UL << 29) /* Repeat */
 #define BFPT_DWORD18_CMD_EXT_INV		(0x1UL << 29) /* Invert */

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/

author
#2 lore raw

Hi Michael

Quoted 5 lines

Hi,

Quoted 1 line

BFPT 17th DWORD contains the informations about 1-1-8,

Quoted 7 lines

Ok.

Quoted 3 lines

The difference from Dual and Quad mode is not determined by a single bit indicating support but rather by using 1-byte instruction, which content is the opcode.

I don't get what you try to express here.

In struct sfdp_bfpt_reads[], support bit and setting are defined for every Dual and Quad protocol.
It is a good way for checking whether the protocol support. 1-1-8 would be check by 1-byte instruction but sfdp_bfpt_reads[].

Quoted 29 lines
Quoted 29 lines

A value of 0x00 represents not support. Therefore, parse BFPT 17 DWORD instruction to determine whether flash support 1-1-8, and set its dummy cycle accordingly.

---
 drivers/mtd/spi-nor/sfdp.c | 15 ++++++++++++++-
 drivers/mtd/spi-nor/sfdp.h |  3 +++
 2 files changed, 17 insertions(+), 1 deletion(-)
drivers/mtd/spi-nor/sfdp.c +1 -0
index b3b11dfed789..d04dbddb70d6 100644
@@ -446,6 +446,7 @@ static int spi_nor_parse_bfpt(struct spi_nor *nor,
      u32 dword;
      u16 half;
      u8 erase_mask;
+     u8 dummy, opcode;
 
      /* JESD216 Basic Flash Parameter Table length is at least 9 DWORDs.
 */
      if (bfpt_header->length < BFPT_DWORD_MAX_JESD216)
drivers/mtd/spi-nor/sfdp.c +0 -0
@@ -516,6 +517,18 @@ static int spi_nor_parse_bfpt(struct spi_nor *nor,
              spi_nor_set_read_settings_from_bfpt(read, half, rd->proto);
      }
 
Quoted 6 lines
Quoted 3 lines
drivers/mtd/spi-nor/sfdp.c +1 -0
+     /* Make sure BFPT provide dwords more than 16 and parsing 1-1-8

information */
+ if (bfpt_header->length > BFPT_DWORD_MAX_JESD216B) {

Move that into the JESD216B and later parsing code and you don't need this condition anymore. That is below

Sounds good, got it.

Quoted 11 lines

if (bfpt_header->length == BFPT_DWORD_MAX_JESD216)

        return spi_nor_post_bfpt_fixups(nor, bfpt_header, &bfpt);
Quoted 5 lines

+ opcode = FIELD_GET(BFPT_DWORD17_RD_1_1_8_CMD,
bfpt.dwords[SFDP_DWORD(17)]);
+ dummy = FIELD_GET(BFPT_DWORD17_RD_1_1_8_DUMMY,
bfpt.dwords[SFDP_DWORD(17)]);
+ if (opcode) {

move the dummy here and you can just declare dummy here.

Got it.

Quoted 4 lines

everything else looks sane to me.

-michael

Thanks
Jaime

Quoted 36 lines
Quoted 36 lines
drivers/mtd/spi-nor/sfdp.c +7 -0
+                     nor->params->hwcaps.mask |= SNOR_HWCAPS_READ_1_1_8;
+                     spi_nor_set_read_settings(&nor->params->reads[SNOR_CMD_READ_1_1_8],
+                                       0, dummy, opcode,
+                                       SNOR_PROTO_1_1_8);
+             }
+     }
+
      /*
       * Sector Erase settings. Reinitialize the uniform erase map using

the
* Erase Types defined in the bfpt table.

drivers/mtd/spi-nor/sfdp.c +1 -1
@@ -525,7 +538,6 @@ static int spi_nor_parse_bfpt(struct spi_nor *nor,
      for (i = 0; i < ARRAY_SIZE(sfdp_bfpt_erases); i++) {
              const struct sfdp_bfpt_erase *er = &sfdp_bfpt_erases[i];
              u32 erasesize;
-             u8 opcode;
 
              half = bfpt.dwords[er->dword] >> er->shift;
              erasesize = half & 0xff;
@@ -968,6 +980,7 @@ static int spi_nor_parse_4bait(struct spi_nor *nor,
              { SNOR_HWCAPS_READ_1_1_1_DTR,   BIT(13) },
              { SNOR_HWCAPS_READ_1_2_2_DTR,   BIT(14) },
              { SNOR_HWCAPS_READ_1_4_4_DTR,   BIT(15) },
+             { SNOR_HWCAPS_READ_1_1_8,       BIT(20) },
      };
      static const struct sfdp_4bait programs[] = {
              { SNOR_HWCAPS_PP,               BIT(6) },
drivers/mtd/spi-nor/sfdp.h +0 -0
index 6eb99e1cdd61..584a05f9931d 100644
@@ -118,6 +118,9 @@ struct sfdp_bfpt {
      (BFPT_DWORD16_EN4B_EN4B | BFPT_DWORD16_EX4B_EX4B)
 #define BFPT_DWORD16_SWRST_EN_RST            BIT(12)
 
Quoted 6 lines

drivers/mtd/spi-nor/sfdp.h struct sfdp_bfpt { · line 126

Quoted 6 lines
drivers/mtd/spi-nor/sfdp.h +3 -0
+#define BFPT_DWORD17_RD_1_1_8_CMD            GENMASK(31, 24)
+#define BFPT_DWORD17_RD_1_1_8_DUMMY          GENMASK(20, 16)
+
 #define BFPT_DWORD18_CMD_EXT_MASK            GENMASK(30, 29)
 #define BFPT_DWORD18_CMD_EXT_REP             (0x0UL << 29) /* Repeat */
 #define BFPT_DWORD18_CMD_EXT_INV             (0x1UL << 29) /* Invert */

______________________________________________________
Linux MTD discussion mailing list
http://lists.infradead.org/mailman/listinfo/linux-mtd/