| Message ID | 20101208151901.20317.30721.stgit@dev.siriade.com |
|---|---|
| State | New, archived |
| Headers | show |
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
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. */
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(-)