From patchwork Fri Jan 22 15:58:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 43490 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 D2BADB7CBB for ; Sat, 23 Jan 2010 03:00:33 +1100 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NYLuD-0007c4-Rr; Fri, 22 Jan 2010 15:58:41 +0000 Received: from mail-bw0-f212.google.com ([209.85.218.212]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NYLu4-0007Y7-KL for linux-mtd@lists.infradead.org; Fri, 22 Jan 2010 15:58:40 +0000 Received: by bwz4 with SMTP id 4so1296974bwz.2 for ; Fri, 22 Jan 2010 07:58:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :in-reply-to:references:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; bh=t/KDusVo27edWnwSuS6r9cnIt/C5QmbIinwgaF0mcLE=; b=EsueMBnb1BVM7LbDGrUMJJIgtSOPupbYevbWvx/6QrbVlUeu974NNc8ihHnW27164l wFCZNk3Ulx+8unQQiRfbH2mVHIZkldgyWaS0XppQ9HxgIaDFjJWs2AhHfzBwvLxqZW6Z kCEyStIaT42HU5IMmrRJrmWpTXevpobASrA84= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:in-reply-to:references:content-type:date :message-id:mime-version:x-mailer:content-transfer-encoding; b=AXXl8o78FgVKAJ8eoYtabVY5bIWmNaaHPBsETiPCaYv6Fn7uhYfNsNRrGo3JZ1g/hM C/TqyPwiB1LgHQPbh76Y6beQJrMj6wpoj2Ja24R23fe9WYlh/x8JsJFcFNs4684P8MQC dyyarmj8wKvCSkh7HW/W99UDMHt5Y9rCG7zhQ= Received: by 10.204.9.10 with SMTP id j10mr1705021bkj.101.1264175911754; Fri, 22 Jan 2010 07:58:31 -0800 (PST) Received: from ?10.1.0.2? ([87.70.246.165]) by mx.google.com with ESMTPS id 15sm1025046bwz.12.2010.01.22.07.58.29 (version=SSLv3 cipher=RC4-MD5); Fri, 22 Jan 2010 07:58:31 -0800 (PST) Subject: [PATCH 2/6] MTD: nand: make reads using MTD_OOB_RAW affect only ECC validation From: Maxim Levitsky To: David Woodhouse In-Reply-To: <1264175781.24012.42.camel@maxim-laptop> References: <1264175781.24012.42.camel@maxim-laptop> Date: Fri, 22 Jan 2010 17:58:26 +0200 Message-ID: <1264175906.24012.44.camel@maxim-laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.28.1 X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20100122_105832_837023_F02B3AF2 X-CRM114-Status: GOOD ( 20.80 ) X-Spam-Score: 0.0 (/) X-Spam-Report: SpamAssassin version 3.2.5 on bombadil.infradead.org summary: Content analysis details: (0.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- _SUMMARY_ Cc: Thomas Gleixner , joern , linux-mtd , linux-kernel , Alex Dubov 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 >From d355621ea624e8c9b1e198f0b049253c700b7431 Mon Sep 17 00:00:00 2001 From: Maxim Levitsky Date: Fri, 22 Jan 2010 16:41:33 +0200 Subject: [PATCH 2/6] MTD: nand: make reads using MTD_OOB_RAW affect only ECC validation This changes the behavier of MTD_OOB_RAW. It used to read both OOB and data to the data buffer, however you would still need to specify the dummy oob buffer. This is only used in one place, but makes it hard to read data+oob without ECC test, thus I removed that behavier, and fixed the user. Now MTD_OOB_RAW behaves like MTD_OOB_PLACE, but doesn't do ECC validation Signed-off-by: Maxim Levitsky --- drivers/mtd/nand/nand_base.c | 5 ----- drivers/mtd/nand/nand_bbt.c | 26 ++++++++++++++++++++++---- include/linux/mtd/mtd.h | 4 +--- 3 files changed, 23 insertions(+), 12 deletions(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 405c538..8ff36be 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -1286,8 +1286,6 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, if (unlikely(oob)) { - /* Raw mode does data:oob:data:oob */ - if (ops->mode != MTD_OOB_RAW) { int toread = min(oobreadlen, max_oobsize); if (toread) { @@ -1295,9 +1293,6 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, oob, ops, toread); oobreadlen -= toread; } - } else - buf = nand_transfer_oob(chip, - buf, ops, mtd->oobsize); } if (!(chip->options & NAND_NO_READRDY)) { diff --git a/drivers/mtd/nand/nand_bbt.c b/drivers/mtd/nand/nand_bbt.c index 55c23e5..387c45c 100644 --- a/drivers/mtd/nand/nand_bbt.c +++ b/drivers/mtd/nand/nand_bbt.c @@ -237,15 +237,33 @@ static int scan_read_raw(struct mtd_info *mtd, uint8_t *buf, loff_t offs, size_t len) { struct mtd_oob_ops ops; + int res; ops.mode = MTD_OOB_RAW; ops.ooboffs = 0; ops.ooblen = mtd->oobsize; - ops.oobbuf = buf; - ops.datbuf = buf; - ops.len = len; - return mtd->read_oob(mtd, offs, &ops); + + while (len > 0) { + if (len <= mtd->writesize) { + ops.oobbuf = buf + len; + ops.datbuf = buf; + ops.len = len; + return mtd->read_oob(mtd, offs, &ops); + } else { + ops.oobbuf = buf + mtd->writesize; + ops.datbuf = buf; + ops.len = mtd->writesize; + res = mtd->read_oob(mtd, offs, &ops); + + if (res) + return res; + } + + buf += mtd->oobsize + mtd->writesize; + len -= mtd->writesize; + } + return 0; } /* diff --git a/include/linux/mtd/mtd.h b/include/linux/mtd/mtd.h index 662d747..84bb375 100644 --- a/include/linux/mtd/mtd.h +++ b/include/linux/mtd/mtd.h @@ -61,9 +61,7 @@ struct mtd_erase_region_info { * MTD_OOB_PLACE: oob data are placed at the given offset * MTD_OOB_AUTO: oob data are automatically placed at the free areas * which are defined by the ecclayout - * MTD_OOB_RAW: mode to read raw data+oob in one chunk. The oob data - * is inserted into the data. Thats a raw image of the - * flash contents. + * MTD_OOB_RAW: mode to read oob and data without doing ECC checking */ typedef enum { MTD_OOB_PLACE,