CM5 stuck on Waiting for root device /dev/mmcblk0p2...

[JeanPhilippeLebel]

Hello,

I've just upgraded every to the latest meta-raspberrypi in order to test a system that was running using a CM4 but is now upgraded to a CM5

Going for other issues, I was able to enable the UART console but the boot process stucks on

[ 3.524080] Waiting for root device /dev/mmcblk0p2...

MACHINE is set to raspberrypi5

Any idea what can cause that issue?

[kraj]

@JeanPhilippeLebel it seems MMC or parition number might be skewed. Can you try finding this out. Usually SD card boot helps with such issues.

[JeanPhilippeLebel]

Well, I'm booting from the internal eMMC, using core-image-minimal, so I wouldn't expect the partition scheme to be different between the cm4 and cm5 ?

Thanks,

[dferrarigrowtech]

I had the same issue, but I fixed it by including some .dtb. Here's the patch:

diff --git a/conf/machine/raspberrypi5.conf b/conf/machine/raspberrypi5.conf
index 03f15c3..1aac825 100644
--- a/conf/machine/raspberrypi5.conf
+++ b/conf/machine/raspberrypi5.conf
@@ -15,8 +15,14 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 
 RPI_KERNEL_DEVICETREE = " \
     broadcom/bcm2712-rpi-5-b.dtb \
+    broadcom/bcm2712-rpi-cm5-cm5io.dtb \
+    broadcom/bcm2712-rpi-cm5-cm4io.dtb \
+    broadcom/bcm2712-rpi-cm5l-cm5io.dtb \
+    broadcom/bcm2712-rpi-cm5l-cm4io.dtb \
 "
 
+RPI_KERNEL_DEVICETREE_OVERLAYS:append = " overlays/bcm2712d0.dtbo"
+
 SDIMG_KERNELIMAGE ?= "kernel_2712.img"
 SERIAL_CONSOLES ?= "115200;ttyAMA10"
 
diff --git a/recipes-kernel/linux/linux-raspberrypi_6.6.bb b/recipes-kernel/linux/linux-raspberrypi_6.6.bb
index b4d9953..7aaf3bc 100644
--- a/recipes-kernel/linux/linux-raspberrypi_6.6.bb
+++ b/recipes-kernel/linux/linux-raspberrypi_6.6.bb
@@ -1,8 +1,8 @@
-LINUX_VERSION ?= "6.6.22"
+LINUX_VERSION ?= "6.6.74"
 LINUX_RPI_BRANCH ?= "rpi-6.6.y"
 LINUX_RPI_KMETA_BRANCH ?= "yocto-6.6"
 
-SRCREV_machine = "c04af98514c26014a4f29ec87b3ece95626059bd"
+SRCREV_machine = "a18d9ced4965462cb7b3b4252ada440395105308"
 SRCREV_meta = "6a24861d6504575a4a9f92366285332d47c7e111"
 
 KMETA = "kernel-meta"

For context I am on scarthgap

[JeanPhilippeLebel]

Ho wow, this fixes my issue!

Can we turn this into a patch to be added to meta-raspberrypi?

[dferrarigrowtech]

There are already multiple PRs with a code similar to this that are waiting to be merged on master / scarthgap. Even if I am not sure that they fix this issue let's wait for them to be merged before submitting an additional PR. I would also love to see this problem fixed ASAP, I don't like having out-of-tree patches in my code.

[JeanPhilippeLebel]

@dferrarigrowtech Makes sense.

On a, maybe, related note. I need to support both the cm4 and cm5 so I've set "MACHINE = 'raspberrypi-armv8'"

When doing so, the cm5 hangs on boot, whereas the cm4 doesn't boot at all.

[dferrarigrowtech]

Almost there, at the moment most of the patches has been submitted upstream. If you are on the latest scarthgap commit (c153c694bd7a08de474470d7c1c7fd550117b162) and you want to boot a CM5 now the patch is much smaller:

diff --git a/conf/machine/raspberrypi5.conf b/conf/machine/raspberrypi5.conf
index f2f4087..1aac825 100644
--- a/conf/machine/raspberrypi5.conf
+++ b/conf/machine/raspberrypi5.conf
@@ -15,6 +15,10 @@ MACHINE_EXTRA_RRECOMMENDS += "\
 
 RPI_KERNEL_DEVICETREE = " \
     broadcom/bcm2712-rpi-5-b.dtb \
+    broadcom/bcm2712-rpi-cm5-cm5io.dtb \
+    broadcom/bcm2712-rpi-cm5-cm4io.dtb \
+    broadcom/bcm2712-rpi-cm5l-cm5io.dtb \
+    broadcom/bcm2712-rpi-cm5l-cm4io.dtb \
 "
 
 RPI_KERNEL_DEVICETREE_OVERLAYS:append = " overlays/bcm2712d0.dtbo"

[kraj]

@dferrarigrowtech is this delta proposed in some PR ? if not please create one.

[dferrarigrowtech]

Done: #1439