From patchwork Sat Jan 30 15:02:40 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 44074 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 A9B7BB7D3D for ; Sun, 31 Jan 2010 02:17:51 +1100 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NbF1I-0006uW-TQ; Sat, 30 Jan 2010 15:13:56 +0000 Received: from fg-out-1718.google.com ([72.14.220.155]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NbEqz-0006MR-MX for linux-mtd@lists.infradead.org; Sat, 30 Jan 2010 15:03:23 +0000 Received: by fg-out-1718.google.com with SMTP id 16so49897fgg.0 for ; Sat, 30 Jan 2010 07:03:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer:in-reply-to:references; bh=EM4MkhEw8+XSqefNeQpcVwLOfPgOWnURQcr9yEvfuVI=; b=dv/TegnlqD23ZOH4dh/gMgP4vne9+be9OfSpYEew9A/tR5DUrWvjgJBuRhHuACTK3B uko86SbGpldOMmTLEfcUdHo4JJOBJ1t+OlCYO4enbtxiAoPBjJQuMfYyWBiIE4BIUvV5 EEWDiDUNBg9GSjnrk2GfSg0+OfGCfRenrkaRc= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=p5oc2RmPvQSpcFAJcIG9NPjlz6gKsfu+mBZodNIs3GoU1hSG6PB+WJYr/O3Xrsbepz RPtKA0xDIU64YKpZK8ISEqZJ+fAUDZOLeY31ciQN8nGqjoN3C5CPrBc5ad4G8AymScad nNNu0NQsaHBL++wonUJlcUOTbGS6H1PuHtznA= Received: by 10.86.88.28 with SMTP id l28mr3972677fgb.25.1264863797301; Sat, 30 Jan 2010 07:03:17 -0800 (PST) Received: from localhost.localdomain (IGLD-84-229-248-49.inter.net.il [84.229.248.49]) by mx.google.com with ESMTPS id l19sm4125281fgb.0.2010.01.30.07.03.15 (version=SSLv3 cipher=RC4-MD5); Sat, 30 Jan 2010 07:03:16 -0800 (PST) From: Maxim Levitsky To: David Woodhouse Subject: [PATCH 09/17] MTD: nand: make MTD_OOB_PLACE work correctly. Date: Sat, 30 Jan 2010 17:02:40 +0200 Message-Id: <1264863768-27606-10-git-send-email-maximlevitsky@gmail.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1264863768-27606-1-git-send-email-maximlevitsky@gmail.com> References: <1264863768-27606-1-git-send-email-maximlevitsky@gmail.com> X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20100130_100317_862307_51433933 X-CRM114-Status: GOOD ( 14.42 ) 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: Maxim Levitsky , Alex Dubov , Artem Bityutskiy , joern , linux-kernel , linux-mtd , Thomas Gleixner 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: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org MTD_OOB_PLACE is supposed to read/write raw oob data similiar to MTD_OOB_RAW however due to a bug, currently its not possible to read more data that specified in oob 'free' regions Signed-off-by: Maxim Levitsky --- drivers/mtd/nand/nand_base.c | 6 +++++- 1 files changed, 5 insertions(+), 1 deletions(-) diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 8f2958f..405c538 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -1232,6 +1232,9 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, int ret = 0; uint32_t readlen = ops->len; uint32_t oobreadlen = ops->ooblen; + uint32_t max_oobsize = ops->mode == MTD_OOB_AUTO ? + mtd->oobavail : mtd->oobsize; + uint8_t *bufpoi, *oob, *buf; stats = mtd->ecc_stats; @@ -1282,10 +1285,11 @@ static int nand_do_read_ops(struct mtd_info *mtd, loff_t from, buf += bytes; if (unlikely(oob)) { + /* Raw mode does data:oob:data:oob */ if (ops->mode != MTD_OOB_RAW) { int toread = min(oobreadlen, - chip->ecc.layout->oobavail); + max_oobsize); if (toread) { oob = nand_transfer_oob(chip, oob, ops, toread);