diff options
author | Nick Hainke <vincent@systemli.org> | 2022-09-28 11:20:51 +0200 |
---|---|---|
committer | Christian Marangi <ansuelsmth@gmail.com> | 2023-05-12 13:02:42 +0200 |
commit | d7ab4d76b12ce01c792b3e51974e20463185d4ca (patch) | |
tree | f22d95a80208bb81e506f235f03a21d9b037b7c0 /target/linux/ath25/patches-5.15/142-redboot_various_erase_size_fix.patch | |
parent | 71217aa33bb8d1e2f351e0b6145c63a744268a57 (diff) | |
download | upstream-d7ab4d76b12ce01c792b3e51974e20463185d4ca.tar.gz upstream-d7ab4d76b12ce01c792b3e51974e20463185d4ca.tar.bz2 upstream-d7ab4d76b12ce01c792b3e51974e20463185d4ca.zip |
ath25: 5:15: copy config and patch from 5.10
Copy config and patch from kernel 5.10 to kernel 5.15.
Signed-off-by: Nick Hainke <vincent@systemli.org>
Diffstat (limited to 'target/linux/ath25/patches-5.15/142-redboot_various_erase_size_fix.patch')
-rw-r--r-- | target/linux/ath25/patches-5.15/142-redboot_various_erase_size_fix.patch | 72 |
1 files changed, 72 insertions, 0 deletions
diff --git a/target/linux/ath25/patches-5.15/142-redboot_various_erase_size_fix.patch b/target/linux/ath25/patches-5.15/142-redboot_various_erase_size_fix.patch new file mode 100644 index 0000000000..c3b73eabe9 --- /dev/null +++ b/target/linux/ath25/patches-5.15/142-redboot_various_erase_size_fix.patch @@ -0,0 +1,72 @@ +--- a/drivers/mtd/parsers/redboot.c ++++ b/drivers/mtd/parsers/redboot.c +@@ -71,6 +71,22 @@ static void parse_redboot_of(struct mtd_ + directory = dirblock; + } + ++static uint32_t mtd_get_offset_erasesize(struct mtd_info *mtd, uint64_t offset) ++{ ++ struct mtd_erase_region_info *regions = mtd->eraseregions; ++ int i; ++ ++ for (i = 0; i < mtd->numeraseregions; i++) { ++ if (regions[i].offset + ++ regions[i].numblocks * regions[i].erasesize <= offset) ++ continue; ++ ++ return regions[i].erasesize; ++ } ++ ++ return mtd->erasesize; ++} ++ + static int parse_redboot_partitions(struct mtd_info *master, + const struct mtd_partition **pparts, + struct mtd_part_parser_data *data) +@@ -87,6 +103,7 @@ static int parse_redboot_partitions(stru + int namelen = 0; + int nulllen = 0; + int numslots; ++ int first_slot; + unsigned long offset; + #ifdef CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED + static char nullstring[] = "unallocated"; +@@ -201,7 +218,10 @@ static int parse_redboot_partitions(stru + goto out; + } + +- for (i = 0; i < numslots; i++) { ++ first_slot = (buf[i].flash_base & (master->erasesize - 1)) / ++ sizeof(struct fis_image_desc); ++ ++ for (i = first_slot; i < first_slot + numslots; i++) { + struct fis_list *new_fl, **prev; + + if (buf[i].name[0] == 0xff) { +@@ -277,12 +297,13 @@ static int parse_redboot_partitions(stru + } + #endif + for ( ; i<nrparts; i++) { +- if (max_offset < buf[i].flash_base + buf[i].size) +- max_offset = buf[i].flash_base + buf[i].size; + parts[i].size = fl->img->size; + parts[i].offset = fl->img->flash_base; + parts[i].name = names; + ++ if (max_offset < parts[i].offset + parts[i].size) ++ max_offset = parts[i].offset + parts[i].size; ++ + strcpy(names, fl->img->name); + #ifdef CONFIG_MTD_REDBOOT_PARTS_READONLY + if (!memcmp(names, "RedBoot", 8) || +@@ -312,7 +333,9 @@ static int parse_redboot_partitions(stru + fl = fl->next; + kfree(tmp_fl); + } +- if (master->size - max_offset >= master->erasesize) { ++ ++ if (master->size - max_offset >= ++ mtd_get_offset_erasesize(master, max_offset)) { + parts[nrparts].size = master->size - max_offset; + parts[nrparts].offset = max_offset; + parts[nrparts].name = names; |