Skip to contentSkip to conversation

mtd: cfi_cmdset_0002: add support for Samsung K8D6x16UxM NOR chips

PATCH Superseded Guillaume LECERF 2 participants 4 messages Dec 8, 2010 Memory technology devices (MTD)

v3 of 5 Superseded Latest is v5 →

lore
Share & tools
lore
#0 lore raw

PATCH v3 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
index 9d68ab9..7966f07 100644
@@ -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(KERN_NOTICE "  Fixed Samsung's Amd/Fujitsu Extended Query version from 0.%c to 1.0\n",
+			       extp->MinorVersion);
+
+			extp->MajorVersion = '1';
+			extp->MinorVersion = '0';
+		}
+	}
+
 	/*
 	 * SST 38VF640x chips report major=0xFF / minor=0xFF.
 	 */
#1 lore raw

PATCH v3 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 |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)
drivers/mtd/chips/cfi_cmdset_0002.c +8 -0
index 7966f07..8ad6ee9 100644
@@ -403,6 +403,14 @@ 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 "  Fixed Samsung's Amd/Fujitsu Extended Query version from 3.3 to 1.3\n");
+
+			extp->MajorVersion = '1';
+		}
 	}
 
 	/*
Acked-by on v3 2/2
#2 lore raw

Re: [PATCH v3 2/2] mtd: cfi_cmdset_0002: add support for Samsung K8D3x16UxC NOR chips

Quoted 8 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/866

Signature · 2 lines
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Acked-by on v3 1/2
#3 lore raw
In reply to Guillaume LECERF
Quoted 8 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/7348

One question left:

Quoted 9 lines
---
 drivers/mtd/chips/cfi_cmdset_0002.c |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)
drivers/mtd/chips/cfi_cmdset_0002.c +0 -0
index 9d68ab9..7966f07 100644

drivers/mtd/chips/cfi_cmdset_0002.c static struct cfi_fixup fixup_table[] = { · line 398

Quoted 10 lines
drivers/mtd/chips/cfi_cmdset_0002.c +4 -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

The code below is prepared to show minor != 0, so is the comment above apropriate? Given that it is okay to fixup major = 0 and minor != 0 to 1.0, you can add my

Quoted 17 lines
drivers/mtd/chips/cfi_cmdset_0002.c +9 -0
+			 */
+			printk(KERN_NOTICE "  Fixed Samsung's Amd/Fujitsu Extended Query version from 0.%c to 1.0\n",
+			       extp->MinorVersion);
+
+			extp->MajorVersion = '1';
+			extp->MinorVersion = '0';
+		}
+	}
+
 	/*
 	 * SST 38VF640x chips report major=0xFF / minor=0xFF.
 	 */

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

Signature · 2 lines
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |