mtd: cfi_cmdset_0002: add support for Samsung K8D6x16UxM NOR chips
PATCH v2 1/2 mtd: cfi_cmdset_0002: add support for Samsung K8D6x16UxM NOR chips
These chips report CFI v0.0 [1], so extend cfi_fixup_major_minor() to patch all Samsung chips with Major == 0 to 1.0. Discussed and tested by the OpenWRT people [2].
[1] http://www.samsung.com/global/system/business/semiconductor/product/2007/6/11/NORFlash/64Mbit/K8D6316UTM/ds_K8D6x16UxM_rev16.pdf
[2] https://dev.openwrt.org/ticket/7348
--- drivers/mtd/chips/cfi_cmdset_0002.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-)
drivers/mtd/chips/cfi_cmdset_0002.c +13 -3
@@ -392,9 +392,19 @@ static struct cfi_fixup fixup_table[] = {static void cfi_fixup_major_minor (struct cfi_private *cfi,struct cfi_pri_amdstd *extp) { -if (cfi->mfr ==CFI_MFR_SAMSUNG && cfi->id ==0x257e && - extp->MajorVersion =='0' ) - extp->MajorVersion ='1' ; +if (cfi->mfr ==CFI_MFR_SAMSUNG ) { +if (extp->MajorVersion =='0' ) { +/* +* Samsung K8P2815UQB and K8D6x16UxM chips report major=0 / minor=0 +*/ +printk (" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c to 1.0" , + extp->MajorVersion, extp->MinorVersion); + + extp->MajorVersion ='1' ; + extp->MinorVersion ='0' ; + } + } +/* * SST 38VF640x chips report major=0xFF / minor=0xFF. */
PATCH v2 2/2 mtd: cfi_cmdset_0002: add support for Samsung K8D3x16UxC NOR chips
These chips report CFI v3.3 [1], so patch them on the fly to the more correct v1.3.
Discussed and tested by the OpenWRT people [2].
[1] http://www.samsung.com/global/system/business/semiconductor/product/2007/6/11/NORFlash/32Mbit/K8D3216UBC/ds_K8D3x16UxC_rev17.pdf
[2] https://dev.openwrt.org/ticket/866
--- drivers/mtd/chips/cfi_cmdset_0002.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-)
drivers/mtd/chips/cfi_cmdset_0002.c +13 -0
@@ -403,6 +403,19 @@ static void cfi_fixup_major_minor(struct cfi_private *cfi, extp->MajorVersion ='1' ; extp->MinorVersion ='0' ; } +if (extp->MajorVersion =='3' && extp->MinorVersion =='3' ) { +/* +* Samsung K8D3x16UxC chips report major=3 / minor=3 +*/ +printk (KERN_NOTICE " Newer Samsung flash detected, " +"should be compatibile with Amd/Fujitsu.\n" ); + +printk (" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c to 1.3" , + extp->MajorVersion, extp->MinorVersion); + + extp->MajorVersion ='1' ;// set to 1.3 + extp->MinorVersion ='3' ; + } }/*
Re: [PATCH v2 2/2] mtd: cfi_cmdset_0002: add support for Samsung K8D3x16UxC NOR chips
Quoted 17 lines · Guillaume LECERF
These chips report CFI v3.3 [1], so patch them on the fly to the more correct v1.3.
Discussed and tested by the OpenWRT people [2].[1] http://www.samsung.com/global/system/business/semiconductor/product/2007/6/11/NORFlash/32Mbit/K8D3216UBC/ds_K8D3x16UxC_rev17.pdf
[2] https://dev.openwrt.org/ticket/866Signed-off-by Guillaume LECERF <[email protected]>--- drivers/mtd/chips/cfi_cmdset_0002.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-)drivers/mtd/chips/cfi_cmdset_0002.c +0
-0
drivers/mtd/chips/cfi_cmdset_0002.c static void cfi_fixup_major_minor(struct cfi_private *cfi, · line 411
Quoted 9 lines
drivers/mtd/chips/cfi_cmdset_0002.c +6
-0@@ -403,6 +403,19 @@ static void cfi_fixup_major_minor(struct cfi_private *cfi, extp->MajorVersion ='1' ; extp->MinorVersion ='0' ; } +if (extp->MajorVersion =='3' && extp->MinorVersion =='3' ) { +/* +* Samsung K8D3x16UxC chips report major=3 / minor=3 +*/ +printk (KERN_NOTICE " Newer Samsung flash detected, " +"should be compatibile with Amd/Fujitsu.\n" );
compatible
drivers/mtd/chips/cfi_cmdset_0002.c static void cfi_fixup_major_minor(struct cfi_private *cfi, · line 412
Quoted 1 line
drivers/mtd/chips/cfi_cmdset_0002.c +1
-0+
Extra line could be removed, but that's terribly minor :)
drivers/mtd/chips/cfi_cmdset_0002.c static void cfi_fixup_major_minor(struct cfi_private *cfi, · line 414
Quoted 2 lines
drivers/mtd/chips/cfi_cmdset_0002.c +2
-0+printk (" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c to 1.3" , + extp->MajorVersion, extp->MinorVersion);
loglevel? \n?
drivers/mtd/chips/cfi_cmdset_0002.c static void cfi_fixup_major_minor(struct cfi_private *cfi, · line 416
Quoted 2 lines
drivers/mtd/chips/cfi_cmdset_0002.c +2
-0+ + extp->MajorVersion ='1' ;// set to 1.3
Use C-comments, please. Given the explanation in the printout above, can also be dropped entirely IMHO.
drivers/mtd/chips/cfi_cmdset_0002.c static void cfi_fixup_major_minor(struct cfi_private *cfi, · line 419
Quoted 3 lines
drivers/mtd/chips/cfi_cmdset_0002.c +2
-0+ extp->MinorVersion ='3' ; + } }
Regards,
Wolfram
Signature · 2 lines
Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ |
Quoted 20 lines · Guillaume LECERF
These chips report CFI v0.0 [1], so extend
cfi_fixup_major_minor()to patch all Samsung chips with Major == 0 to 1.0. Discussed and tested by the OpenWRT people [2].[1] http://www.samsung.com/global/system/business/semiconductor/product/2007/6/11/NORFlash/64Mbit/K8D6316UTM/ds_K8D6x16UxM_rev16.pdf
[2] https://dev.openwrt.org/ticket/7348Signed-off-by Guillaume LECERF <[email protected]>--- drivers/mtd/chips/cfi_cmdset_0002.c | 16 +++++++++++++--- 1 files changed, 13 insertions(+), 3 deletions(-)drivers/mtd/chips/cfi_cmdset_0002.c +0
-0@@ -392,9 +392,19 @@ static struct cfi_fixup fixup_table[] = {static void cfi_fixup_major_minor (struct cfi_private *cfi,struct cfi_pri_amdstd *extp) {
drivers/mtd/chips/cfi_cmdset_0002.c static struct cfi_fixup fixup_table[] = { · line 401
Quoted 10 lines
drivers/mtd/chips/cfi_cmdset_0002.c +7
-3-if (cfi->mfr ==CFI_MFR_SAMSUNG && cfi->id ==0x257e && - extp->MajorVersion =='0' ) - extp->MajorVersion ='1' ; +if (cfi->mfr ==CFI_MFR_SAMSUNG ) { +if (extp->MajorVersion =='0' ) { +/* +* Samsung K8P2815UQB and K8D6x16UxM chips report major=0 / minor=0 +*/ +printk (" Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c to 1.0" , + extp->MajorVersion, extp->MinorVersion);
loglevel? \n? This check has just one printout while the other had two. Should be in sync IMHO. Probably with fewer printout ;)
drivers/mtd/chips/cfi_cmdset_0002.c static struct cfi_fixup fixup_table[] = { · line 407
Quoted 6 lines
drivers/mtd/chips/cfi_cmdset_0002.c +6
-0+ + extp->MajorVersion ='1' ; + extp->MinorVersion ='0' ; + } + } +
Regards,
Wolfram
Signature · 2 lines
Pengutronix e.K. | Wolfram Sang | Industrial Linux Solutions | http://www.pengutronix.de/ |