6.1-stable patches

added patches:
	mtd-parsers-ofpart-add-workaround-for-size-cells-0.patch

diff --git a/queue-6.1/mtd-parsers-ofpart-add-workaround-for-size-cells-0.patch b/queue-6.1/mtd-parsers-ofpart-add-workaround-for-size-cells-0.patch
new file mode 100644 (file)
index 0000000..9153ed7
--- /dev/null
+++ b/queue-6.1/mtd-parsers-ofpart-add-workaround-for-size-cells-0.patch
@@ -0,0 +1,59 @@
+From 84549c816dc317f012798e706e58669b3b013604 Mon Sep 17 00:00:00 2001
+From: Francesco Dolcini <francesco.dolcini@toradex.com>
+Date: Tue, 24 Jan 2023 11:44:44 +0100
+Subject: mtd: parsers: ofpart: add workaround for #size-cells 0
+
+From: Francesco Dolcini <francesco.dolcini@toradex.com>
+
+commit 84549c816dc317f012798e706e58669b3b013604 upstream.
+
+Add a mechanism to handle the case in which partitions are present as
+direct child of the nand controller node and #size-cells is set to <0>.
+
+This could happen if the nand-controller node in the DTS is supposed to
+have #size-cells set to 0, but for some historical reason/bug it was set
+to 1 in the past, and the firmware (e.g. U-Boot) is adding the partition
+as direct children of the nand-controller defaulting to #size-cells
+being to 1.
+
+This prevents a real boot failure on colibri-imx7 that happened during v6.1
+development cycles.
+
+Link: https://lore.kernel.org/all/Y4dgBTGNWpM6SQXI@francesco-nb.int.toradex.com/
+Link: https://lore.kernel.org/all/20221202071900.1143950-1-francesco@dolcini.it/
+Signed-off-by: Francesco Dolcini <francesco.dolcini@toradex.com>
+Signed-off-by: Miquel Raynal <miquel.raynal@bootlin.com>
+Link: https://lore.kernel.org/linux-mtd/20230124104444.330913-1-francesco@dolcini.it
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/mtd/parsers/ofpart_core.c |   19 +++++++++++++++++++
+ 1 file changed, 19 insertions(+)
+
+--- a/drivers/mtd/parsers/ofpart_core.c
++++ b/drivers/mtd/parsers/ofpart_core.c
+@@ -122,6 +122,25 @@ static int parse_fixed_partitions(struct
+ 
+               a_cells = of_n_addr_cells(pp);
+               s_cells = of_n_size_cells(pp);
++              if (!dedicated && s_cells == 0) {
++                      /*
++                       * This is a ugly workaround to not create
++                       * regression on devices that are still creating
++                       * partitions as direct children of the nand controller.
++                       * This can happen in case the nand controller node has
++                       * #size-cells equal to 0 and the firmware (e.g.
++                       * U-Boot) just add the partitions there assuming
++                       * 32-bit addressing.
++                       *
++                       * If you get this warning your firmware and/or DTS
++                       * should be really fixed.
++                       *
++                       * This is working only for devices smaller than 4GiB.
++                       */
++                      pr_warn("%s: ofpart partition %pOF (%pOF) #size-cells is wrongly set to <0>, assuming <1> for parsing partitions.\n",
++                              master->name, pp, mtd_node);
++                      s_cells = 1;
++              }
+               if (len / 4 != a_cells + s_cells) {
+                       pr_debug("%s: ofpart partition %pOF (%pOF) error parsing reg property.\n",
+                                master->name, pp,

diff --git a/queue-6.1/series b/queue-6.1/series
index a22c7f38e7d1636f41bc6da639ddb2923e26db63..3f22104daaa03e908b262599d18260726c944195 100644 (file)
--- a/queue-6.1/series
+++ b/queue-6.1/series
@@ -41,3 +41,4 @@ fs-ntfs3-fix-an-null-dereference-bug.patch
 scsi-core-move-scsi_host_busy-out-of-host-lock-if-it.patch
 blk-iocost-fix-an-ubsan-shift-out-of-bounds-warning.patch
 fs-dlm-don-t-put-dlm_local_addrs-on-heap.patch
+mtd-parsers-ofpart-add-workaround-for-size-cells-0.patch