| Message ID | 20101209140410.26049.51539.stgit@dev.siriade.com |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Dec 09, 2010 at 03:04:11PM +0100, Guillaume LECERF wrote: > These chips report CFI v0.0 [1], so extend cfi_fixup_major_minor() > to patch all Samsung chips from 0.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> Acked-by: Wolfram Sang <w.sang@pengutronix.de>
On Thu, 2010-12-09 at 15:04 +0100, Guillaume LECERF wrote: > These chips report CFI v0.0 [1], so extend cfi_fixup_major_minor() > to patch all Samsung chips from 0.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 | 14 +++++++++++--- > 1 files changed, 11 insertions(+), 3 deletions(-) > > diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c > index 9d68ab9..bf457a4 100644 > --- a/drivers/mtd/chips/cfi_cmdset_0002.c > +++ b/drivers/mtd/chips/cfi_cmdset_0002.c > @@ -392,9 +392,17 @@ 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' && extp->MinorVersion == '0') { > + /* > + * Samsung K8P2815UQB and K8D6x16UxM chips report major=0 / minor=0 > + */ > + printk(KERN_NOTICE " Fixed Samsung's Amd/Fujitsu Extended Query version from 0.0 to 1.0\n"); > + > + extp->MajorVersion = '1'; > + } I'm sorry for this nit-pick, but could you please make checkpatch.pl happy: WARNING: line over 80 characters #97: FILE: drivers/mtd/chips/cfi_cmdset_0002.c:398: + * Samsung K8P2815UQB and K8D6x16UxM chips report major=0 / minor=0 Also, I do not see any reason for a newline between printk() and extp->MajorVersion = '1' - it only makes code unnecessary sparse. Newlines ar good between logically independent things, but not between 2 things which are about the same - print about X and then do X.
diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index 9d68ab9..bf457a4 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -392,9 +392,17 @@ 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' && extp->MinorVersion == '0') { + /* + * Samsung K8P2815UQB and K8D6x16UxM chips report major=0 / minor=0 + */ + printk(KERN_NOTICE " Fixed Samsung's Amd/Fujitsu Extended Query version from 0.0 to 1.0\n"); + + extp->MajorVersion = '1'; + } + } + /* * 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 from 0.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 | 14 +++++++++++--- 1 files changed, 11 insertions(+), 3 deletions(-)