mtd: spi-nor: Set SPI_NOR_4B_OPCODES on all >16MB Spansion NORs
Subsystems (2)
PATCH 1/1 mtd: spi-nor: Set SPI_NOR_4B_OPCODES on all >16MB Spansion NORs
The code was treating >16MB Spansion NORs as a special case, while they could just be flagged with SPI_NOR_4B_OPCODES and be treated as other NORs.
This change simplifies the code and makes it explicit that those parts are supporting 4B addressing.
---
I've checked the datasheet of s25fl512s and s70fl01gs, and they indeed support 4B opcodes. Other Spansion NORs might also support 4B opcodes, but those that are not already have SPI_NOR_4B_OPCODES set are anyway <16MB in size.
Also, I kept NOR definitions on a single line, since those were already over 80chars. Marek, let me know if you want me to change that for the GigaDevice formatting:
{
"gd25q16", INFO(0xc84015, 0, 64 * 1024, 32,
SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ |
SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB)
},
---
drivers/mtd/spi-nor/spi-nor.c | 9 +++------
1 file changed, 3 insertions(+), 6 deletions(-)drivers/mtd/spi-nor/spi-nor.c +3 -6
@@ -1416,8 +1416,8 @@ static const struct flash_info spi_nor_ids[] = { { "s25sl064p", INFO(0x010216, 0x4d00, 64 * 1024, 128, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, USE_CLSR) }, { "s25fl256s1", INFO(0x010219, 0x4d01, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, - { "s25fl512s", INFO(0x010220, 0x4d00, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, - { "s70fl01gs", INFO(0x010221, 0x4d00, 256 * 1024, 256, 0) }, + { "s25fl512s", INFO(0x010220, 0x4d00, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR | SPI_NOR_4B_OPCODES) }, + { "s70fl01gs", INFO(0x010221, 0x4d00, 256 * 1024, 256, SPI_NOR_4B_OPCODES) }, { "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024, 64, 0) }, { "s25sl12801", INFO(0x012018, 0x0301, 64 * 1024, 256, 0) }, { "s25fl128s", INFO6(0x012018, 0x4d0180, 64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) },
@@ -3558,7 +3558,6 @@ static int spi_nor_init(struct spi_nor *nor) }if ((nor->addr_width ==4 ) && - (JEDEC_MFR (nor->info) !=SNOR_MFR_SPANSION ) && !(nor->info->flags &SPI_NOR_4B_OPCODES )) {/* * If the RESET# pin isn't hooked up properly, or the system
@@ -3592,7 +3591,6 @@ void spi_nor_restore(struct spi_nor *nor) {/* restore the addressing mode */ if ((nor->addr_width ==4 ) && - (JEDEC_MFR (nor->info) !=SNOR_MFR_SPANSION ) && !(nor->info->flags &SPI_NOR_4B_OPCODES ) && (nor->flags &SNOR_F_BROKEN_RESET ))set_4byte (nor, nor->info,0 );
@@ -3749,8 +3747,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, }else if (mtd->size >0x1000000 ) {/* enable 4-byte addressing if the device exceeds 16MiB */ nor->addr_width =4 ; -if (JEDEC_MFR (info) ==SNOR_MFR_SPANSION || - info->flags &SPI_NOR_4B_OPCODES ) +if (info->flags &SPI_NOR_4B_OPCODES )spi_nor_set_4byte_opcodes (nor, info); }else { nor->addr_width =3 ;
Signature · 1 line
2.14.1
Hi Boris,
Le 20/09/2018 à 16:14, Boris Brezillon a écrit :
Quoted 32 lines
The code was treating >16MB Spansion NORs as a special case, while they could just be flagged with
SPI_NOR_4B_OPCODESand be treated as other NORs.This change simplifies the code and makes it explicit that those parts are supporting 4B addressing.
Signed-off-by Boris Brezillon <[email protected]>---
I've checked the datasheet of s25fl512s and s70fl01gs, and they indeed support 4B opcodes. Other Spansion NORs might also support 4B opcodes, but those that are not already haveSPI_NOR_4B_OPCODESset are anyway <16MB in size.Also, I kept NOR definitions on a single line, since those were already over 80chars. Marek, let me know if you want me to change that for the GigaDevice formatting:
{ "gd25q16", INFO(0xc84015, 0, 64 * 1024, 32, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) }, --- drivers/mtd/spi-nor/spi-nor.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)drivers/mtd/spi-nor/spi-nor.c +0
-0
drivers/mtd/spi-nor/spi-nor.c static const struct flash_info spi_nor_ids[] = { · line 1418
Quoted 3 lines
drivers/mtd/spi-nor/spi-nor.c +0
-0@@ -1416,8 +1416,8 @@ static const struct flash_info spi_nor_ids[] = { { "s25sl064p", INFO(0x010216, 0x4d00, 64 * 1024, 128, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, USE_CLSR) }, { "s25fl256s1", INFO(0x010219, 0x4d01, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) },
You need to add the SPI_NOR_4B_OPCODES to all Spansion/Cypress memory parts > 128Mbits, hence also to 256Mbits memory parts ;)
Best regards,
Cyrille
Quoted 34 lines
drivers/mtd/spi-nor/spi-nor.c +3
-6- { "s25fl512s", INFO(0x010220, 0x4d00, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) }, - { "s70fl01gs", INFO(0x010221, 0x4d00, 256 * 1024, 256, 0) }, + { "s25fl512s", INFO(0x010220, 0x4d00, 256 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR | SPI_NOR_4B_OPCODES) }, + { "s70fl01gs", INFO(0x010221, 0x4d00, 256 * 1024, 256, SPI_NOR_4B_OPCODES) }, { "s25sl12800", INFO(0x012018, 0x0300, 256 * 1024, 64, 0) }, { "s25sl12801", INFO(0x012018, 0x0301, 64 * 1024, 256, 0) }, { "s25fl128s", INFO6(0x012018, 0x4d0180, 64 * 1024, 256, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) },@@ -3558,7 +3558,6 @@ static int spi_nor_init(struct spi_nor *nor) }if ((nor->addr_width ==4 ) && - (JEDEC_MFR (nor->info) !=SNOR_MFR_SPANSION ) && !(nor->info->flags &SPI_NOR_4B_OPCODES )) {/* * If the RESET# pin isn't hooked up properly, or the system @@ -3592,7 +3591,6 @@ void spi_nor_restore(struct spi_nor *nor) {/* restore the addressing mode */ if ((nor->addr_width ==4 ) && - (JEDEC_MFR (nor->info) !=SNOR_MFR_SPANSION ) && !(nor->info->flags &SPI_NOR_4B_OPCODES ) && (nor->flags &SNOR_F_BROKEN_RESET ))set_4byte (nor, nor->info,0 );@@ -3749,8 +3747,7 @@ int spi_nor_scan(struct spi_nor *nor, const char *name, }else if (mtd->size >0x1000000 ) {/* enable 4-byte addressing if the device exceeds 16MiB */ nor->addr_width =4 ; -if (JEDEC_MFR (info) ==SNOR_MFR_SPANSION || - info->flags &SPI_NOR_4B_OPCODES ) +if (info->flags &SPI_NOR_4B_OPCODES )spi_nor_set_4byte_opcodes (nor, info); }else { nor->addr_width =3 ;
Hi Cyrille,
Quoted 30 lines · On Thu, 20 Sep 2018 16:28:43 +0200 Cyrille Pitchen…
Hi Boris,
Le 20/09/2018 à 16:14, Boris Brezillon a écrit :
Quoted 27 lines
The code was treating >16MB Spansion NORs as a special case, while they could just be flagged with
SPI_NOR_4B_OPCODESand be treated as other NORs.This change simplifies the code and makes it explicit that those parts are supporting 4B addressing.
Signed-off-by Boris Brezillon <[email protected]>---
I've checked the datasheet of s25fl512s and s70fl01gs, and they indeed support 4B opcodes. Other Spansion NORs might also support 4B opcodes, but those that are not already haveSPI_NOR_4B_OPCODESset are anyway <16MB in size.Also, I kept NOR definitions on a single line, since those were already over 80chars. Marek, let me know if you want me to change that for the GigaDevice formatting:
{ "gd25q16", INFO(0xc84015, 0, 64 * 1024, 32, SECT_4K | SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | SPI_NOR_HAS_LOCK | SPI_NOR_HAS_TB) }, --- drivers/mtd/spi-nor/spi-nor.c | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-)
Quoted 11 lines
drivers/mtd/spi-nor/spi-nor.c static const struct flash_info spi_nor_ids[] = { · line 1418
Quoted 8 lines
drivers/mtd/spi-nor/spi-nor.c +0
-0@@ -1416,8 +1416,8 @@ static const struct flash_info spi_nor_ids[] = { { "s25sl064p", INFO(0x010216, 0x4d00, 64 * 1024, 128, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ) }, { "s25fl256s0", INFO(0x010219, 0x4d00, 256 * 1024, 128, USE_CLSR) }, { "s25fl256s1", INFO(0x010219, 0x4d01, 64 * 1024, 512, SPI_NOR_DUAL_READ | SPI_NOR_QUAD_READ | USE_CLSR) },You need to add the
SPI_NOR_4B_OPCODESto all Spansion/Cypress memory parts > 128Mbits, hence also to 256Mbits memory parts ;)
Crap! I missed those ones. Will fix it in a v2.
Thanks,
Boris