kernel: fix mtd squashfs root regression on targets with CONFIG_FIT_PARTITION
authorFelix Fietkau <nbd@nbd.name>
Sat, 10 Apr 2021 15:00:57 +0000 (17:00 +0200)
committerFelix Fietkau <nbd@nbd.name>
Sat, 10 Apr 2021 15:02:05 +0000 (17:02 +0200)
Move 480-mtd-set-rootfs-to-be-root-dev.patch to hack-5.10 and fix assumption
about the block device index.

Fixes: 2809d0000744 ("kernel: support FIT partition parser on mtdblock devices")
Acked-by: Daniel Golle <daniel@makrotopia.org>
Signed-off-by: Felix Fietkau <nbd@nbd.name>
target/linux/generic/hack-5.10/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
target/linux/generic/hack-5.10/420-mtd-set-rootfs-to-be-root-dev.patch [new file with mode: 0644]
target/linux/generic/pending-5.10/480-mtd-set-rootfs-to-be-root-dev.patch [deleted file]
target/linux/generic/pending-5.10/495-mtd-core-add-get_mtd_device_by_node.patch

index bc9e84cac1ad0467e9f60497fb6ebe497ee67e0d..77ecd9b72fc79e221319f65f0a7fc766f37ff2dd 100644 (file)
@@ -74,7 +74,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
        unsigned long flags;
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -32,6 +32,7 @@
+@@ -31,6 +31,7 @@
  
  #include <linux/mtd/mtd.h>
  #include <linux/mtd/partitions.h>
@@ -82,7 +82,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
  
  #include "mtdcore.h"
  
-@@ -858,6 +859,8 @@ int mtd_device_parse_register(struct mtd
+@@ -848,6 +849,8 @@ int mtd_device_parse_register(struct mtd
                register_reboot_notifier(&mtd->reboot_notifier);
        }
  
diff --git a/target/linux/generic/hack-5.10/420-mtd-set-rootfs-to-be-root-dev.patch b/target/linux/generic/hack-5.10/420-mtd-set-rootfs-to-be-root-dev.patch
new file mode 100644 (file)
index 0000000..91a91b3
--- /dev/null
@@ -0,0 +1,42 @@
+From: Gabor Juhos <juhosg@openwrt.org>
+Subject: kernel/3.1[02]: move MTD root device setup code to mtdcore
+
+The current code only allows to automatically set
+root device on MTD partitions. Move the code to MTD
+core to allow to use it with all MTD devices.
+
+Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
+---
+ drivers/mtd/mtdcore.c | 10 ++++++++++
+ 1 file changed, 10 insertions(+)
+
+--- a/drivers/mtd/mtdcore.c
++++ b/drivers/mtd/mtdcore.c
+@@ -27,6 +27,7 @@
+ #include <linux/reboot.h>
+ #include <linux/leds.h>
+ #include <linux/debugfs.h>
++#include <linux/root_dev.h>
+ #include <linux/nvmem-provider.h>
+ #include <linux/mtd/mtd.h>
+@@ -694,6 +695,19 @@ int add_mtd_device(struct mtd_info *mtd)
+          of this try_ nonsense, and no bitching about it
+          either. :) */
+       __module_get(THIS_MODULE);
++
++      if (!strcmp(mtd->name, "rootfs") &&
++          IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
++          ROOT_DEV == 0) {
++              unsigned int index = mtd->index;
++              pr_notice("mtd: device %d (%s) set to be root filesystem\n",
++                        mtd->index, mtd->name);
++#ifdef CONFIG_FIT_PARTITION
++              index <<= 1;
++#endif
++              ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, index);
++      }
++
+       return 0;
+ fail_nvmem_add:
diff --git a/target/linux/generic/pending-5.10/480-mtd-set-rootfs-to-be-root-dev.patch b/target/linux/generic/pending-5.10/480-mtd-set-rootfs-to-be-root-dev.patch
deleted file mode 100644 (file)
index e01b991..0000000
+++ /dev/null
@@ -1,38 +0,0 @@
-From: Gabor Juhos <juhosg@openwrt.org>
-Subject: kernel/3.1[02]: move MTD root device setup code to mtdcore
-
-The current code only allows to automatically set
-root device on MTD partitions. Move the code to MTD
-core to allow to use it with all MTD devices.
-
-Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
----
- drivers/mtd/mtdcore.c | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
---- a/drivers/mtd/mtdcore.c
-+++ b/drivers/mtd/mtdcore.c
-@@ -27,6 +27,7 @@
- #include <linux/reboot.h>
- #include <linux/leds.h>
- #include <linux/debugfs.h>
-+#include <linux/root_dev.h>
- #include <linux/nvmem-provider.h>
- #include <linux/mtd/mtd.h>
-@@ -693,6 +694,15 @@ int add_mtd_device(struct mtd_info *mtd)
-          of this try_ nonsense, and no bitching about it
-          either. :) */
-       __module_get(THIS_MODULE);
-+
-+      if (!strcmp(mtd->name, "rootfs") &&
-+          IS_ENABLED(CONFIG_MTD_ROOTFS_ROOT_DEV) &&
-+          ROOT_DEV == 0) {
-+              pr_notice("mtd: device %d (%s) set to be root filesystem\n",
-+                        mtd->index, mtd->name);
-+              ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, mtd->index);
-+      }
-+
-       return 0;
- fail_nvmem_add:
index 7a7ad6b2639dac607881b2f27528ef98691d93d3..ef8b54a450f0b6a676fe8bd127683dc550c05665 100644 (file)
@@ -17,7 +17,7 @@ Reviewed-by: Miquel Raynal <miquel.raynal@bootlin.com>
 
 --- a/drivers/mtd/mtdcore.c
 +++ b/drivers/mtd/mtdcore.c
-@@ -1053,6 +1053,44 @@ out_unlock:
+@@ -1043,6 +1043,44 @@ out_unlock:
  }
  EXPORT_SYMBOL_GPL(get_mtd_device_nm);