From: Renaud Barbier <renaud.barbier@ge.com>
To: barebox@lists.infradead.org
Subject: [PATCH] mtd-core: fix mtd erase operation for non-uniform flashes.
Date: Wed, 22 May 2013 17:54:16 +0100 [thread overview]
Message-ID: <1369241656-9219-1-git-send-email-renaud.barbier@ge.com> (raw)
This patch supports the erasing of CFI flash with non-uniform sector.
When more than one erase region exists, the mtd_erasesize function
assigns the erase size of the sector to the erase_info structure.
The problem was discovered when erasing /dev/env0 on my PPC board.
This is a partition of size 0x8000 at offset 0 of a 32MB Intel compatible
flash with a bottom boot block i.e 4 32KB sectors followed by 255
128KB sectors.
barebox> unprotect /dev/env0
barebox> erase /dev/env0
cfi_erase: start = 0x0, end = 0x3, count = 0x20000
Flash erase error at address fe008000
Block Erase Error.
Block locked.
erase: I/O error
The error above is that a count of 0x20000 is passed instead of 0x8000
by mtd_op_erase. This is because the code does not take into account
multiple erase regions.
After taking into account the erase regions, only the first sector is
erased:
barebox> unprotect /dev/env0
barebox> erase /dev/env0
cfi_erase: start = 0x0, end = 0x0, count = 0x8000
Signed-off-by: Renaud Barbier <renaud.barbier@ge.com>
---
drivers/mtd/core.c | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/drivers/mtd/core.c b/drivers/mtd/core.c
index 61744b6..8139b98 100644
--- a/drivers/mtd/core.c
+++ b/drivers/mtd/core.c
@@ -98,6 +98,23 @@ static ssize_t mtd_op_write(struct cdev* cdev, const void *buf, size_t _count,
return ret ? ret : _count;
}
+static void mtd_erasesize(struct erase_info *erase)
+{
+ struct mtd_info *mtd = erase->mtd;
+ int ix, size;
+
+ size = 0;
+ for (ix = 0; ix < mtd->numeraseregions; ix++) {
+ size += mtd->eraseregions[ix].erasesize *
+ mtd->eraseregions[ix].numblocks;
+
+ if (erase->addr < size) {
+ erase->len = mtd->eraseregions[ix].erasesize;
+ break;
+ }
+ }
+}
+
static int mtd_op_erase(struct cdev *cdev, size_t count, loff_t offset)
{
struct mtd_info *mtd = cdev->priv;
@@ -110,6 +127,9 @@ static int mtd_op_erase(struct cdev *cdev, size_t count, loff_t offset)
erase.len = mtd->erasesize;
while (count > 0) {
+ if (mtd->numeraseregions > 1)
+ mtd_erasesize(&erase);
+
dev_dbg(cdev->dev, "erase %d %d\n", erase.addr, erase.len);
if (!mtd->allow_erasebad)
@@ -125,8 +145,8 @@ static int mtd_op_erase(struct cdev *cdev, size_t count, loff_t offset)
return ret;
}
- erase.addr += mtd->erasesize;
- count -= count > mtd->erasesize ? mtd->erasesize : count;
+ erase.addr += erase.len;
+ count -= count > erase.len ? erase.len : count;
}
return 0;
--
1.7.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next reply other threads:[~2013-05-22 16:55 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-05-22 16:54 Renaud Barbier [this message]
2013-05-23 13:27 ` Sascha Hauer
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=1369241656-9219-1-git-send-email-renaud.barbier@ge.com \
--to=renaud.barbier@ge.com \
--cc=barebox@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