From patchwork Thu Jan 8 18:21:27 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Wolfgang Grandegger X-Patchwork-Id: 17394 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id C968ADDF2B for ; Fri, 9 Jan 2009 05:24:15 +1100 (EST) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.68 #1 (Red Hat Linux)) id 1LKzW0-0003a3-HU; Thu, 08 Jan 2009 18:21:57 +0000 Received: from mail-out.m-online.net ([212.18.0.9]) by bombadil.infradead.org with esmtp (Exim 4.68 #1 (Red Hat Linux)) id 1LKzVb-0002gU-RC for linux-mtd@lists.infradead.org; Thu, 08 Jan 2009 18:21:52 +0000 Received: from mail01.m-online.net (mail.m-online.net [192.168.3.149]) by mail-out.m-online.net (Postfix) with ESMTP id 1601F1C153A6; Thu, 8 Jan 2009 19:21:30 +0100 (CET) X-Auth-Info: f8/tsBbGFgB33FDpVpoT0BZJ8DwiPwBlXTIu9VHiuh4= Received: from lancy.denx.de (p4FF0462B.dip.t-dialin.net [79.240.70.43]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp-auth.mnet-online.de (Postfix) with ESMTP id 14E2090207; Thu, 8 Jan 2009 19:21:30 +0100 (CET) Message-ID: <49664427.7060801@grandegger.com> Date: Thu, 08 Jan 2009 19:21:27 +0100 From: Wolfgang Grandegger User-Agent: Thunderbird 2.0.0.18 (X11/20081119) MIME-Version: 1.0 To: Nicolas Pitre Subject: Re: [PATCH] CFI: remove major/minor version check for command set 0x0002 References: <496624A4.3050808@grandegger.com> <1231433317.28362.77.camel@macbook.infradead.org> <4966310C.1010103@grandegger.com> In-Reply-To: X-Enigmail-Version: 0.95.7 X-Spam-Score: 0.0 (/) Cc: linux-mtd@lists.infradead.org, David Woodhouse X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.9 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Nicolas Pitre wrote: > On Thu, 8 Jan 2009, Wolfgang Grandegger wrote: > >> David Woodhouse wrote: >>> On Thu, 2009-01-08 at 11:47 -0500, Nicolas Pitre wrote: >>>>> The NOR Flash memory K8P2815UQB from Samsung uses the major version >>>>> number '0', which seems to be unusual but not illegal, IIUC. This >>>>> patch removes the major-minor version check to get this Flash memory >>>>> supported as well. >>>> Instead of removing the test entirely, I'd suggest you augment it with >>>> the manufacturer ID (cfi->mfr and cfi->id). Or better yet, just use >>>> that information to fix up the version number to something sensible. >>> Couldn't you use a quirk to do the latter? >> The major/minor version number is not used anywhere else and therefore a >> quirk seems to be overkill too me. > > Please look again. Searching for "MinorVersion" turns up a couple > places. > > A quirk is not overkill at all. To the contrary it's the whole purpose > of quirks to fix up things like this. I see. > Although, in this case, I think quirks are evaluated only after the CFI > version is tested, meaning that the fixup might have to be done inline. Yep, the patch below introduces cfi_fixup_major_minor() to do the quirk. What do you think now? Wolfgang. --- drivers/mtd/chips/cfi_cmdset_0002.c | 10 ++++++++++ include/linux/mtd/cfi.h | 1 + 2 files changed, 11 insertions(+) Index: linux-2.6/drivers/mtd/chips/cfi_cmdset_0002.c =================================================================== --- linux-2.6.orig/drivers/mtd/chips/cfi_cmdset_0002.c +++ linux-2.6/drivers/mtd/chips/cfi_cmdset_0002.c @@ -322,6 +322,14 @@ 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'; +} + struct mtd_info *cfi_cmdset_0002(struct map_info *map, int primary) { struct cfi_private *cfi = map->fldrv_priv; @@ -363,6 +371,8 @@ struct mtd_info *cfi_cmdset_0002(struct return NULL; } + cfi_fixup_major_minor(cfi, extp); + if (extp->MajorVersion != '1' || (extp->MinorVersion < '0' || extp->MinorVersion > '4')) { printk(KERN_ERR " Unknown Amd/Fujitsu Extended Query " Index: linux-2.6/include/linux/mtd/cfi.h =================================================================== --- linux-2.6.orig/include/linux/mtd/cfi.h +++ linux-2.6/include/linux/mtd/cfi.h @@ -520,6 +520,7 @@ struct cfi_fixup { #define CFI_MFR_AMD 0x0001 #define CFI_MFR_ATMEL 0x001F +#define CFI_MFR_SAMSUNG 0x00EC #define CFI_MFR_ST 0x0020 /* STMicroelectronics */ void cfi_fixup(struct mtd_info *mtd, struct cfi_fixup* fixups);