aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2012-10-10 11:38:44 +0000
committerFelix Fietkau <nbd@openwrt.org>2012-10-10 11:38:44 +0000
commitf570c806ef507abc827f5ffaa5cc6d24ccd33585 (patch)
treefe6062efa5f1436171393a2d0c00aca4ff200213
parent1df0acf82eae02abe4e3826f93b3c7408464bc22 (diff)
downloadupstream-f570c806ef507abc827f5ffaa5cc6d24ccd33585.tar.gz
upstream-f570c806ef507abc827f5ffaa5cc6d24ccd33585.tar.bz2
upstream-f570c806ef507abc827f5ffaa5cc6d24ccd33585.zip
mtd: allow partial block unlock
This allows sysupgrade for devices such as the Gateworks Avila/Cambria product families based on the ixp4xx using the redboot bootloader with combined FIS directory and RedBoot config partitions on larger FLASH devices with larger eraseblocks. This second iteration of this patch addresses previous issues: - whitespace breakage fixed - unlock in all scenarios - simplification and fix logic bug Signed-off-by: Tim Harvey <tharvey@gateworks.com> SVN-Revision: 33681
-rw-r--r--target/linux/generic/patches-3.3/478-mtd-partial_eraseblock_unlock.patch18
1 files changed, 18 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.3/478-mtd-partial_eraseblock_unlock.patch b/target/linux/generic/patches-3.3/478-mtd-partial_eraseblock_unlock.patch
new file mode 100644
index 0000000000..de4481a93a
--- /dev/null
+++ b/target/linux/generic/patches-3.3/478-mtd-partial_eraseblock_unlock.patch
@@ -0,0 +1,18 @@
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -356,7 +356,14 @@ static int part_unlock(struct mtd_info *
+ struct mtd_part *part = PART(mtd);
+ if ((len + ofs) > mtd->size)
+ return -EINVAL;
+- return mtd_unlock(part->master, ofs + part->offset, len);
++
++ ofs += part->offset;
++ if (mtd->flags & MTD_ERASE_PARTIAL) {
++ /* round up len to next erasesize and round down offset to prev block */
++ len = (mtd_div_by_eb(len, part->master) + 1) * part->master->erasesize;
++ ofs &= ~(part->master->erasesize - 1);
++ }
++ return mtd_unlock(part->master, ofs, len);
+ }
+
+ static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)