[openwrt/openwrt] kernel: fix mtd squashfs root regression on targets with CONFIG_FIT_PARTITION

[LEDE Commits]

nbd pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/734c3f71482d5234f320f9b2b9acd8c51be51ae6

commit 734c3f71482d5234f320f9b2b9acd8c51be51ae6
Author: Felix Fietkau <nbd at nbd.name>
AuthorDate: Sat Apr 10 17:00:57 2021 +0200

    kernel: fix mtd squashfs root regression on targets with CONFIG_FIT_PARTITION
    
    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 at makrotopia.org>
    Signed-off-by: Felix Fietkau <nbd at nbd.name>
---
 .../402-mtd-blktrans-call-add-disks-after-mtd-device.patch        | 4 ++--
 .../420-mtd-set-rootfs-to-be-root-dev.patch}                      | 8 ++++++--
 .../pending-5.10/495-mtd-core-add-get_mtd_device_by_node.patch    | 2 +-
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/target/linux/generic/hack-5.10/402-mtd-blktrans-call-add-disks-after-mtd-device.patch b/target/linux/generic/hack-5.10/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
index bc9e84cac1..77ecd9b72f 100644
--- a/target/linux/generic/hack-5.10/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
+++ b/target/linux/generic/hack-5.10/402-mtd-blktrans-call-add-disks-after-mtd-device.patch
@@ -74,7 +74,7 @@ Signed-off-by: Daniel Golle <daniel at 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 at 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/pending-5.10/480-mtd-set-rootfs-to-be-root-dev.patch b/target/linux/generic/hack-5.10/420-mtd-set-rootfs-to-be-root-dev.patch
similarity index 83%
rename from target/linux/generic/pending-5.10/480-mtd-set-rootfs-to-be-root-dev.patch
rename to target/linux/generic/hack-5.10/420-mtd-set-rootfs-to-be-root-dev.patch
index e01b991942..91a91b36ca 100644
--- a/target/linux/generic/pending-5.10/480-mtd-set-rootfs-to-be-root-dev.patch
+++ b/target/linux/generic/hack-5.10/420-mtd-set-rootfs-to-be-root-dev.patch
@@ -20,7 +20,7 @@ Signed-off-by: Gabor Juhos <juhosg at openwrt.org>
  #include <linux/nvmem-provider.h>
  
  #include <linux/mtd/mtd.h>
-@@ -693,6 +694,15 @@ int add_mtd_device(struct mtd_info *mtd)
+@@ -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);
@@ -28,9 +28,13 @@ Signed-off-by: Gabor Juhos <juhosg at openwrt.org>
 +	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);
-+		ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, mtd->index);
++#ifdef CONFIG_FIT_PARTITION
++		index <<= 1;
++#endif
++		ROOT_DEV = MKDEV(MTD_BLOCK_MAJOR, index);
 +	}
 +
  	return 0;
diff --git a/target/linux/generic/pending-5.10/495-mtd-core-add-get_mtd_device_by_node.patch b/target/linux/generic/pending-5.10/495-mtd-core-add-get_mtd_device_by_node.patch
index 7a7ad6b263..ef8b54a450 100644
--- a/target/linux/generic/pending-5.10/495-mtd-core-add-get_mtd_device_by_node.patch
+++ b/target/linux/generic/pending-5.10/495-mtd-core-add-get_mtd_device_by_node.patch
@@ -17,7 +17,7 @@ Reviewed-by: Miquel Raynal <miquel.raynal at 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);