forked from Ivasoft/openwrt
kernel: split patches folder up into backport, pending and hack folders
* properly format/comment all patches * merge debloat patches * merge Kconfig patches * merge swconfig patches * merge hotplug patches * drop 200-fix_localversion.patch - upstream * drop 222-arm_zimage_none.patch - unused * drop 252-mv_cesa_depends.patch - no longer required * drop 410-mtd-move-forward-declaration-of-struct-mtd_info.patch - unused * drop 661-fq_codel_keep_dropped_stats.patch - outdated * drop 702-phy_add_aneg_done_function.patch - upstream * drop 840-rtc7301.patch - unused * drop 841-rtc_pt7c4338.patch - upstream * drop 921-use_preinit_as_init.patch - unused * drop spio-gpio-old and gpio-mmc - unused Signed-off-by: John Crispin <john@phrozen.org>
This commit is contained in:
@@ -0,0 +1,45 @@
|
||||
From: Tim Harvey <tharvey@gateworks.com>
|
||||
Subject: 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
|
||||
|
||||
[john@phrozen.org: this should be moved to the ixp4xx folder]
|
||||
|
||||
Signed-off-by: Tim Harvey <tharvey@gateworks.com>
|
||||
---
|
||||
drivers/mtd/mtdpart.c | 11 ++++++++++-
|
||||
1 file changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/mtd/mtdpart.c b/drivers/mtd/mtdpart.c
|
||||
index 0238b0babe2f..d41418524833 100644
|
||||
--- a/drivers/mtd/mtdpart.c
|
||||
+++ b/drivers/mtd/mtdpart.c
|
||||
@@ -343,7 +343,16 @@ static int part_lock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
|
||||
static int part_unlock(struct mtd_info *mtd, loff_t ofs, uint64_t len)
|
||||
{
|
||||
struct mtd_part *part = mtd_to_part(mtd);
|
||||
- return part->parent->_unlock(part->parent, 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->parent) + 1) * part->parent->erasesize;
|
||||
+ ofs &= ~(part->parent->erasesize - 1);
|
||||
+ }
|
||||
+
|
||||
+ return part->parent->_unlock(part->parent, ofs, len);
|
||||
}
|
||||
|
||||
static int part_is_locked(struct mtd_info *mtd, loff_t ofs, uint64_t len)
|
||||
--
|
||||
2.11.0
|
||||
|
||||
Reference in New Issue
Block a user