Patchwork [2/2] Creating helper func for block alignment verfication

login
register
mail settings
Submitter vimal singh
Date Jan. 13, 2010, 1:06 p.m.
Message ID <ce9ab5791001130506g28bb330dm79225c688839323d@mail.gmail.com>
Download mbox | patch
Permalink /patch/42819/
State New, archived
Headers show

Comments

vimal singh - Jan. 13, 2010, 1:06 p.m.
On Wed, Jan 13, 2010 at 6:23 PM, Vimal Singh <vimal.newwork@gmail.com> wrote:
> From cde21be80002b49fb8baeb341e8ae5a1a2394cb6 Mon Sep 17 00:00:00 2001
> From: Vimal Singh <vimalsingh@ti.com>
> 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.
>

I just ran checkpatch.pl and this patch had an error.
Corrected patch is below.

-vimal

From 310f7faa8f319bd9384512f7d5a7f13dcfbeebc8 Mon Sep 17 00:00:00 2001
From: Vimal Singh <vimalsingh@ti.com>
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' functions.

Signed-off-by: Vimal Singh <vimalsingh@ti.com>
---
 drivers/mtd/nand/nand_base.c |   97 +++++++++++++++---------------------------
 1 files changed, 34 insertions(+), 63 deletions(-)
vimal singh - Jan. 13, 2010, 1:20 p.m.
Please drop this patch. This patch breaks compilation. My bad...
I will be posting new version of this patch soon.

I apology for creating noise.

-vimal

On Wed, Jan 13, 2010 at 6:36 PM, Vimal Singh <vimal.newwork@gmail.com> wrote:
> On Wed, Jan 13, 2010 at 6:23 PM, Vimal Singh <vimal.newwork@gmail.com> wrote:
>> From cde21be80002b49fb8baeb341e8ae5a1a2394cb6 Mon Sep 17 00:00:00 2001
>> From: Vimal Singh <vimalsingh@ti.com>
>> 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.
>>
>
> I just ran checkpatch.pl and this patch had an error.
> Corrected patch is below.
>
> -vimal
>
> From 310f7faa8f319bd9384512f7d5a7f13dcfbeebc8 Mon Sep 17 00:00:00 2001
> From: Vimal Singh <vimalsingh@ti.com>
> 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' functions.
>
> Signed-off-by: Vimal Singh <vimalsingh@ti.com>
> ---
>  drivers/mtd/nand/nand_base.c |   97 +++++++++++++++---------------------------
>  1 files changed, 34 insertions(+), 63 deletions(-)
>
> diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
> index 4e27426..c80cec5 100644
> --- a/drivers/mtd/nand/nand_base.c
> +++ b/drivers/mtd/nand/nand_base.c
> @@ -108,6 +108,37 @@ 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
>  * @mtd:       MTD device structure
> @@ -894,28 +925,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 +979,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 +2483,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;
>
> --
> 1.5.5
>

Patch

diff --git a/drivers/mtd/nand/nand_base.c b/drivers/mtd/nand/nand_base.c
index 4e27426..c80cec5 100644
--- a/drivers/mtd/nand/nand_base.c
+++ b/drivers/mtd/nand/nand_base.c
@@ -108,6 +108,37 @@  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
  * @mtd:	MTD device structure
@@ -894,28 +925,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 +979,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 +2483,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;