From patchwork Fri Jan 22 15:57:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxim Levitsky X-Patchwork-Id: 43489 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 3D2B0B6EEB for ; Sat, 23 Jan 2010 02:59:32 +1100 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NYLtK-0007Ns-70; Fri, 22 Jan 2010 15:57:46 +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 1NYLtC-0007LE-1n for linux-mtd@lists.infradead.org; Fri, 22 Jan 2010 15:57:45 +0000 Received: by bwz4 with SMTP id 4so1296002bwz.2 for ; Fri, 22 Jan 2010 07:57:37 -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=9WbL+t5T7ggo7jaWVJbW3lZJG4ZN5dI84H6FR3KF4Yw=; b=wTDaWVol0bwBoRq/xJnAhsCZaINsyQJbV36RM71jnSdFnibmLAyIW1rJHa8WOm5pz3 uMk4rPzpdjN4mezc7nIHXst6wMsUzhEGSWAlESye1aWiuFPs5HKaCwqkY4BnPsrp19Gh qdEqxDkuy76BN+wk35SOBljdfhJ7Gl4bICCe8= 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=TNQtZgEP8cNSys9P2wRXoHJEBJfeBuhAVSgYz9G4C9pD830EtOGRvQB99/vEQkxfX3 Or59PbfFHNCFcF4E7Gn7ZYQFuQj7Dsxgedzd9P3y9MeJbLNHurrq937iNOA5XmJrciCn tCJCInNmkyQLewuSwH9x0lb3ayk61N/kY//24= Received: by 10.204.24.65 with SMTP id u1mr1681382bkb.176.1264175856986; Fri, 22 Jan 2010 07:57:36 -0800 (PST) Received: from ?10.1.0.2? ([87.70.246.165]) by mx.google.com with ESMTPS id 13sm1035674bwz.6.2010.01.22.07.57.33 (version=SSLv3 cipher=RC4-MD5); Fri, 22 Jan 2010 07:57:36 -0800 (PST) Subject: [PATCH 1/6] MTD: nand: make MTD_OOB_PLACE work correctly. 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:57:31 +0200 Message-ID: <1264175851.24012.43.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_105738_232264_FAE64AE0 X-CRM114-Status: GOOD ( 14.94 ) 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 53cc4bab741b55c02ee726eed40b876209aa3e91 Mon Sep 17 00:00:00 2001 From: Maxim Levitsky Date: Fri, 22 Jan 2010 16:41:33 +0200 Subject: [PATCH 1/6] MTD: nand: make MTD_OOB_PLACE work correctly. 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);