kernel: backport mtd patch adding of_platform_populate() calls

This is required for non-parser drivers handling MTD devices.

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

diff --git a/target/linux/generic/backport-5.10/412-v5.19-mtd-call-of_platform_populate-for-MTD-partitions.patch b/target/linux/generic/backport-5.10/412-v5.19-mtd-call-of_platform_populate-for-MTD-partitions.patch
new file mode 100644 (file)
index 0000000..aaeb087
--- /dev/null
+++ b/target/linux/generic/backport-5.10/412-v5.19-mtd-call-of_platform_populate-for-MTD-partitions.patch
@@ -0,0 +1,72 @@
+From bcdf0315a61a29eb753a607d3a85a4032de72d94 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl>
+Date: Tue, 10 May 2022 15:12:59 +0200
+Subject: [PATCH] mtd: call of_platform_populate() for MTD partitions
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Until this change MTD subsystem supported handling partitions only with
+MTD partitions parsers. That's a specific / limited API designed around
+partitions.
+
+Some MTD partitions may however require different handling. They may
+contain specific data that needs to be parsed and somehow extracted. For
+that purpose MTD subsystem should allow binding of standard platform
+drivers.
+
+An example can be U-Boot (sub)partition with environment variables.
+There exist a "u-boot,env" DT binding for MTD (sub)partition that
+requires an NVMEM driver.
+
+Ref: 5db1c2dbc04c ("dt-bindings: nvmem: add U-Boot environment variables binding")
+Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
+Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
+Link: https://lore.kernel.org/linux-mtd/20220510131259.555-1-zajec5@gmail.com
+---
+ drivers/mtd/mtdpart.c | 9 +++++++++
+ 1 file changed, 9 insertions(+)
+
+--- a/drivers/mtd/mtdpart.c
++++ b/drivers/mtd/mtdpart.c
+@@ -17,6 +17,7 @@
+ #include <linux/mtd/partitions.h>
+ #include <linux/err.h>
+ #include <linux/of.h>
++#include <linux/of_platform.h>
+ 
+ #include "mtdcore.h"
+ 
+@@ -578,10 +579,16 @@ static int mtd_part_of_parse(struct mtd_
+       struct mtd_part_parser *parser;
+       struct device_node *np;
+       struct property *prop;
++      struct device *dev;
+       const char *compat;
+       const char *fixed = "fixed-partitions";
+       int ret, err = 0;
+ 
++      dev = &master->dev;
++      /* Use parent device (controller) if the top level MTD is not registered */
++      if (!IS_ENABLED(CONFIG_MTD_PARTITIONED_MASTER) && !mtd_is_partition(master))
++              dev = master->dev.parent;
++
+       np = mtd_get_of_node(master);
+       if (mtd_is_partition(master))
+               of_node_get(np);
+@@ -594,6 +601,7 @@ static int mtd_part_of_parse(struct mtd_
+                       continue;
+               ret = mtd_part_do_parse(parser, master, pparts, NULL);
+               if (ret > 0) {
++                      of_platform_populate(np, NULL, NULL, dev);
+                       of_node_put(np);
+                       return ret;
+               }
+@@ -601,6 +609,7 @@ static int mtd_part_of_parse(struct mtd_
+               if (ret < 0 && !err)
+                       err = ret;
+       }
++      of_platform_populate(np, NULL, NULL, dev);
+       of_node_put(np);
+ 
+       /*

diff --git a/target/linux/generic/pending-5.10/400-mtd-mtdsplit-support.patch b/target/linux/generic/pending-5.10/400-mtd-mtdsplit-support.patch
index 42043a28183801e542c2d471db8b3e02856d64c0..f37df6d164abbdb2882ca35e9fe94f2ad4bd6f4f 100644 (file)
--- a/target/linux/generic/pending-5.10/400-mtd-mtdsplit-support.patch
+++ b/target/linux/generic/pending-5.10/400-mtd-mtdsplit-support.patch
@@ -28,20 +28,21 @@
        depends on m
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c
-@@ -15,10 +15,12 @@
+@@ -15,11 +15,13 @@
  #include <linux/kmod.h>
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
 +#include <linux/magic.h>
  #include <linux/err.h>
  #include <linux/of.h>
+ #include <linux/of_platform.h>
  
  #include "mtdcore.h"
 +#include "mtdsplit/mtdsplit.h"
  
  /*
   * MTD methods which simply translate the effective address and pass through
-@@ -236,6 +238,146 @@ static int mtd_add_partition_attrs(struc
+@@ -237,6 +239,146 @@ static int mtd_add_partition_attrs(struc
        return ret;
  }
  
@@ -188,7 +189,7 @@
  int mtd_add_partition(struct mtd_info *parent, const char *name,
                      long long offset, long long length)
  {
-@@ -274,6 +416,7 @@ int mtd_add_partition(struct mtd_info *p
+@@ -275,6 +417,7 @@ int mtd_add_partition(struct mtd_info *p
        if (ret)
                goto err_remove_part;
  
@@ -196,7 +197,7 @@
        mtd_add_partition_attrs(child);
  
        return 0;
-@@ -422,6 +565,7 @@ int add_mtd_partitions(struct mtd_info *
+@@ -423,6 +566,7 @@ int add_mtd_partitions(struct mtd_info *
                        goto err_del_partitions;
                }
  
@@ -204,7 +205,7 @@
                mtd_add_partition_attrs(child);
  
                /* Look for subpartitions */
-@@ -438,31 +582,6 @@ err_del_partitions:
+@@ -439,31 +583,6 @@ err_del_partitions:
        return ret;
  }
  

diff --git a/target/linux/generic/pending-5.10/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch b/target/linux/generic/pending-5.10/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch
index c634ae9aeb73a5b6a97a61bf6f90692b75cca578..53d5637e41de0662dce027bcda76f36a0dd5a5cd 100644 (file)
--- a/target/linux/generic/pending-5.10/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch
+++ b/target/linux/generic/pending-5.10/402-mtd-spi-nor-write-support-for-minor-aligned-partitions.patch
@@ -106,7 +106,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
        &dev_attr_oobsize.attr,
 --- a/drivers/mtd/mtdpart.c
 +++ b/drivers/mtd/mtdpart.c
-@@ -40,6 +40,7 @@ static struct mtd_info *allocate_partiti
+@@ -41,6 +41,7 @@ static struct mtd_info *allocate_partiti
        struct mtd_info *master = mtd_get_master(parent);
        int wr_alignment = (parent->flags & MTD_NO_ERASE) ?
                           master->writesize : master->erasesize;
@@ -114,7 +114,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
        u64 parent_size = mtd_is_partition(parent) ?
                          parent->part.size : parent->size;
        struct mtd_info *child;
-@@ -164,6 +165,7 @@ static struct mtd_info *allocate_partiti
+@@ -165,6 +166,7 @@ static struct mtd_info *allocate_partiti
        } else {
                /* Single erase size */
                child->erasesize = master->erasesize;
@@ -122,7 +122,7 @@ Reported-by: Dan Carpenter <dan.carpenter@oracle.com>
        }
  
        /*
-@@ -171,26 +173,39 @@ static struct mtd_info *allocate_partiti
+@@ -172,26 +174,39 @@ static struct mtd_info *allocate_partiti
         * exposes several regions with different erasesize. Adjust
         * wr_alignment accordingly.
         */