linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: richard.genoud@gmail.com (Richard Genoud)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/8] UBI: separate bad_peb_limit in a function
Date: Fri, 17 Aug 2012 16:35:18 +0200	[thread overview]
Message-ID: <1345214124-5478-3-git-send-email-richard.genoud@gmail.com> (raw)
In-Reply-To: <1345214124-5478-1-git-send-email-richard.genoud@gmail.com>

No functional changes here, just to prepare for next patch.

Signed-off-by: Richard Genoud <richard.genoud@gmail.com>
---
 drivers/mtd/ubi/build.c |   57 ++++++++++++++++++++++++++++-------------------
 1 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/drivers/mtd/ubi/build.c b/drivers/mtd/ubi/build.c
index 738772c..82d11e1 100644
--- a/drivers/mtd/ubi/build.c
+++ b/drivers/mtd/ubi/build.c
@@ -565,6 +565,37 @@ void ubi_free_internal_volumes(struct ubi_device *ubi)
 	}
 }
 
+static int get_bad_peb_limit(const struct ubi_device *ubi, int max_beb_per1024)
+{
+	int limit, device_pebs;
+	uint64_t device_size;
+
+	/*
+	 * We don't want a division by 0, and having max_beb_per1024 == 0 is ok
+	 */
+	if (!max_beb_per1024)
+		return 0;
+
+	/*
+	 * Here we are using size of the entire flash chip and
+	 * not just the MTD partition size because the maximum
+	 * number of bad eraseblocks is a percentage of the
+	 * whole device and bad eraseblocks are not fairly
+	 * distributed over the flash chip. So the worst case
+	 * is that all the bad eraseblocks of the chip are in
+	 * the MTD partition we are attaching (ubi->mtd).
+	 */
+	device_size = mtd_get_device_size(ubi->mtd);
+	device_pebs = mtd_div_by_eb(device_size, ubi->mtd);
+	limit = mult_frac(device_pebs, max_beb_per1024, 1024);
+
+	/* Round it up */
+	if (mult_frac(limit, 1024, max_beb_per1024) < device_pebs)
+		limit += 1;
+
+	return limit;
+}
+
 /**
  * io_init - initialize I/O sub-system for a given UBI device.
  * @ubi: UBI device description object
@@ -582,6 +613,8 @@ void ubi_free_internal_volumes(struct ubi_device *ubi)
  */
 static int io_init(struct ubi_device *ubi)
 {
+	const int max_beb_per1024 = CONFIG_MTD_UBI_BEB_LIMIT;
+
 	if (ubi->mtd->numeraseregions != 0) {
 		/*
 		 * Some flashes have several erase regions. Different regions
@@ -610,29 +643,7 @@ static int io_init(struct ubi_device *ubi)
 
 	if (mtd_can_have_bb(ubi->mtd)) {
 		ubi->bad_allowed = 1;
-		if (CONFIG_MTD_UBI_BEB_LIMIT > 0) {
-			int per1024 = CONFIG_MTD_UBI_BEB_LIMIT;
-			int limit, device_pebs;
-			uint64_t device_size;
-
-			/*
-			 * Here we are using size of the entire flash chip and
-			 * not just the MTD partition size because the maximum
-			 * number of bad eraseblocks is a percentage of the
-			 * whole device and bad eraseblocks are not fairly
-			 * distributed over the flash chip. So the worst case
-			 * is that all the bad eraseblocks of the chip are in
-			 * the MTD partition we are attaching (ubi->mtd).
-			 */
-			device_size = mtd_get_device_size(ubi->mtd);
-			device_pebs = mtd_div_by_eb(device_size, ubi->mtd);
-			limit = mult_frac(device_pebs, per1024, 1024);
-
-			/* Round it up */
-			if (mult_frac(limit, 1024, per1024) < device_pebs)
-				limit += 1;
-			ubi->bad_peb_limit = limit;
-		}
+		ubi->bad_peb_limit = get_bad_peb_limit(ubi, max_beb_per1024);
 	}
 
 	if (ubi->mtd->type == MTD_NORFLASH) {
-- 
1.7.2.5

  parent reply	other threads:[~2012-08-17 14:35 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-08-17 14:35 [PATCH 0/8] UBI: add max_beb_per1024 parameter / ioctl Richard Genoud
2012-08-17 14:35 ` [PATCH 1/8] arm: sam9_l9260_defconfig: adjust UBI bad eraseblocks limit Richard Genoud
2012-08-19 19:21   ` Artem Bityutskiy
2012-08-19 19:29     ` Artem Bityutskiy
2012-08-20  7:56   ` Jean-Christophe PLAGNIOL-VILLARD
2012-08-17 14:35 ` Richard Genoud [this message]
2012-08-19  7:20   ` [PATCH 2/8] UBI: separate bad_peb_limit in a function Shmulik Ladkani
2012-08-19 19:19   ` Artem Bityutskiy
2012-08-17 14:35 ` [PATCH 3/8] UBI: introduce MTD_PARAM_MAX_COUNT Richard Genoud
2012-08-19 19:32   ` Artem Bityutskiy
2012-08-19 19:32   ` Artem Bityutskiy
2012-08-17 14:35 ` [PATCH 4/8] UBI: prepare for max_beb_per1024 module parameter addition Richard Genoud
2012-08-19  9:01   ` Shmulik Ladkani
2012-08-17 14:35 ` [PATCH 5/8] UBI: check max_beb_per1024 value in ubi_attach_mtd_dev Richard Genoud
2012-08-19  9:08   ` Shmulik Ladkani
2012-08-20  6:31     ` Richard Genoud
2012-08-20  8:25       ` Artem Bityutskiy
2012-08-20  8:29         ` Artem Bityutskiy
2012-08-17 14:35 ` [PATCH 6/8] UBI: replace MTD_UBI_BEB_LIMIT with module parameter Richard Genoud
2012-08-19  9:26   ` Shmulik Ladkani
2012-08-20  7:38     ` Richard Genoud
2012-08-20  8:21       ` Richard Genoud
2012-08-17 14:35 ` [PATCH 7/8] UBI: add ioctl for max_beb_per1024 Richard Genoud
2012-08-17 14:35 ` [PATCH 8/8] UBI: drop CONFIG_MTD_UBI_BEB_LIMIT Richard Genoud

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1345214124-5478-3-git-send-email-richard.genoud@gmail.com \
    --to=richard.genoud@gmail.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).