From patchwork Sat Jun 26 00:58:04 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Norris X-Patchwork-Id: 57047 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.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 7EB6EB7086 for ; Sat, 26 Jun 2010 11:00:34 +1000 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1OSJjq-00058Z-8J; Sat, 26 Jun 2010 00:59:18 +0000 Received: from mms2.broadcom.com ([216.31.210.18]) by bombadil.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1OSJjn-00054i-4R for linux-mtd@lists.infradead.org; Sat, 26 Jun 2010 00:59:16 +0000 Received: from [10.9.200.133] by mms2.broadcom.com with ESMTP (Broadcom SMTP Relay (Email Firewall v6.3.2)); Fri, 25 Jun 2010 17:59:01 -0700 X-Server-Uuid: D3C04415-6FA8-4F2C-93C1-920E106A2031 Received: from mail-irva-12.broadcom.com (10.11.16.101) by IRVEXCHHUB02.corp.ad.broadcom.com (10.9.200.133) with Microsoft SMTP Server id 8.2.247.2; Fri, 25 Jun 2010 18:00:22 -0700 Received: from ld-irv-0074.broadcom.com (ld-irv-0074.broadcom.com [10.12.160.50]) by mail-irva-12.broadcom.com (Postfix) with ESMTP id 8D99469CA8; Fri, 25 Jun 2010 17:59:01 -0700 (PDT) Received: by ld-irv-0074.broadcom.com (Postfix, from userid 14777) id 8345425E0DCD; Fri, 25 Jun 2010 17:59:01 -0700 (PDT) From: "Brian Norris" To: "Artem Bityutskiy" Subject: [PATCH 2/2] mtd-utils (nandwrite + nanddump): Support 4096+218, 4096+224 OOB Date: Fri, 25 Jun 2010 17:58:04 -0700 Message-ID: <1277513884-14715-2-git-send-email-norris@broadcom.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1277513884-14715-1-git-send-email-norris@broadcom.com> References: <1277513884-14715-1-git-send-email-norris@broadcom.com> MIME-Version: 1.0 X-WSS-ID: 603B8F5F10010537472-01-01 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20100625_205915_390219_76B62AF9 X-CRM114-Status: GOOD ( 23.49 ) X-Spam-Score: -0.0 (/) X-Spam-Report: SpamAssassin version 3.3.1 on bombadil.infradead.org summary: Content analysis details: (-0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain Cc: linux-mtd@lists.infradead.org, Brian Norris X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 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 Parts of this are a resubmission of this patch: http://lists.infradead.org/pipermail/linux-mtd/2010-May/029885.html This was tested with Samsung K9GAG08U0D. Signed-off-by: Brian Norris --- nanddump.c | 8 ++++++-- nandwrite.c | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/nanddump.c b/nanddump.c index 190a653..b0dd227 100644 --- a/nanddump.c +++ b/nanddump.c @@ -174,8 +174,12 @@ static void process_options (int argc, char * const argv[]) /* * Buffers for reading data from flash */ -static unsigned char readbuf[4096]; -static unsigned char oobbuf[128]; + +#define NAND_MAX_PAGESIZE 4096 +#define NAND_MAX_OOBSIZE 256 + +static unsigned char readbuf[NAND_MAX_PAGESIZE]; +static unsigned char oobbuf[NAND_MAX_OOBSIZE]; /* * Main program diff --git a/nandwrite.c b/nandwrite.c index 1b4ca3d..0d59171 100644 --- a/nandwrite.c +++ b/nandwrite.c @@ -43,7 +43,7 @@ #define VERSION "$Revision: 1.32 $" #define MAX_PAGE_SIZE 4096 -#define MAX_OOB_SIZE 128 +#define MAX_OOB_SIZE 256 // oob layouts to pass into the kernel as default static struct nand_oobinfo none_oobinfo = { @@ -302,7 +302,9 @@ int main(int argc, char * const argv[]) !(meminfo.oobsize == 8 && meminfo.writesize == 256) && !(meminfo.oobsize == 64 && meminfo.writesize == 2048) && !(meminfo.oobsize == 64 && meminfo.writesize == 4096) && - !(meminfo.oobsize == 128 && meminfo.writesize == 4096)) { + !(meminfo.oobsize == 128 && meminfo.writesize == 4096) && + !(meminfo.oobsize == 218 && meminfo.writesize == 4096) && + !(meminfo.oobsize == 224 && meminfo.writesize == 4096)) { fprintf(stderr, "Unknown flash (not normal NAND)\n"); close(fd); exit (EXIT_FAILURE);