[openwrt/openwrt] mediatek: enable rootwait for cmcc rax3000m emmc version

[LEDE Commits]

hauke pushed a commit to openwrt/openwrt.git, branch openwrt-23.05:
https://git.openwrt.org/a591f9cd1408477e3f99e079a5b95098bda82a2b

commit a591f9cd1408477e3f99e079a5b95098bda82a2b
Author: Tianling Shen <cnsztl at immortalwrt.org>
AuthorDate: Fri Apr 5 15:44:24 2024 +0800

    mediatek: enable rootwait for cmcc rax3000m emmc version
    
    Sometimes the mmc deivce may come up later than kernel attempts to
    mount rootfs, resulting kernel panic. Enable rootwait to fix it.
    
    Reported-by: Yangyu Chen <cyy at cyyself.name>
    Signed-off-by: Tianling Shen <cnsztl at immortalwrt.org>
    Link: https://github.com/openwrt/openwrt/pull/15077
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch | 2 +-
 target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-emmc.dtso       | 9 ++++++++-
 target/linux/mediatek/dts/mt7981b-cmcc-rax3000m.dts             | 2 +-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch b/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch
index 26e0e30a99..1d636b64a7 100644
--- a/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch
+++ b/package/boot/uboot-mediatek/patches/437-add-cmcc_rax3000m.patch
@@ -585,7 +585,7 @@
 +serverip=192.168.1.254
 +loadaddr=0x46000000
 +console=earlycon=uart8250,mmio32,0x11002000 console=ttyS0
-+bootargs=root=/dev/mmcblk0p65
++bootargs=root=/dev/mmcblk0p65 rootwait
 +bootcmd=if pstore check ; then run boot_recovery ; else run boot_emmc ; fi
 +bootconf=config-1#mt7981b-cmcc-rax3000m-emmc
 +bootdelay=0
diff --git a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-emmc.dtso b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-emmc.dtso
index c1c9c75c27..df0a79eb1e 100644
--- a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-emmc.dtso
+++ b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m-emmc.dtso
@@ -7,6 +7,13 @@
 	compatible = "cmcc,rax3000m", "mediatek,mt7981";
 
 	fragment at 0 {
+		target = <&chosen>;
+		__overlay_ {
+			bootargs-append = " rootwait";
+		};
+	};
+
+	fragment at 1 {
 		target = <&mmc0>;
 		__overlay__ {
 			bus-width = <8>;
@@ -22,7 +29,7 @@
 		};
 	};
 
-	fragment at 1 {
+	fragment at 2 {
 		target = <&pio>;
 		__overlay__ {
 			mmc0_pins_default: mmc0-pins {
diff --git a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m.dts b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m.dts
index 3f330f40fa..bb0d43c112 100644
--- a/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m.dts
+++ b/target/linux/mediatek/dts/mt7981b-cmcc-rax3000m.dts
@@ -21,7 +21,7 @@
 		serial0 = &uart0;
 	};
 
-	chosen {
+	chosen: chosen {
 		stdout-path = "serial0:115200n8";
 	};