m25p80.c extended jedec support
PATCH v2 1/1 m25p80.c extended jedec support
- add extended device information support
- add s25sl128 device support
---
This is a fixed version to support extended ID on m25p80xx devices. Because I have no other eeproms based on SPI but s25sl128, someone would help me to test it on other devices ?
BTW, dave, I don't find any other fixes in this file recently. What do you mean something has been there in the git tree, which git tree ?
drivers/mtd/devices/m25p80.c | 90 +++++++++++++++++++++++------------------- 1 files changed, 49 insertions(+), 41 deletions(-)
drivers/mtd/devices/m25p80.c +49 -41
@@ -437,6 +437,7 @@ struct flash_info {* then a two byte device id. */ u32 jedec_id; +u16 ext_id;/* The size listed here is what works with OPCODE_SE, which isn't * necessarily called a "sector" by the vendor.
@@ -456,72 +457,75 @@ struct flash_info {static struct flash_info __devinitdata m25p_data [] = {/* Atmel -- some are (confusingly) marketed as "DataFlash" */ - {"at25fs010" ,0x1f6601 ,32 *1024 ,4 ,SECT_4K , }, - {"at25fs040" ,0x1f6604 ,64 *1024 ,8 ,SECT_4K , }, + {"at25fs010" ,0x1f6601 ,0 ,32 *1024 ,4 ,SECT_4K , }, + {"at25fs040" ,0x1f6604 ,0 ,64 *1024 ,8 ,SECT_4K , }, - {"at25df041a" ,0x1f4401 ,64 *1024 ,8 ,SECT_4K , }, - {"at25df641" ,0x1f4800 ,64 *1024 ,128 ,SECT_4K , }, + {"at25df041a" ,0x1f4401 ,0 ,64 *1024 ,8 ,SECT_4K , }, + {"at25df641" ,0x1f4800 ,0 ,64 *1024 ,128 ,SECT_4K , }, - {"at26f004" ,0x1f0400 ,64 *1024 ,8 ,SECT_4K , }, - {"at26df081a" ,0x1f4501 ,64 *1024 ,16 ,SECT_4K , }, - {"at26df161a" ,0x1f4601 ,64 *1024 ,32 ,SECT_4K , }, - {"at26df321" ,0x1f4701 ,64 *1024 ,64 ,SECT_4K , }, + {"at26f004" ,0x1f0400 ,0 ,64 *1024 ,8 ,SECT_4K , }, + {"at26df081a" ,0x1f4501 ,0 ,64 *1024 ,16 ,SECT_4K , }, + {"at26df161a" ,0x1f4601 ,0 ,64 *1024 ,32 ,SECT_4K , }, + {"at26df321" ,0x1f4701 ,0 ,64 *1024 ,64 ,SECT_4K , },/* Spansion -- single (large) sector size only, at least * for the chips listed here (without boot sectors). */ - {"s25sl004a" ,0x010212 ,64 *1024 ,8 , }, - {"s25sl008a" ,0x010213 ,64 *1024 ,16 , }, - {"s25sl016a" ,0x010214 ,64 *1024 ,32 , }, - {"s25sl032a" ,0x010215 ,64 *1024 ,64 , }, - {"s25sl064a" ,0x010216 ,64 *1024 ,128 , }, + {"s25sl004a" ,0x010212 ,0 ,64 *1024 ,8 , }, + {"s25sl008a" ,0x010213 ,0 ,64 *1024 ,16 , }, + {"s25sl016a" ,0x010214 ,0 ,64 *1024 ,32 , }, + {"s25sl032a" ,0x010215 ,0 ,64 *1024 ,64 , }, + {"s25sl064a" ,0x010216 ,0 ,64 *1024 ,128 , }, + {"s25sl12800" ,0x012018 ,0x0300 ,256 *1024 ,64 , }, + {"s25sl12801" ,0x012018 ,0x0301 ,64 *1024 ,256 , },/* SST -- large erase sizes are "overlays", "sectors" are 4K */ - {"sst25vf040b" ,0xbf258d ,64 *1024 ,8 ,SECT_4K , }, - {"sst25vf080b" ,0xbf258e ,64 *1024 ,16 ,SECT_4K , }, - {"sst25vf016b" ,0xbf2541 ,64 *1024 ,32 ,SECT_4K , }, - {"sst25vf032b" ,0xbf254a ,64 *1024 ,64 ,SECT_4K , }, + {"sst25vf040b" ,0xbf258d ,0 ,64 *1024 ,8 ,SECT_4K , }, + {"sst25vf080b" ,0xbf258e ,0 ,64 *1024 ,16 ,SECT_4K , }, + {"sst25vf016b" ,0xbf2541 ,0 ,64 *1024 ,32 ,SECT_4K , }, + {"sst25vf032b" ,0xbf254a ,0 ,64 *1024 ,64 ,SECT_4K , },/* ST Microelectronics -- newer production may have feature updates */ - {"m25p05" ,0x202010 ,32 *1024 ,2 , }, - {"m25p10" ,0x202011 ,32 *1024 ,4 , }, - {"m25p20" ,0x202012 ,64 *1024 ,4 , }, - {"m25p40" ,0x202013 ,64 *1024 ,8 , }, - {"m25p80" ,0 ,64 *1024 ,16 , }, - {"m25p16" ,0x202015 ,64 *1024 ,32 , }, - {"m25p32" ,0x202016 ,64 *1024 ,64 , }, - {"m25p64" ,0x202017 ,64 *1024 ,128 , }, - {"m25p128" ,0x202018 ,256 *1024 ,64 , }, - - {"m45pe80" ,0x204014 ,64 *1024 ,16 , }, - {"m45pe16" ,0x204015 ,64 *1024 ,32 , }, - - {"m25pe80" ,0x208014 ,64 *1024 ,16 , }, - {"m25pe16" ,0x208015 ,64 *1024 ,32 ,SECT_4K , }, + {"m25p05" ,0x202010 ,0 ,32 *1024 ,2 , }, + {"m25p10" ,0x202011 ,0 ,32 *1024 ,4 , }, + {"m25p20" ,0x202012 ,0 ,64 *1024 ,4 , }, + {"m25p40" ,0x202013 ,0 ,64 *1024 ,8 , }, + {"m25p80" ,0 ,0 ,64 *1024 ,16 , }, + {"m25p16" ,0x202015 ,0 ,64 *1024 ,32 , }, + {"m25p32" ,0x202016 ,0 ,64 *1024 ,64 , }, + {"m25p64" ,0x202017 ,0 ,64 *1024 ,128 , }, + {"m25p128" ,0x202018 ,0 ,256 *1024 ,64 , }, + + {"m45pe80" ,0x204014 ,0 ,64 *1024 ,16 , }, + {"m45pe16" ,0x204015 ,0 ,64 *1024 ,32 , }, + + {"m25pe80" ,0x208014 ,0 ,64 *1024 ,16 , }, + {"m25pe16" ,0x208015 ,0 ,64 *1024 ,32 ,SECT_4K , },/* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */ - {"w25x10" ,0xef3011 ,64 *1024 ,2 ,SECT_4K , }, - {"w25x20" ,0xef3012 ,64 *1024 ,4 ,SECT_4K , }, - {"w25x40" ,0xef3013 ,64 *1024 ,8 ,SECT_4K , }, - {"w25x80" ,0xef3014 ,64 *1024 ,16 ,SECT_4K , }, - {"w25x16" ,0xef3015 ,64 *1024 ,32 ,SECT_4K , }, - {"w25x32" ,0xef3016 ,64 *1024 ,64 ,SECT_4K , }, - {"w25x64" ,0xef3017 ,64 *1024 ,128 ,SECT_4K , }, + {"w25x10" ,0xef3011 ,0 ,64 *1024 ,2 ,SECT_4K , }, + {"w25x20" ,0xef3012 ,0 ,64 *1024 ,4 ,SECT_4K , }, + {"w25x40" ,0xef3013 ,0 ,64 *1024 ,8 ,SECT_4K , }, + {"w25x80" ,0xef3014 ,0 ,64 *1024 ,16 ,SECT_4K , }, + {"w25x16" ,0xef3015 ,0 ,64 *1024 ,32 ,SECT_4K , }, + {"w25x32" ,0xef3016 ,0 ,64 *1024 ,64 ,SECT_4K , }, + {"w25x64" ,0xef3017 ,0 ,64 *1024 ,128 ,SECT_4K , }, };static struct flash_info *__devinit jedec_probe (struct spi_device *spi) {int tmp;u8 code =OPCODE_RDID ; -u8 id[3 ]; +u8 id[5 ];u32 jedec; +u16 ext_jedec;struct flash_info *info;/* JEDEC also defines an optional "extended device information" * string for after vendor-specific data, after the three bytes * we use here. Supporting some chips might require using it. */ - tmp =spi_write_then_read (spi, &code,1 , id,3 ); + tmp =spi_write_then_read (spi, &code,1 , id,5 );if (tmp <0 ) {DEBUG (MTD_DEBUG_LEVEL0 ,"%s: error %d reading JEDEC ID\n" , spi->dev.bus_id, tmp);
@@ -533,10 +537,14 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi) jedec = jedec <<8 ; jedec |= id[2 ]; + ext_jedec = id[3 ] <<8 | id[4 ]; +for (tmp =0 , info = m25p_data; tmp <ARRAY_SIZE (m25p_data); tmp++, info++) {if (info->jedec_id == jedec) +if (ext_jedec !=0 && info->ext_id != ext_jedec) +continue ;return info; }dev_err (&spi->dev,"unrecognized JEDEC id %06x\n" , jedec);
Signature · 1 line
1.5.4
Quoted 2 lines · Chen Gong
BTW, dave, I don't find any other fixes in this file recently. What do you mean something has been there in the git tree, which git tree ?
http:// or git:// git.infradead.org/mtd-2.6.git
Most of your patch is already there (and thus also in linux-next). Please could we have an incremental patch?
What happens if you call spi_write_then_read(spi, x, x, x, 5) on a device which is only expecting to return 3 bytes. Does the call return failure? Or just pad to 5 bytes with zeroes?
Signature · 2 lines
David Woodhouse Open Source Technology Centre [email protected] Intel Corporation
Quoted 10 lines
-----Original Message-----
From: David Woodhouse [mailto:[email protected]]
Sent: 2008?9?16? 14:37
To: Chen Gong-B11801
Cc: [email protected]
Subject: Re: [PATCH V2] [MTD]m25p80.cextended jedec supportOn Tue, 2008-09-16 at 14:14 +0800, Chen Gong wrote:
Quoted 8 lines
Quoted 1 line
BTW, dave, I don't find any other fixes in this file
recently. What do
Quoted 1 line
you mean something has been there in the git tree, which git tree ?
http:// or
git://git.infradead.org/mtd-2.6.gitMost of your patch is already there (and thus also in linux-next). Please could we have an incremental patch?
you mean I should create a patch based that tree, not torvalds's tree, right ?
Quoted 4 lines
What happens if you call
spi_write_then_read(spi, x, x, x, 5)on a device which is only expecting to return 3 bytes. Does the call return failure? Or just pad to 5 bytes with zeroes?
frankly, I'm not sure to much, but from the datasheet I'v read, if CS# doesn't
be pulled high, it should can read zero or Hi-Z(maybe some mess data)
Quoted 8 lines
Signature · 5 lines
-- David Woodhouse Open Source Technology Centre [email protected] Intel Corporation
Quoted 2 lines · On Tue, 2008-09-16 at 14:41 +0800, Chen Gong-B11801 wrote:
you mean I should create a patch based that tree, not torvalds's tree, right ?
Yes, please.
Quoted 7 lines
Quoted 4 lines
What happens if you call
spi_write_then_read(spi, x, x, x, 5)on a device which is only expecting to return 3 bytes. Does the call return failure? Or just pad to 5 bytes with zeroes?frankly, I'm not sure to much, but from the datasheet I'v read, if CS# doesn't be pulled high, it should can read zero or Hi-Z(maybe some mess data)
I would like to be sure that we're not going to break on older chips.
Signature · 1 line
dwmw2
Quoted 9 lines
-----Original Message-----
From: David Woodhouse [mailto:[email protected]]
Sent: 2008?9?16? 14:52
To: Chen Gong-B11801
Cc: [email protected]
Subject: RE: [PATCH V2] [MTD]m25p80.cextended jedec support
Quoted 6 lines
Quoted 1 line · On Tue, 2008-09-16 at 14:41 +0800, Chen Gong-B11801 wrote:
you mean I should create a patch based that tree, not
torvalds's tree,
Quoted 1 line
right ?
Yes, please.
sure, but becuase I can't use git protocol in the company and the http looks can't work either, which reports
"error: Could not interpret response from server '<?xml version="1.0" encoding="utf-8"?>".
I will have this work done when I go back home :-)
Quoted 18 lines
Quoted 4 lines
Quoted 4 lines
What happens if you call
spi_write_then_read(spi, x, x, x, 5)on a device which is only expecting to return 3 bytes. Doesthe call return
Quoted 3 lines
Quoted 1 line
failure? Or just pad to 5 bytes with zeroes?
frankly, I'm not sure to much, but from the datasheet I'v
read, if CS#
Quoted 1 line
doesn't be pulled high, it should can read zero or
Hi-Z(maybe some mess data)
I would like to be sure that we're not going to break on older chips.
Signature · 1 line
dwmw2
PATCH v3 1/1 m25p80.c extended jedec support
In reply to Chen Gong- add extended device information support
- add s25sl128 device support
---
This is a updated version based on dave's mtd tree to support extended ID on m25p80xx devices.
Because I have no other eeproms based on SPI but s25sl128, someone would help me to test it on other devices ?
drivers/mtd/devices/m25p80.c | 90 +++++++++++++++++++++++------------------- 1 files changed, 49 insertions(+), 41 deletions(-)
drivers/mtd/devices/m25p80.c +49 -41
@@ -469,6 +469,7 @@ struct flash_info {* then a two byte device id. */ u32 jedec_id; +u16 ext_id;/* The size listed here is what works with OPCODE_SE, which isn't * necessarily called a "sector" by the vendor.
@@ -488,72 +489,75 @@ struct flash_info {static struct flash_info __devinitdata m25p_data [] = {/* Atmel -- some are (confusingly) marketed as "DataFlash" */ - {"at25fs010" ,0x1f6601 ,32 *1024 ,4 ,SECT_4K , }, - {"at25fs040" ,0x1f6604 ,64 *1024 ,8 ,SECT_4K , }, + {"at25fs010" ,0x1f6601 ,0 ,32 *1024 ,4 ,SECT_4K , }, + {"at25fs040" ,0x1f6604 ,0 ,64 *1024 ,8 ,SECT_4K , }, - {"at25df041a" ,0x1f4401 ,64 *1024 ,8 ,SECT_4K , }, - {"at25df641" ,0x1f4800 ,64 *1024 ,128 ,SECT_4K , }, + {"at25df041a" ,0x1f4401 ,0 ,64 *1024 ,8 ,SECT_4K , }, + {"at25df641" ,0x1f4800 ,0 ,64 *1024 ,128 ,SECT_4K , }, - {"at26f004" ,0x1f0400 ,64 *1024 ,8 ,SECT_4K , }, - {"at26df081a" ,0x1f4501 ,64 *1024 ,16 ,SECT_4K , }, - {"at26df161a" ,0x1f4601 ,64 *1024 ,32 ,SECT_4K , }, - {"at26df321" ,0x1f4701 ,64 *1024 ,64 ,SECT_4K , }, + {"at26f004" ,0x1f0400 ,0 ,64 *1024 ,8 ,SECT_4K , }, + {"at26df081a" ,0x1f4501 ,0 ,64 *1024 ,16 ,SECT_4K , }, + {"at26df161a" ,0x1f4601 ,0 ,64 *1024 ,32 ,SECT_4K , }, + {"at26df321" ,0x1f4701 ,0 ,64 *1024 ,64 ,SECT_4K , },/* Spansion -- single (large) sector size only, at least * for the chips listed here (without boot sectors). */ - {"s25sl004a" ,0x010212 ,64 *1024 ,8 , }, - {"s25sl008a" ,0x010213 ,64 *1024 ,16 , }, - {"s25sl016a" ,0x010214 ,64 *1024 ,32 , }, - {"s25sl032a" ,0x010215 ,64 *1024 ,64 , }, - {"s25sl064a" ,0x010216 ,64 *1024 ,128 , }, + {"s25sl004a" ,0x010212 ,0 ,64 *1024 ,8 , }, + {"s25sl008a" ,0x010213 ,0 ,64 *1024 ,16 , }, + {"s25sl016a" ,0x010214 ,0 ,64 *1024 ,32 , }, + {"s25sl032a" ,0x010215 ,0 ,64 *1024 ,64 , }, + {"s25sl064a" ,0x010216 ,0 ,64 *1024 ,128 , }, + {"s25sl12800" ,0x012018 ,0x0300 ,256 *1024 ,64 , }, + {"s25sl12801" ,0x012018 ,0x0301 ,64 *1024 ,256 , },/* SST -- large erase sizes are "overlays", "sectors" are 4K */ - {"sst25vf040b" ,0xbf258d ,64 *1024 ,8 ,SECT_4K , }, - {"sst25vf080b" ,0xbf258e ,64 *1024 ,16 ,SECT_4K , }, - {"sst25vf016b" ,0xbf2541 ,64 *1024 ,32 ,SECT_4K , }, - {"sst25vf032b" ,0xbf254a ,64 *1024 ,64 ,SECT_4K , }, + {"sst25vf040b" ,0xbf258d ,0 ,64 *1024 ,8 ,SECT_4K , }, + {"sst25vf080b" ,0xbf258e ,0 ,64 *1024 ,16 ,SECT_4K , }, + {"sst25vf016b" ,0xbf2541 ,0 ,64 *1024 ,32 ,SECT_4K , }, + {"sst25vf032b" ,0xbf254a ,0 ,64 *1024 ,64 ,SECT_4K , },/* ST Microelectronics -- newer production may have feature updates */ - {"m25p05" ,0x202010 ,32 *1024 ,2 , }, - {"m25p10" ,0x202011 ,32 *1024 ,4 , }, - {"m25p20" ,0x202012 ,64 *1024 ,4 , }, - {"m25p40" ,0x202013 ,64 *1024 ,8 , }, - {"m25p80" ,0 ,64 *1024 ,16 , }, - {"m25p16" ,0x202015 ,64 *1024 ,32 , }, - {"m25p32" ,0x202016 ,64 *1024 ,64 , }, - {"m25p64" ,0x202017 ,64 *1024 ,128 , }, - {"m25p128" ,0x202018 ,256 *1024 ,64 , }, - - {"m45pe80" ,0x204014 ,64 *1024 ,16 , }, - {"m45pe16" ,0x204015 ,64 *1024 ,32 , }, - - {"m25pe80" ,0x208014 ,64 *1024 ,16 , }, - {"m25pe16" ,0x208015 ,64 *1024 ,32 ,SECT_4K , }, + {"m25p05" ,0x202010 ,0 ,32 *1024 ,2 , }, + {"m25p10" ,0x202011 ,0 ,32 *1024 ,4 , }, + {"m25p20" ,0x202012 ,0 ,64 *1024 ,4 , }, + {"m25p40" ,0x202013 ,0 ,64 *1024 ,8 , }, + {"m25p80" ,0 ,0 ,64 *1024 ,16 , }, + {"m25p16" ,0x202015 ,0 ,64 *1024 ,32 , }, + {"m25p32" ,0x202016 ,0 ,64 *1024 ,64 , }, + {"m25p64" ,0x202017 ,0 ,64 *1024 ,128 , }, + {"m25p128" ,0x202018 ,0 ,256 *1024 ,64 , }, + + {"m45pe80" ,0x204014 ,0 ,64 *1024 ,16 , }, + {"m45pe16" ,0x204015 ,0 ,64 *1024 ,32 , }, + + {"m25pe80" ,0x208014 ,0 ,64 *1024 ,16 , }, + {"m25pe16" ,0x208015 ,0 ,64 *1024 ,32 ,SECT_4K , },/* Winbond -- w25x "blocks" are 64K, "sectors" are 4KiB */ - {"w25x10" ,0xef3011 ,64 *1024 ,2 ,SECT_4K , }, - {"w25x20" ,0xef3012 ,64 *1024 ,4 ,SECT_4K , }, - {"w25x40" ,0xef3013 ,64 *1024 ,8 ,SECT_4K , }, - {"w25x80" ,0xef3014 ,64 *1024 ,16 ,SECT_4K , }, - {"w25x16" ,0xef3015 ,64 *1024 ,32 ,SECT_4K , }, - {"w25x32" ,0xef3016 ,64 *1024 ,64 ,SECT_4K , }, - {"w25x64" ,0xef3017 ,64 *1024 ,128 ,SECT_4K , }, + {"w25x10" ,0xef3011 ,0 ,64 *1024 ,2 ,SECT_4K , }, + {"w25x20" ,0xef3012 ,0 ,64 *1024 ,4 ,SECT_4K , }, + {"w25x40" ,0xef3013 ,0 ,64 *1024 ,8 ,SECT_4K , }, + {"w25x80" ,0xef3014 ,0 ,64 *1024 ,16 ,SECT_4K , }, + {"w25x16" ,0xef3015 ,0 ,64 *1024 ,32 ,SECT_4K , }, + {"w25x32" ,0xef3016 ,0 ,64 *1024 ,64 ,SECT_4K , }, + {"w25x64" ,0xef3017 ,0 ,64 *1024 ,128 ,SECT_4K , }, };static struct flash_info *__devinit jedec_probe (struct spi_device *spi) {int tmp;u8 code =OPCODE_RDID ; -u8 id[3 ]; +u8 id[5 ];u32 jedec; +u16 ext_jedec;struct flash_info *info;/* JEDEC also defines an optional "extended device information" * string for after vendor-specific data, after the three bytes * we use here. Supporting some chips might require using it. */ - tmp =spi_write_then_read (spi, &code,1 , id,3 ); + tmp =spi_write_then_read (spi, &code,1 , id,5 );if (tmp <0 ) {DEBUG (MTD_DEBUG_LEVEL0 ,"%s: error %d reading JEDEC ID\n" , spi->dev.bus_id, tmp);
@@ -565,10 +569,14 @@ static struct flash_info *__devinit jedec_probe(struct spi_device *spi) jedec = jedec <<8 ; jedec |= id[2 ]; + ext_jedec = id[3 ] <<8 | id[4 ]; +for (tmp =0 , info = m25p_data; tmp <ARRAY_SIZE (m25p_data); tmp++, info++) {if (info->jedec_id == jedec) +if (ext_jedec !=0 && info->ext_id != ext_jedec) +continue ;return info; }dev_err (&spi->dev,"unrecognized JEDEC id %06x\n" , jedec);
Signature · 1 line
1.5.4