From patchwork Fri May 11 10:15:41 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martin X-Patchwork-Id: 158483 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:4978:20e::2]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 6E5CEB6FC3 for ; Fri, 11 May 2012 21:49:14 +1000 (EST) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1SSoEt-0006LZ-45; Fri, 11 May 2012 11:42:31 +0000 Received: from mail-we0-f177.google.com ([74.125.82.177]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1SSmtB-0004Rz-9w for linux-mtd@lists.infradead.org; Fri, 11 May 2012 10:16:19 +0000 Received: by werc12 with SMTP id c12so32295wer.36 for ; Fri, 11 May 2012 03:15:52 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=tfFGR3zPfVLqkvIbwL74ypncP0tWkiIf/sQg8vz47xI=; b=JHaEo+5C2zjsRe1H/528WRBUYzXE3WRopLRAgiJAm7X+CqWIpnZxovQB3r0Gxr/BWb 8/CvMBRgQSBmrhlg6OaCg3AKCEYpNvfvYm9+VDVAbSFhKAxh4FA9DzRn7cyGVG0+JPzR nIaZIXKzlr4s/Supqw5MUOTpC7aL4lSt8scZHrfbyfFWG0nvOG3irFtL2BA+0i4Il5Vy B5zHSgjmD93pr+b0Ti+wg7pkCkQ7QxoM05W20+1JRHMU+mrw3kK99Vlv8nagQqz93wtE x6DAIUbXz8gUx4n/ZaBiz+A5NeiSuzst32er18XFB+DcVC8Ia0fFoNQL/3mi8huD8EAK hM+Q== Received: by 10.180.74.7 with SMTP id p7mr3850783wiv.20.1336731352361; Fri, 11 May 2012 03:15:52 -0700 (PDT) Received: from localhost.localdomain (96.252.106.212.dynamic.jazztel.es. [212.106.252.96]) by mx.google.com with ESMTPS id f19sm15596667wiw.11.2012.05.11.03.15.49 (version=TLSv1/SSLv3 cipher=OTHER); Fri, 11 May 2012 03:15:51 -0700 (PDT) From: Javier Martin To: linux-mtd@lists.infradead.org Subject: MTD: Add fixup for S29NS512P NOR flash. Date: Fri, 11 May 2012 12:15:41 +0200 Message-Id: <1336731341-615-1-git-send-email-javier.martin@vista-silicon.com> X-Mailer: git-send-email 1.7.0.4 X-Gm-Message-State: ALoCoQkQm6sY//RlWoY15Vy/1f3O6anz0wlRkLlQIA71T7kBMtHxe9gvlgMUX2WzGr+qQgXnjs57 X-Spam-Note: CRM114 invocation failed X-Spam-Score: -2.6 (--) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-2.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at http://www.dnswl.org/, low trust [74.125.82.177 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Gernot.Hoyler@spansion.com, Artem.Bityutskiy@nokia.com, joakim.tjernlund@transmode.se, tabe@mvista.com, Javier Martin , dwmw2@infradead.org X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org Spansion S29NS512P flash uses a 16bit transfer to report number of sectors instead of two 8bit accesses as CFI specifies. Signed-off-by: Javier Martin --- drivers/mtd/chips/cfi_cmdset_0002.c | 14 ++++++++++++++ 1 files changed, 14 insertions(+), 0 deletions(-) diff --git a/drivers/mtd/chips/cfi_cmdset_0002.c b/drivers/mtd/chips/cfi_cmdset_0002.c index 23175ed..5873b1f 100644 --- a/drivers/mtd/chips/cfi_cmdset_0002.c +++ b/drivers/mtd/chips/cfi_cmdset_0002.c @@ -332,6 +332,19 @@ static void fixup_s29gl032n_sectors(struct mtd_info *mtd) } } +static void fixup_s29ns512p_sectors(struct mtd_info *mtd) +{ + struct map_info *map = mtd->priv; + struct cfi_private *cfi = map->fldrv_priv; + + /* + * S29NS512P flash uses more than 8bits to report number of sectors, + * which is not permitted by CFI. + */ + cfi->cfiq->EraseRegionInfo[0] = 0x020001ff; + pr_warning("%s: Bad S29NS512P CFI data, adjust to 512 sectors\n", mtd->name); +} + /* Used to fix CFI-Tables of chips without Extended Query Tables */ static struct cfi_fixup cfi_nopri_fixup_table[] = { { CFI_MFR_SST, 0x234a, fixup_sst39vf }, /* SST39VF1602 */ @@ -362,6 +375,7 @@ static struct cfi_fixup cfi_fixup_table[] = { { CFI_MFR_AMD, 0x1301, fixup_s29gl064n_sectors }, { CFI_MFR_AMD, 0x1a00, fixup_s29gl032n_sectors }, { CFI_MFR_AMD, 0x1a01, fixup_s29gl032n_sectors }, + { CFI_MFR_AMD, 0x3f00, fixup_s29ns512p_sectors }, { CFI_MFR_SST, 0x536a, fixup_sst38vf640x_sectorsize }, /* SST38VF6402 */ { CFI_MFR_SST, 0x536b, fixup_sst38vf640x_sectorsize }, /* SST38VF6401 */ { CFI_MFR_SST, 0x536c, fixup_sst38vf640x_sectorsize }, /* SST38VF6404 */