kernel: bcm47xxpart: fix getting user-space data partition name

Partition name is picked by a parser_trx_data_part_name(). It has to
get correct partition offset (taking care of bad blocks) to work
properly.

This fixes UBI support for devices that have kernel flashed on partition
with a bad block.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 7ddba08d873a0ce6d2d32b8f6a1bea550107ca44)

diff --git a/target/linux/generic/pending-4.14/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch b/target/linux/generic/pending-4.14/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch
index 9299e886712401ce4418bd3eb97b509cd4c32de9..d54c284c343b5c71040d9b76b485ea0d870fd684 100644 (file)
--- a/target/linux/generic/pending-4.14/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch
+++ b/target/linux/generic/pending-4.14/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch
@@ -59,9 +59,10 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  
        if (trx.offset[i]) {
                part = &parts[curr_part++];
-               part->name = parser_trx_data_part_name(mtd, trx.offset[i]);
+-              part->name = parser_trx_data_part_name(mtd, trx.offset[i]);
 -              part->offset = trx.offset[i];
 +              part->offset = parser_trx_real_offset(mtd, trx.offset[i]);
++              part->name = parser_trx_data_part_name(mtd, part->offset);
                i++;
        }
  

diff --git a/target/linux/generic/pending-4.9/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch b/target/linux/generic/pending-4.9/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch
index 9299e886712401ce4418bd3eb97b509cd4c32de9..d54c284c343b5c71040d9b76b485ea0d870fd684 100644 (file)
--- a/target/linux/generic/pending-4.9/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch
+++ b/target/linux/generic/pending-4.9/431-mtd-bcm47xxpart-check-for-bad-blocks-when-calculatin.patch
@@ -59,9 +59,10 @@ Signed-off-by: Rafał Miłecki <zajec5@gmail.com>
  
        if (trx.offset[i]) {
                part = &parts[curr_part++];
-               part->name = parser_trx_data_part_name(mtd, trx.offset[i]);
+-              part->name = parser_trx_data_part_name(mtd, trx.offset[i]);
 -              part->offset = trx.offset[i];
 +              part->offset = parser_trx_real_offset(mtd, trx.offset[i]);
++              part->name = parser_trx_data_part_name(mtd, part->offset);
                i++;
        }