From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-bw0-f221.google.com ([209.85.218.221]) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NdXRT-00041V-8N for linux-mtd@lists.infradead.org; Fri, 05 Feb 2010 23:18:33 +0000 Received: by bwz21 with SMTP id 21so3708866bwz.4 for ; Fri, 05 Feb 2010 15:18:26 -0800 (PST) From: Maxim Levitsky To: David Woodhouse Subject: [PATCH 1/7] MTD: nand: make MTD_OOB_PLACE work correctly. Date: Sat, 6 Feb 2010 01:18:04 +0200 Message-Id: <1265411890-9156-2-git-send-email-maximlevitsky@gmail.com> In-Reply-To: <1265411890-9156-1-git-send-email-maximlevitsky@gmail.com> References: <1265411890-9156-1-git-send-email-maximlevitsky@gmail.com> Cc: Maxim Levitsky , Artem Bityutskiy , Vitaly Wool , linux-kernel , "stanley.miao" , linux-mtd List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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); -- 1.6.3.3