kernel: bump 4.14 to 4.14.158

[openwrt/openwrt.git] / target / linux / generic / pending-4.14 / 402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch

diff --git a/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch b/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
index dff9c3166eaca5c6bc358734e9d996b55775fd93..2cc06dd463b3f556783f0e764022bf6dfcfe548f 100644 (file)
--- a/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
+++ b/target/linux/generic/pending-4.14/402-mtd-use-typed-mtd-parsers-for-rootfs-and-firmware-split.patch
@@ -10,52 +10,15 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c
-@@ -769,6 +769,36 @@ int mtd_del_partition(struct mtd_info *m
- }
- EXPORT_SYMBOL_GPL(mtd_del_partition);
- 
-+static int
-+run_parsers_by_type(struct mtd_part *slave, enum mtd_parser_type type)
-+{
-+      struct mtd_partition *parts;
-+      int nr_parts;
-+      int i;
-+
-+      nr_parts = parse_mtd_partitions_by_type(&slave->mtd, type, (const struct mtd_partition **)&parts,
-+                                              NULL);
-+      if (nr_parts <= 0)
-+              return nr_parts;
-+
-+      if (WARN_ON(!parts))
-+              return 0;
-+
-+      for (i = 0; i < nr_parts; i++) {
-+              /* adjust partition offsets */
-+              parts[i].offset += slave->offset;
-+
-+              mtd_add_partition(slave->parent,
-+                                parts[i].name,
-+                                parts[i].offset,
-+                                parts[i].size);
-+      }
-+
-+      kfree(parts);
-+
-+      return nr_parts;
-+}
-+
- #ifdef CONFIG_MTD_SPLIT_FIRMWARE_NAME
- #define SPLIT_FIRMWARE_NAME   CONFIG_MTD_SPLIT_FIRMWARE_NAME
- #else
-@@ -777,6 +807,7 @@ EXPORT_SYMBOL_GPL(mtd_del_partition);
+@@ -804,6 +804,7 @@ run_parsers_by_type(struct mtd_part *sla
  
  static void split_firmware(struct mtd_info *master, struct mtd_part *part)
  {
 +      run_parsers_by_type(part, MTD_PARSER_TYPE_FIRMWARE);
  }
  
- void __weak arch_split_mtd_part(struct mtd_info *master, const char *name,
-@@ -791,6 +822,12 @@ static void mtd_partition_split(struct m
+ static void mtd_partition_split(struct mtd_info *master, struct mtd_part *part)
+@@ -813,6 +814,12 @@ static void mtd_partition_split(struct m
        if (rootfs_found)
                return;
  
@@ -65,12 +28,12 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 +              rootfs_found = 1;
 +      }
 +
-       if (!strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
-           IS_ENABLED(CONFIG_MTD_SPLIT_FIRMWARE))
-               split_firmware(master, part);
+       if (IS_ENABLED(CONFIG_MTD_SPLIT_FIRMWARE) &&
+           !strcmp(part->mtd.name, SPLIT_FIRMWARE_NAME) &&
+           !of_find_property(mtd_get_of_node(&part->mtd), "compatible", NULL))
 --- a/include/linux/mtd/partitions.h
 +++ b/include/linux/mtd/partitions.h
-@@ -74,6 +74,8 @@ struct mtd_part_parser_data {
+@@ -75,6 +75,8 @@ struct mtd_part_parser_data {
  
  enum mtd_parser_type {
        MTD_PARSER_TYPE_DEVICE = 0,