[PATCH v2 1/2] 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

[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

Signed-off-by: Guillaume LECERF <glecerf@gmail.com>
---
 drivers/mtd/chips/cfi_cmdset_0002.c |   16 +++++++++++++---
 1 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 9d68ab9..bca69d4 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -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

[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

Signed-off-by: Guillaume LECERF <glecerf@gmail.com>
---
 drivers/mtd/chips/cfi_cmdset_0002.c |   13 +++++++++++++
 1 files changed, 13 insertions(+), 0 deletions(-)

diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
index 28e05ad..bee619e 100644
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
@@ -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

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 1868 bytes --]

On Wed, Dec 08, 2010 at 04:19:06PM +0100, Guillaume LECERF wrote:
> 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
> 
> Signed-off-by: Guillaume LECERF <glecerf@gmail.com>
> ---
>  drivers/mtd/chips/cfi_cmdset_0002.c |   13 +++++++++++++
>  1 files changed, 13 insertions(+), 0 deletions(-)
> 
> diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
> index 28e05ad..bee619e 100644
> --- a/drivers/mtd/chips/cfi_cmdset_0002.c
> +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
> @@ -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

> +

Extra line could be removed, but that's terribly minor :)

> +			printk("  Fixed Samsung's Amd/Fujitsu Extended Query version from %c.%c to 1.3",
> +			       extp->MajorVersion, extp->MinorVersion);

loglevel? \n?

> +
> +			extp->MajorVersion = '1'; // set to 1.3

Use C-comments, please. Given the explanation in the printout above, can
also be dropped entirely IMHO.

> +			extp->MinorVersion = '3';
> +		}
>  	}

Regards,

   Wolfram

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]

Re: [PATCH v2 1/2] mtd: cfi_cmdset_0002: add support for Samsung K8D6x16UxM NOR chips

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 1857 bytes --]

On Wed, Dec 08, 2010 at 04:19:01PM +0100, Guillaume LECERF wrote:
> 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
> 
> Signed-off-by: Guillaume LECERF <glecerf@gmail.com>
> ---
>  drivers/mtd/chips/cfi_cmdset_0002.c |   16 +++++++++++++---
>  1 files changed, 13 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c
> index 9d68ab9..bca69d4 100644
> --- a/drivers/mtd/chips/cfi_cmdset_0002.c
> +++ b/drivers/mtd/chips/cfi_cmdset_0002.c
> @@ -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);

loglevel? \n? This check has just one printout while the other had two.
Should be in sync IMHO. Probably with fewer printout ;)

> +
> +			extp->MajorVersion = '1';
> +			extp->MinorVersion = '0';
> +		}
> +	}
> +

Regards,

   Wolfram

-- 
Pengutronix e.K.                           | Wolfram Sang                |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 198 bytes --]