Keep CFR5V[6] as 1 in Octal DTR enable
Subsystems (2)
v2 cover Keep CFR5V[6] as 1 in Octal DTR enable
From: Takahiro Kuwano <[email protected]>
Same fix is needed in Linux MTD [0] and Tudor helped for that [1][2]. This series applies the same changes as Linux MTD.
[0] https://patchwork.ozlabs.org/project/linux-mtd/patch/[email protected]/
[1] https://patchwork.ozlabs.org/project/linux-mtd/patch/[email protected]/
[2] https://patchwork.ozlabs.org/project/linux-mtd/patch/[email protected]/
Takahiro Kuwano (2):
mtd: spi-nor: Consider reserved bits in CFR5 register
mtd: spi-nor: Make CFRx reg fields generic
drivers/mtd/spi/spi-nor-core.c | 8 ++++---- include/linux/mtd/spi-nor.h | 13 +++++++++---- 2 files changed, 13 insertions(+), 8 deletions(-)
Signature · 1 line
2.25.1
PATCH v2 1/2 mtd: spi-nor-core: Consider reserved bits in CFR5 register
From: Takahiro Kuwano <[email protected]>
CFR5[6] is reserved bit and must be always 1. Set it to comply with flash requirements. While fixing SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN definition, stop using magic numbers and describe the missing bit fields in CFR5 register. This is useful for both readability and future possible addition of Octal STR mode support.
--- include/linux/mtd/spi-nor.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
include/linux/mtd/spi-nor.h +6 -1
@@ -194,7 +194,12 @@#define SPINOR_REG_CYPRESS_CFR3V_PGSZ BIT(4)/* Page size. */ #define SPINOR_REG_CYPRESS_CFR3V_UNISECT BIT(3)/* Uniform sector mode */ #define SPINOR_REG_CYPRESS_CFR5V 0x00800006 -#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN 0x3 +#define SPINOR_REG_CYPRESS_CFR5_BIT6 BIT(6) +#define SPINOR_REG_CYPRESS_CFR5_DDR BIT(1) +#define SPINOR_REG_CYPRESS_CFR5_OPI BIT(0) +#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN \ + (SPINOR_REG_CYPRESS_CFR5_BIT6 | SPINOR_REG_CYPRESS_CFR5_DDR | \ + SPINOR_REG_CYPRESS_CFR5_OPI)#define SPINOR_OP_CYPRESS_RD_FAST 0xee/* Supported SPI protocols */
Signature · 1 line
2.25.1
Re: [PATCH v2 1/2] mtd: spi-nor-core: Consider reserved bits in CFR5 register
Quoted 11 lines · On 1/20/23 03:28, [email protected] wrote:
From: Takahiro Kuwano <[email protected]>
CFR5[6] is reserved bit and must be always 1. Set it to comply with flash requirements. While fixing
SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_ENdefinition, stop using magic numbers and describe the missing bit fields in CFR5 register. This is useful for both readability and future possible addition of Octal STR mode support.Fixes ea9a22f7e79c ("mtd: spi-nor-core: Add support for Cypress Semper flash")Suggested-by Tudor Ambarus <[email protected]>Signed-off-by Takahiro Kuwano <[email protected]>
Quoted 22 lines
--- include/linux/mtd/spi-nor.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)include/linux/mtd/spi-nor.h +6
-1@@ -194,7 +194,12 @@#define SPINOR_REG_CYPRESS_CFR3V_PGSZ BIT(4)/* Page size. */ #define SPINOR_REG_CYPRESS_CFR3V_UNISECT BIT(3)/* Uniform sector mode */ #define SPINOR_REG_CYPRESS_CFR5V 0x00800006 -#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN 0x3 +#define SPINOR_REG_CYPRESS_CFR5_BIT6 BIT(6) +#define SPINOR_REG_CYPRESS_CFR5_DDR BIT(1) +#define SPINOR_REG_CYPRESS_CFR5_OPI BIT(0) +#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN \ + (SPINOR_REG_CYPRESS_CFR5_BIT6 | SPINOR_REG_CYPRESS_CFR5_DDR | \ + SPINOR_REG_CYPRESS_CFR5_OPI)#define SPINOR_OP_CYPRESS_RD_FAST 0xee/* Supported SPI protocols */
Re: [PATCH v2 1/2] mtd: spi-nor-core: Consider reserved bits in CFR5 register
In reply to [email protected]Quoted 8 lines · On 20/01/23 08:58, [email protected] wrote:
From: Takahiro Kuwano <[email protected]>
CFR5[6] is reserved bit and must be always 1. Set it to comply with flash requirements. While fixing
SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_ENdefinition, stop using magic numbers and describe the missing bit fields in CFR5 register. This is useful for both readability and future possible addition of Octal STR mode support.
Quoted 4 lines
Fixes ea9a22f7e79c ("mtd: spi-nor-core: Add support for Cypress Semper flash")Suggested-by Tudor Ambarus <[email protected]>Signed-off-by Takahiro Kuwano <[email protected]>---
Quoted 21 lines
include/linux/mtd/spi-nor.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)include/linux/mtd/spi-nor.h +6
-1@@ -194,7 +194,12 @@#define SPINOR_REG_CYPRESS_CFR3V_PGSZ BIT(4)/* Page size. */ #define SPINOR_REG_CYPRESS_CFR3V_UNISECT BIT(3)/* Uniform sector mode */ #define SPINOR_REG_CYPRESS_CFR5V 0x00800006 -#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN 0x3 +#define SPINOR_REG_CYPRESS_CFR5_BIT6 BIT(6) +#define SPINOR_REG_CYPRESS_CFR5_DDR BIT(1) +#define SPINOR_REG_CYPRESS_CFR5_OPI BIT(0) +#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN \ + (SPINOR_REG_CYPRESS_CFR5_BIT6 | SPINOR_REG_CYPRESS_CFR5_DDR | \ + SPINOR_REG_CYPRESS_CFR5_OPI)#define SPINOR_OP_CYPRESS_RD_FAST 0xee/* Supported SPI protocols */
Signature · 3 lines
Best regards, Dhruva Gole Texas Instruments Incorporated
PATCH v2 2/2 mtd: spi-nor-core: Make CFRx reg fields generic
In reply to [email protected]From: Takahiro Kuwano <[email protected]>
Cypress defines two flavors of configuration registers, volatile and non volatile, and both use the same bit fields. Rename the bitfields in the configuration registers so that they can be used for both flavors.
--- drivers/mtd/spi/spi-nor-core.c | 8 ++++---- include/linux/mtd/spi-nor.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)
drivers/mtd/spi/spi-nor-core.c +4 -4
@@ -3373,7 +3373,7 @@ static int spi_nor_cypress_octal_dtr_enable(struct spi_nor *nor)if (ret)return ret; - buf =SPINOR_REG_CYPRESS_CFR2V_MEMLAT_11_24 ; + buf =SPINOR_REG_CYPRESS_CFR2_MEMLAT_11_24 ; op = (struct spi_mem_op)SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_WR_ANY_REG, 1), SPI_MEM_OP_ADDR(addr_width, SPINOR_REG_CYPRESS_CFR2V, 1), SPI_MEM_OP_NO_DUMMY,
@@ -3396,7 +3396,7 @@ static int spi_nor_cypress_octal_dtr_enable(struct spi_nor *nor)if (ret)return ret; - buf =SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN ; + buf =SPINOR_REG_CYPRESS_CFR5_OCT_DTR_EN ; op = (struct spi_mem_op)SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_WR_ANY_REG, 1), SPI_MEM_OP_ADDR(addr_width, SPINOR_REG_CYPRESS_CFR5V, 1), SPI_MEM_OP_NO_DUMMY,
@@ -3444,7 +3444,7 @@ static int s28hx_t_setup(struct spi_nor *nor, const struct flash_info *info,if (ret)return ret; -if (!(buf &SPINOR_REG_CYPRESS_CFR3V_UNISECT )) +if (!(buf &SPINOR_REG_CYPRESS_CFR3_UNISECT )) nor->erase = s28hx_t_erase_non_uniform;return spi_nor_default_setup (nor, info, params);
@@ -3511,7 +3511,7 @@ static int s28hx_t_post_bfpt_fixup(struct spi_nor *nor,if (ret)return ret; -if (buf &SPINOR_REG_CYPRESS_CFR3V_PGSZ ) +if (buf &SPINOR_REG_CYPRESS_CFR3_PGSZ ) params->page_size =512 ;else params->page_size =256 ;
include/linux/mtd/spi-nor.h +4 -4
@@ -189,15 +189,15 @@#define SPINOR_OP_WR_ANY_REG 0x71/* Write any register */ #define SPINOR_OP_S28_SE_4K 0x21#define SPINOR_REG_CYPRESS_CFR2V 0x00800003 -#define SPINOR_REG_CYPRESS_CFR2V_MEMLAT_11_24 0xb +#define SPINOR_REG_CYPRESS_CFR2_MEMLAT_11_24 0xb#define SPINOR_REG_CYPRESS_CFR3V 0x00800004 -#define SPINOR_REG_CYPRESS_CFR3V_PGSZ BIT(4)/* Page size. */ -#define SPINOR_REG_CYPRESS_CFR3V_UNISECT BIT(3)/* Uniform sector mode */ +#define SPINOR_REG_CYPRESS_CFR3_PGSZ BIT(4)/* Page size. */ +#define SPINOR_REG_CYPRESS_CFR3_UNISECT BIT(3)/* Uniform sector mode */ #define SPINOR_REG_CYPRESS_CFR5V 0x00800006#define SPINOR_REG_CYPRESS_CFR5_BIT6 BIT(6)#define SPINOR_REG_CYPRESS_CFR5_DDR BIT(1)#define SPINOR_REG_CYPRESS_CFR5_OPI BIT(0) -#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN \ +#define SPINOR_REG_CYPRESS_CFR5_OCT_DTR_EN \ (SPINOR_REG_CYPRESS_CFR5_BIT6 | SPINOR_REG_CYPRESS_CFR5_DDR | \ SPINOR_REG_CYPRESS_CFR5_OPI)#define SPINOR_OP_CYPRESS_RD_FAST 0xee
Signature · 1 line
2.25.1
Re: [PATCH v2 2/2] mtd: spi-nor-core: Make CFRx reg fields generic
Quoted 8 lines · On 1/20/23 03:28, [email protected] wrote:
From: Takahiro Kuwano <[email protected]>
Cypress defines two flavors of configuration registers, volatile and non volatile, and both use the same bit fields. Rename the bitfields in the configuration registers so that they can be used for both flavors.
Suggested-by Tudor Ambarus <[email protected]>Signed-off-by Takahiro Kuwano <[email protected]>
Quoted 69 lines
--- drivers/mtd/spi/spi-nor-core.c | 8 ++++---- include/linux/mtd/spi-nor.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)drivers/mtd/spi/spi-nor-core.c +4
-4@@ -3373,7 +3373,7 @@ static int spi_nor_cypress_octal_dtr_enable(struct spi_nor *nor)if (ret)return ret; - buf =SPINOR_REG_CYPRESS_CFR2V_MEMLAT_11_24 ; + buf =SPINOR_REG_CYPRESS_CFR2_MEMLAT_11_24 ; op = (struct spi_mem_op)SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_WR_ANY_REG, 1), SPI_MEM_OP_ADDR(addr_width, SPINOR_REG_CYPRESS_CFR2V, 1), SPI_MEM_OP_NO_DUMMY,@@ -3396,7 +3396,7 @@ static int spi_nor_cypress_octal_dtr_enable(struct spi_nor *nor)if (ret)return ret; - buf =SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN ; + buf =SPINOR_REG_CYPRESS_CFR5_OCT_DTR_EN ; op = (struct spi_mem_op)SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_WR_ANY_REG, 1), SPI_MEM_OP_ADDR(addr_width, SPINOR_REG_CYPRESS_CFR5V, 1), SPI_MEM_OP_NO_DUMMY,@@ -3444,7 +3444,7 @@ static int s28hx_t_setup(struct spi_nor *nor, const struct flash_info *info,if (ret)return ret; -if (!(buf &SPINOR_REG_CYPRESS_CFR3V_UNISECT )) +if (!(buf &SPINOR_REG_CYPRESS_CFR3_UNISECT )) nor->erase = s28hx_t_erase_non_uniform;return spi_nor_default_setup (nor, info, params);@@ -3511,7 +3511,7 @@ static int s28hx_t_post_bfpt_fixup(struct spi_nor *nor,if (ret)return ret; -if (buf &SPINOR_REG_CYPRESS_CFR3V_PGSZ ) +if (buf &SPINOR_REG_CYPRESS_CFR3_PGSZ ) params->page_size =512 ;else params->page_size =256 ;include/linux/mtd/spi-nor.h +4
-4@@ -189,15 +189,15 @@#define SPINOR_OP_WR_ANY_REG 0x71/* Write any register */ #define SPINOR_OP_S28_SE_4K 0x21#define SPINOR_REG_CYPRESS_CFR2V 0x00800003 -#define SPINOR_REG_CYPRESS_CFR2V_MEMLAT_11_24 0xb +#define SPINOR_REG_CYPRESS_CFR2_MEMLAT_11_24 0xb#define SPINOR_REG_CYPRESS_CFR3V 0x00800004 -#define SPINOR_REG_CYPRESS_CFR3V_PGSZ BIT(4)/* Page size. */ -#define SPINOR_REG_CYPRESS_CFR3V_UNISECT BIT(3)/* Uniform sector mode */ +#define SPINOR_REG_CYPRESS_CFR3_PGSZ BIT(4)/* Page size. */ +#define SPINOR_REG_CYPRESS_CFR3_UNISECT BIT(3)/* Uniform sector mode */ #define SPINOR_REG_CYPRESS_CFR5V 0x00800006#define SPINOR_REG_CYPRESS_CFR5_BIT6 BIT(6)#define SPINOR_REG_CYPRESS_CFR5_DDR BIT(1)#define SPINOR_REG_CYPRESS_CFR5_OPI BIT(0) -#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN \ +#define SPINOR_REG_CYPRESS_CFR5_OCT_DTR_EN \ (SPINOR_REG_CYPRESS_CFR5_BIT6 | SPINOR_REG_CYPRESS_CFR5_DDR | \ SPINOR_REG_CYPRESS_CFR5_OPI)#define SPINOR_OP_CYPRESS_RD_FAST 0xee
Re: [PATCH v2 2/2] mtd: spi-nor-core: Make CFRx reg fields generic
In reply to [email protected]Quoted 9 lines · On 20/01/23 08:58, [email protected] wrote:
From: Takahiro Kuwano <[email protected]>
Cypress defines two flavors of configuration registers, volatile and non volatile, and both use the same bit fields. Rename the bitfields in the configuration registers so that they can be used for both flavors.
Suggested-by Tudor Ambarus <[email protected]>Signed-off-by Takahiro Kuwano <[email protected]>---
Quoted 68 lines
drivers/mtd/spi/spi-nor-core.c | 8 ++++---- include/linux/mtd/spi-nor.h | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-)drivers/mtd/spi/spi-nor-core.c +4
-4@@ -3373,7 +3373,7 @@ static int spi_nor_cypress_octal_dtr_enable(struct spi_nor *nor)if (ret)return ret; - buf =SPINOR_REG_CYPRESS_CFR2V_MEMLAT_11_24 ; + buf =SPINOR_REG_CYPRESS_CFR2_MEMLAT_11_24 ; op = (struct spi_mem_op)SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_WR_ANY_REG, 1), SPI_MEM_OP_ADDR(addr_width, SPINOR_REG_CYPRESS_CFR2V, 1), SPI_MEM_OP_NO_DUMMY,@@ -3396,7 +3396,7 @@ static int spi_nor_cypress_octal_dtr_enable(struct spi_nor *nor)if (ret)return ret; - buf =SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN ; + buf =SPINOR_REG_CYPRESS_CFR5_OCT_DTR_EN ; op = (struct spi_mem_op)SPI_MEM_OP(SPI_MEM_OP_CMD(SPINOR_OP_WR_ANY_REG, 1), SPI_MEM_OP_ADDR(addr_width, SPINOR_REG_CYPRESS_CFR5V, 1), SPI_MEM_OP_NO_DUMMY,@@ -3444,7 +3444,7 @@ static int s28hx_t_setup(struct spi_nor *nor, const struct flash_info *info,if (ret)return ret; -if (!(buf &SPINOR_REG_CYPRESS_CFR3V_UNISECT )) +if (!(buf &SPINOR_REG_CYPRESS_CFR3_UNISECT )) nor->erase = s28hx_t_erase_non_uniform;return spi_nor_default_setup (nor, info, params);@@ -3511,7 +3511,7 @@ static int s28hx_t_post_bfpt_fixup(struct spi_nor *nor,if (ret)return ret; -if (buf &SPINOR_REG_CYPRESS_CFR3V_PGSZ ) +if (buf &SPINOR_REG_CYPRESS_CFR3_PGSZ ) params->page_size =512 ;else params->page_size =256 ;include/linux/mtd/spi-nor.h +4
-4@@ -189,15 +189,15 @@#define SPINOR_OP_WR_ANY_REG 0x71/* Write any register */ #define SPINOR_OP_S28_SE_4K 0x21#define SPINOR_REG_CYPRESS_CFR2V 0x00800003 -#define SPINOR_REG_CYPRESS_CFR2V_MEMLAT_11_24 0xb +#define SPINOR_REG_CYPRESS_CFR2_MEMLAT_11_24 0xb#define SPINOR_REG_CYPRESS_CFR3V 0x00800004 -#define SPINOR_REG_CYPRESS_CFR3V_PGSZ BIT(4)/* Page size. */ -#define SPINOR_REG_CYPRESS_CFR3V_UNISECT BIT(3)/* Uniform sector mode */ +#define SPINOR_REG_CYPRESS_CFR3_PGSZ BIT(4)/* Page size. */ +#define SPINOR_REG_CYPRESS_CFR3_UNISECT BIT(3)/* Uniform sector mode */ #define SPINOR_REG_CYPRESS_CFR5V 0x00800006#define SPINOR_REG_CYPRESS_CFR5_BIT6 BIT(6)#define SPINOR_REG_CYPRESS_CFR5_DDR BIT(1)#define SPINOR_REG_CYPRESS_CFR5_OPI BIT(0) -#define SPINOR_REG_CYPRESS_CFR5V_OCT_DTR_EN \ +#define SPINOR_REG_CYPRESS_CFR5_OCT_DTR_EN \ (SPINOR_REG_CYPRESS_CFR5_BIT6 | SPINOR_REG_CYPRESS_CFR5_DDR | \ SPINOR_REG_CYPRESS_CFR5_OPI)#define SPINOR_OP_CYPRESS_RD_FAST 0xee
Signature · 3 lines
Best regards, Dhruva Gole Texas Instruments Incorporated
Quoted 6 lines · On Fri, Jan 20, 2023 at 8:59 AM <[email protected]> wrote:
From: Takahiro Kuwano <[email protected]>
Same fix is needed in Linux MTD [0] and Tudor helped for that [1][2]. This series applies the same changes as Linux MTD.
Quoted 7 lines
[0] https://patchwork.ozlabs.org/project/linux-mtd/patch/[email protected]/
[1] https://patchwork.ozlabs.org/project/linux-mtd/patch/[email protected]/
[2] https://patchwork.ozlabs.org/project/linux-mtd/patch/[email protected]/Takahiro Kuwano (2):
mtd: spi-nor: Consider reserved bits in CFR5 register
mtd: spi-nor: Make CFRx reg fields generic
Applied to u-boot-spi/master