From patchwork Wed Jan 13 12:53:59 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: vimal singh X-Patchwork-Id: 42817 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 1577EB7C9F for ; Wed, 13 Jan 2010 23:56:07 +1100 (EST) Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.69 #1 (Red Hat Linux)) id 1NV2k0-0007vD-PZ; Wed, 13 Jan 2010 12:54:28 +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 1NV2jt-0007uH-GP for linux-mtd@lists.infradead.org; Wed, 13 Jan 2010 12:54:26 +0000 Received: by bwz4 with SMTP id 4so15501603bwz.2 for ; Wed, 13 Jan 2010 04:54:20 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:mime-version:received:from:date:message-id :subject:to:cc:content-type; bh=m70aECTQkDMo/xCCOcU9w1iurE7WeoeL/QTefCgr30Y=; b=RhWPYUJJAUmVv0mjeUVIE+Dqd4HOY/x996CHQX0kHHJ4VX9cYBtfOPtvo9aupLFh3R ZsouK7E+btPMsOkmZCGeXzS7WhQgX+9VpAaLimI1f0xyq9IzZntC9h5FnjJARRAyfQDX FRLYrbAwNqZN6yzlAeGGdmLzRWjeLR4D/LB1w= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:from:date:message-id:subject:to:cc:content-type; b=fbfwAEdfLQMjZAzUjOPdoXHuZPbDMIGvrvnVshZawoBavluAUrorW0YiIZ7Ln1U1in 3THD96aWN4KqZ0v96qOGUopB9rivuvamucWLU1jFPUa+bkWw5sATPUMyrazEyvDszqU6 UnrH1b4XGbNYmdYDhP5pldr9ypp1BXizm0IJ0= MIME-Version: 1.0 Received: by 10.204.20.131 with SMTP id f3mr5879103bkb.162.1263387260177; Wed, 13 Jan 2010 04:54:20 -0800 (PST) From: Vimal Singh Date: Wed, 13 Jan 2010 18:23:59 +0530 Message-ID: Subject: [PATCH 2/2] Creating helper func for block alignment verfication To: Linux MTD X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20100113_075421_971628_AE549C03 X-CRM114-Status: GOOD ( 16.98 ) 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: Artem Bityutskiy 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 cde21be80002b49fb8baeb341e8ae5a1a2394cb6 Mon Sep 17 00:00:00 2001 From: Vimal Singh Date: Wed, 13 Jan 2010 18:11:47 +0530 Subject: [PATCH] Creating helper func for block alignment verfication These checks are fairly common in 'nand_erase_nand', 'nand_lock' and 'nand_unlock' fucntions. Signed-off-by: Vimal Singh --- drivers/mtd/nand/nand_base.c | 96 ++++++++++++++--------------------------- 1 files changed, 33 insertions(+), 63 deletions(-) * @mtd: MTD device structure @@ -894,28 +924,8 @@ int nand_unlock(struct mtd_info int chipnr; struct nand_chip *chip = mtd->priv; - /* Start address must align on block boundary */ - if (ofs & ((1 << chip->phys_erase_shift) - 1)) { - DEBUG(MTD_DEBUG_LEVEL0, "%s: Unaligned address\n", __func__); - ret = -EINVAL; - goto out; - } - - /* Length must align on block boundary */ - if (len & ((1 << chip->phys_erase_shift) - 1)) { - DEBUG(MTD_DEBUG_LEVEL0, "%s: Length not block aligned\n", - __func__); - ret = -EINVAL; + if (block_alignment_verification(mtd, ofs, len)) goto out; - } - - /* Do not allow past end of device */ - if (ofs + len > mtd->size) { - DEBUG(MTD_DEBUG_LEVEL0, "%s: Past end of device\n", - __func__); - ret = -EINVAL; - goto out; - } /* Align to last block address if size addresses end of the device */ if (ofs + len == mtd->size) @@ -968,31 +978,8 @@ int nand_lock(struct mtd_info int chipnr, status, page; struct nand_chip *chip = mtd->priv; - DEBUG(MTD_DEBUG_LEVEL3, "%s: start = 0x%012llx, len = %llu\n", - __func__, (unsigned long long)ofs, len); - - /* Start address must align on block boundary */ - if (ofs & ((1 << chip->phys_erase_shift) - 1)) { - DEBUG(MTD_DEBUG_LEVEL0, "%s: Unaligned address\n", __func__); - ret = -EINVAL; - goto out; - } - - /* Length must align on block boundary */ - if (len & ((1 << chip->phys_erase_shift) - 1)) { - DEBUG(MTD_DEBUG_LEVEL0, "%s: Length not block aligned\n", - __func__); - ret = -EINVAL; + if (block_alignment_verification(mtd, ofs, len)) goto out; - } - - /* Do not allow past end of device */ - if (ofs + len > mtd->size) { - DEBUG(MTD_DEBUG_LEVEL0, "%s: Past end of device\n", - __func__); - ret = -EINVAL; - goto out; - } nand_get_device(chip, mtd, FL_LOCKING); @@ -2495,25 +2482,8 @@ int nand_erase_nand(struct __func__, (unsigned long long)instr->addr, (unsigned long long)instr->len); - /* Start address must align on block boundary */ - if (instr->addr & ((1 << chip->phys_erase_shift) - 1)) { - DEBUG(MTD_DEBUG_LEVEL0, "%s: Unaligned address\n", __func__); + if (block_alignment_verification(mtd, instr->addr, instr->len)) return -EINVAL; - } - - /* Length must align on block boundary */ - if (instr->len & ((1 << chip->phys_erase_shift) - 1)) { - DEBUG(MTD_DEBUG_LEVEL0, "%s: Length not block aligned\n", - __func__); - return -EINVAL; - } - - /* Do not allow erase past end of device */ - if ((instr->len + instr->addr) > mtd->size) { - DEBUG(MTD_DEBUG_LEVEL0, "%s: Erase past end of device\n", - __func__); - return -EINVAL; - } instr->fail_addr = MTD_FAIL_ADDR_UNKNOWN; diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c index 4e27426..0bd3092 100644 --- a/drivers/mtd/nand/nand_base.c +++ b/drivers/mtd/nand/nand_base.c @@ -108,6 +108,36 @@ static int nand_do_write_oob(struct */ DEFINE_LED_TRIGGER(nand_led_trigger); +static int block_alignment_verification(struct mtd_info *mtd, loff_t ofs, uint64_t len) +{ + struct nand_chip *chip = mtd->priv; + + DEBUG(MTD_DEBUG_LEVEL3, "%s: start = 0x%012llx, len = %llu\n", + __func__, (unsigned long long)ofs, len); + + /* Start address must align on block boundary */ + if (ofs & ((1 << chip->phys_erase_shift) - 1)) { + DEBUG(MTD_DEBUG_LEVEL0, "%s: Unaligned address\n", __func__); + ret = -EINVAL; + } + + /* Length must align on block boundary */ + if (len & ((1 << chip->phys_erase_shift) - 1)) { + DEBUG(MTD_DEBUG_LEVEL0, "%s: Length not block aligned\n", + __func__); + ret = -EINVAL; + } + + /* Do not allow past end of device */ + if (ofs + len > mtd->size) { + DEBUG(MTD_DEBUG_LEVEL0, "%s: Past end of device\n", + __func__); + ret = -EINVAL; + } + + return 0; +} + /** * nand_release_device - [GENERIC] release chip