[PATCH] rockchip: rk3399: boot_devices: fix eMMC node name
From: Quentin Schulz quentin.schulz@theobroma-systems.com
When idbloader.img is flashed on the eMMC, the SPL still tries to load from SPI-NOR first.
This is due to an incorrect look-up in the Device Tree. Since commit 822556a93459 ("arm: dts: sync the Rockhip 3399 SoCs from Linux"), the node name (but not label) changed from sdhci@fe330000 to mmc@fe330000 meaning U-Boot SPL is not looking for the correct node name anymore and fails to find the "same-as-spl" node when eMMC is the medium from which the SPL booted.
Fixes: 822556a93459 ("arm: dts: sync the Rockhip 3399 SoCs from Linux") Cc: Quentin Schulz foss+uboot@0leil.net Signed-off-by: Quentin Schulz quentin.schulz@theobroma-systems.com ---
Sorry for resend, was not yet subscribed.
arch/arm/mach-rockchip/rk3399/rk3399.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index 01a05599cd..de11a3fa30 100644 --- a/arch/arm/mach-rockchip/rk3399/rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c @@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; #define GRF_BASE 0xff770000
const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = { - [BROM_BOOTSOURCE_EMMC] = "/sdhci@fe330000", + [BROM_BOOTSOURCE_EMMC] = "/mmc@fe330000", [BROM_BOOTSOURCE_SPINOR] = "/spi@ff1d0000/flash@0", [BROM_BOOTSOURCE_SD] = "/mmc@fe320000", }; @@ -181,7 +181,7 @@ const char *spl_decode_boot_device(u32 boot_device) const char *ofpath; } spl_boot_devices_tbl[] = { { BOOT_DEVICE_MMC1, "/mmc@fe320000" }, - { BOOT_DEVICE_MMC2, "/sdhci@fe330000" }, + { BOOT_DEVICE_MMC2, "/mmc@fe330000" }, { BOOT_DEVICE_SPI, "/spi@ff1d0000" }, };
El Mon, Jul 11, 2022 at 04:15:33PM +0200, Quentin Schulz deia:
From: Quentin Schulz quentin.schulz@theobroma-systems.com
When idbloader.img is flashed on the eMMC, the SPL still tries to load from SPI-NOR first.
This is due to an incorrect look-up in the Device Tree. Since commit 822556a93459 ("arm: dts: sync the Rockhip 3399 SoCs from Linux"), the node name (but not label) changed from sdhci@fe330000 to mmc@fe330000 meaning U-Boot SPL is not looking for the correct node name anymore and fails to find the "same-as-spl" node when eMMC is the medium from which the SPL booted.
Yes, I also saw that. I changed and tested it at some time, but since there were other changes, I hesitate to send a Tested by for your patch. FWIW:
Reviewed-by: Xavier Drudis Ferran xdrudis@tinet.cat
Fixes: 822556a93459 ("arm: dts: sync the Rockhip 3399 SoCs from Linux") Cc: Quentin Schulz foss+uboot@0leil.net Signed-off-by: Quentin Schulz quentin.schulz@theobroma-systems.com
Sorry for resend, was not yet subscribed.
arch/arm/mach-rockchip/rk3399/rk3399.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index 01a05599cd..de11a3fa30 100644 --- a/arch/arm/mach-rockchip/rk3399/rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c @@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; #define GRF_BASE 0xff770000
const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
- [BROM_BOOTSOURCE_EMMC] = "/sdhci@fe330000",
- [BROM_BOOTSOURCE_EMMC] = "/mmc@fe330000", [BROM_BOOTSOURCE_SPINOR] = "/spi@ff1d0000/flash@0", [BROM_BOOTSOURCE_SD] = "/mmc@fe320000",
}; @@ -181,7 +181,7 @@ const char *spl_decode_boot_device(u32 boot_device) const char *ofpath; } spl_boot_devices_tbl[] = { { BOOT_DEVICE_MMC1, "/mmc@fe320000" },
{ BOOT_DEVICE_MMC2, "/sdhci@fe330000" },
{ BOOT_DEVICE_MMC2, "/mmc@fe330000" },
Not related to this patch, but I also changed "/spi@ff1d0000" -> "/spi@ff1d0000/flash@0". Not sure whether it needs to be different in both arrays in some case for some reason.
};
-- 2.36.1
Yes ! need to apply this patch
dts was changed
grep @fe330000 arch/arm/dts/*.dtsi arch/arm/dts/rk3399.dtsi: sdhci: mmc@fe330000 {
same need to change boot_devices in rk3399.c to /mmc@fe320000
Reviewed-by: Artem Lapkin email2tema@gmail.com Tested-by: Artem Lapkin email2tema@gmail.com
On Tue, Jul 12, 2022 at 2:22 AM Xavier Drudis Ferran xdrudis@tinet.cat wrote:
El Mon, Jul 11, 2022 at 04:15:33PM +0200, Quentin Schulz deia:
From: Quentin Schulz quentin.schulz@theobroma-systems.com
When idbloader.img is flashed on the eMMC, the SPL still tries to load from SPI-NOR first.
This is due to an incorrect look-up in the Device Tree. Since commit 822556a93459 ("arm: dts: sync the Rockhip 3399 SoCs from Linux"), the node name (but not label) changed from sdhci@fe330000 to mmc@fe330000 meaning U-Boot SPL is not looking for the correct node name anymore and fails to find the "same-as-spl" node when eMMC is the medium from which the SPL booted.
Yes, I also saw that. I changed and tested it at some time, but since there were other changes, I hesitate to send a Tested by for your patch. FWIW:
Reviewed-by: Xavier Drudis Ferran xdrudis@tinet.cat
Fixes: 822556a93459 ("arm: dts: sync the Rockhip 3399 SoCs from Linux") Cc: Quentin Schulz foss+uboot@0leil.net Signed-off-by: Quentin Schulz quentin.schulz@theobroma-systems.com
Sorry for resend, was not yet subscribed.
arch/arm/mach-rockchip/rk3399/rk3399.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index 01a05599cd..de11a3fa30 100644 --- a/arch/arm/mach-rockchip/rk3399/rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c @@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; #define GRF_BASE 0xff770000
const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
[BROM_BOOTSOURCE_EMMC] = "/sdhci@fe330000",
[BROM_BOOTSOURCE_EMMC] = "/mmc@fe330000", [BROM_BOOTSOURCE_SPINOR] = "/spi@ff1d0000/flash@0", [BROM_BOOTSOURCE_SD] = "/mmc@fe320000",}; @@ -181,7 +181,7 @@ const char *spl_decode_boot_device(u32 boot_device) const char *ofpath; } spl_boot_devices_tbl[] = { { BOOT_DEVICE_MMC1, "/mmc@fe320000" },
{ BOOT_DEVICE_MMC2, "/sdhci@fe330000" },
{ BOOT_DEVICE_MMC2, "/mmc@fe330000" }, { BOOT_DEVICE_SPI, "/spi@ff1d0000" },Not related to this patch, but I also changed "/spi@ff1d0000" -> "/spi@ff1d0000/flash@0". Not sure whether it needs to be different in both arrays in some case for some reason.
};-- 2.36.1
Hi Artem,
On 7/12/22 05:01, Art Nikpal wrote:
Yes ! need to apply this patch
dts was changed
grep @fe330000 arch/arm/dts/*.dtsi arch/arm/dts/rk3399.dtsi: sdhci: mmc@fe330000 {
same need to change boot_devices in rk3399.c to /mmc@fe320000
Already changed in commit 97de3935aabfe8632e6c737a9ecadabead802f04 ("rockchip: Fix spl mmc boot device ofpath") :)
Cheers, Quentin
Hi Xavier,
On 7/11/22 20:22, Xavier Drudis Ferran wrote:
El Mon, Jul 11, 2022 at 04:15:33PM +0200, Quentin Schulz deia:
From: Quentin Schulz quentin.schulz@theobroma-systems.com
When idbloader.img is flashed on the eMMC, the SPL still tries to load from SPI-NOR first.
This is due to an incorrect look-up in the Device Tree. Since commit 822556a93459 ("arm: dts: sync the Rockhip 3399 SoCs from Linux"), the node name (but not label) changed from sdhci@fe330000 to mmc@fe330000 meaning U-Boot SPL is not looking for the correct node name anymore and fails to find the "same-as-spl" node when eMMC is the medium from which the SPL booted.
Yes, I also saw that. I changed and tested it at some time, but since there were other changes, I hesitate to send a Tested by for your patch. FWIW:
Reviewed-by: Xavier Drudis Ferran xdrudis@tinet.cat
Fixes: 822556a93459 ("arm: dts: sync the Rockhip 3399 SoCs from Linux") Cc: Quentin Schulz foss+uboot@0leil.net Signed-off-by: Quentin Schulz quentin.schulz@theobroma-systems.com
Sorry for resend, was not yet subscribed.
arch/arm/mach-rockchip/rk3399/rk3399.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index 01a05599cd..de11a3fa30 100644 --- a/arch/arm/mach-rockchip/rk3399/rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c @@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; #define GRF_BASE 0xff770000
const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
- [BROM_BOOTSOURCE_EMMC] = "/sdhci@fe330000",
- [BROM_BOOTSOURCE_EMMC] = "/mmc@fe330000", [BROM_BOOTSOURCE_SPINOR] = "/spi@ff1d0000/flash@0", [BROM_BOOTSOURCE_SD] = "/mmc@fe320000", };
@@ -181,7 +181,7 @@ const char *spl_decode_boot_device(u32 boot_device) const char *ofpath; } spl_boot_devices_tbl[] = { { BOOT_DEVICE_MMC1, "/mmc@fe320000" },
{ BOOT_DEVICE_MMC2, "/sdhci@fe330000" },
{ BOOT_DEVICE_MMC2, "/mmc@fe330000" },Not related to this patch, but I also changed "/spi@ff1d0000" -> "/spi@ff1d0000/flash@0". Not sure whether it needs to be different in both arrays in some case for some reason.
Will look into that because I don't think I had an issue with this one. Thanks for the heads up. Will make a separate commit of there's something to fix.
Cheers, Quentin
On 7/11/22 20:22, Xavier Drudis Ferran wrote:
El Mon, Jul 11, 2022 at 04:15:33PM +0200, Quentin Schulz deia:
From: Quentin Schulz quentin.schulz@theobroma-systems.com
When idbloader.img is flashed on the eMMC, the SPL still tries to load from SPI-NOR first.
This is due to an incorrect look-up in the Device Tree. Since commit 822556a93459 ("arm: dts: sync the Rockhip 3399 SoCs from Linux"), the node name (but not label) changed from sdhci@fe330000 to mmc@fe330000 meaning U-Boot SPL is not looking for the correct node name anymore and fails to find the "same-as-spl" node when eMMC is the medium from which the SPL booted.
Yes, I also saw that. I changed and tested it at some time, but since there were other changes, I hesitate to send a Tested by for your patch. FWIW:
Reviewed-by: Xavier Drudis Ferran xdrudis@tinet.cat
Fixes: 822556a93459 ("arm: dts: sync the Rockhip 3399 SoCs from Linux") Cc: Quentin Schulz foss+uboot@0leil.net Signed-off-by: Quentin Schulz quentin.schulz@theobroma-systems.com
Sorry for resend, was not yet subscribed.
arch/arm/mach-rockchip/rk3399/rk3399.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index 01a05599cd..de11a3fa30 100644 --- a/arch/arm/mach-rockchip/rk3399/rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c @@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; #define GRF_BASE 0xff770000
const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
- [BROM_BOOTSOURCE_EMMC] = "/sdhci@fe330000",
- [BROM_BOOTSOURCE_EMMC] = "/mmc@fe330000", [BROM_BOOTSOURCE_SPINOR] = "/spi@ff1d0000/flash@0", [BROM_BOOTSOURCE_SD] = "/mmc@fe320000", };
@@ -181,7 +181,7 @@ const char *spl_decode_boot_device(u32 boot_device) const char *ofpath; } spl_boot_devices_tbl[] = { { BOOT_DEVICE_MMC1, "/mmc@fe320000" },
{ BOOT_DEVICE_MMC2, "/sdhci@fe330000" },
{ BOOT_DEVICE_MMC2, "/mmc@fe330000" },Not related to this patch, but I also changed "/spi@ff1d0000" -> "/spi@ff1d0000/flash@0". Not sure whether it needs to be different in both arrays in some case for some reason.
Thanks for the heads up, it seems that our board was the only (upstream) one impacted by this oversight because it's the only one reading u-boot,spl-boot-device DT property that is set using this table.
See patch here: https://lore.kernel.org/u-boot/20220715151552.953654-2-foss+uboot@0leil.net/
You can add your Suggested-by: I forgot to add it before sending.
Thanks! Quentin
On Mon, Jul 18, 2022 at 5:19 PM Quentin Schulz quentin.schulz@theobroma-systems.com wrote:
On 7/11/22 20:22, Xavier Drudis Ferran wrote:
El Mon, Jul 11, 2022 at 04:15:33PM +0200, Quentin Schulz deia:
From: Quentin Schulz quentin.schulz@theobroma-systems.com
When idbloader.img is flashed on the eMMC, the SPL still tries to load from SPI-NOR first.
This is due to an incorrect look-up in the Device Tree. Since commit 822556a93459 ("arm: dts: sync the Rockhip 3399 SoCs from Linux"), the node name (but not label) changed from sdhci@fe330000 to mmc@fe330000 meaning U-Boot SPL is not looking for the correct node name anymore and fails to find the "same-as-spl" node when eMMC is the medium from which the SPL booted.
Yes, I also saw that. I changed and tested it at some time, but since there were other changes, I hesitate to send a Tested by for your patch. FWIW:
Reviewed-by: Xavier Drudis Ferran xdrudis@tinet.cat
Fixes: 822556a93459 ("arm: dts: sync the Rockhip 3399 SoCs from Linux") Cc: Quentin Schulz foss+uboot@0leil.net Signed-off-by: Quentin Schulz quentin.schulz@theobroma-systems.com
Sorry for resend, was not yet subscribed.
arch/arm/mach-rockchip/rk3399/rk3399.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index 01a05599cd..de11a3fa30 100644 --- a/arch/arm/mach-rockchip/rk3399/rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c @@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; #define GRF_BASE 0xff770000
const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
- [BROM_BOOTSOURCE_EMMC] = "/sdhci@fe330000",
- [BROM_BOOTSOURCE_EMMC] = "/mmc@fe330000", [BROM_BOOTSOURCE_SPINOR] = "/spi@ff1d0000/flash@0", [BROM_BOOTSOURCE_SD] = "/mmc@fe320000", };
@@ -181,7 +181,7 @@ const char *spl_decode_boot_device(u32 boot_device) const char *ofpath; } spl_boot_devices_tbl[] = { { BOOT_DEVICE_MMC1, "/mmc@fe320000" },
{ BOOT_DEVICE_MMC2, "/sdhci@fe330000" },
{ BOOT_DEVICE_MMC2, "/mmc@fe330000" }, { BOOT_DEVICE_SPI, "/spi@ff1d0000" },Not related to this patch, but I also changed "/spi@ff1d0000" -> "/spi@ff1d0000/flash@0". Not sure whether it needs to be different in both arrays in some case for some reason.
please apply this Tested-by: Lapkin Artem email2tema@gmail.com
Thanks for the heads up, it seems that our board was the only (upstream) one impacted by this oversight because it's the only one reading u-boot,spl-boot-device DT property that is set using this table.
See patch here: https://lore.kernel.org/u-boot/20220715151552.953654-2-foss+uboot@0leil.net/
You can add your Suggested-by: I forgot to add it before sending.
please apply this too, i have send same patch for right spi flash node name before
Suggested-by: Lapkin Artem email2tema@gmail.com Tested-by: Lapkin Artem email2tema@gmail.com
Thanks! Quentin
Hi all,
Gentle ping.
Cheers, Quentin
On 7/29/22 02:32, Art Nikpal wrote:
On Mon, Jul 18, 2022 at 5:19 PM Quentin Schulz quentin.schulz@theobroma-systems.com wrote:
On 7/11/22 20:22, Xavier Drudis Ferran wrote:
El Mon, Jul 11, 2022 at 04:15:33PM +0200, Quentin Schulz deia:
From: Quentin Schulz quentin.schulz@theobroma-systems.com
When idbloader.img is flashed on the eMMC, the SPL still tries to load from SPI-NOR first.
This is due to an incorrect look-up in the Device Tree. Since commit 822556a93459 ("arm: dts: sync the Rockhip 3399 SoCs from Linux"), the node name (but not label) changed from sdhci@fe330000 to mmc@fe330000 meaning U-Boot SPL is not looking for the correct node name anymore and fails to find the "same-as-spl" node when eMMC is the medium from which the SPL booted.
Yes, I also saw that. I changed and tested it at some time, but since there were other changes, I hesitate to send a Tested by for your patch. FWIW:
Reviewed-by: Xavier Drudis Ferran xdrudis@tinet.cat
Fixes: 822556a93459 ("arm: dts: sync the Rockhip 3399 SoCs from Linux") Cc: Quentin Schulz foss+uboot@0leil.net Signed-off-by: Quentin Schulz quentin.schulz@theobroma-systems.com
Sorry for resend, was not yet subscribed.
arch/arm/mach-rockchip/rk3399/rk3399.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index 01a05599cd..de11a3fa30 100644 --- a/arch/arm/mach-rockchip/rk3399/rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c @@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; #define GRF_BASE 0xff770000
const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
- [BROM_BOOTSOURCE_EMMC] = "/sdhci@fe330000",
- [BROM_BOOTSOURCE_EMMC] = "/mmc@fe330000", [BROM_BOOTSOURCE_SPINOR] = "/spi@ff1d0000/flash@0", [BROM_BOOTSOURCE_SD] = "/mmc@fe320000", };
@@ -181,7 +181,7 @@ const char *spl_decode_boot_device(u32 boot_device) const char *ofpath; } spl_boot_devices_tbl[] = { { BOOT_DEVICE_MMC1, "/mmc@fe320000" },
{ BOOT_DEVICE_MMC2, "/sdhci@fe330000" },
{ BOOT_DEVICE_MMC2, "/mmc@fe330000" }, { BOOT_DEVICE_SPI, "/spi@ff1d0000" },Not related to this patch, but I also changed "/spi@ff1d0000" -> "/spi@ff1d0000/flash@0". Not sure whether it needs to be different in both arrays in some case for some reason.
please apply this Tested-by: Lapkin Artem email2tema@gmail.com
Thanks for the heads up, it seems that our board was the only (upstream) one impacted by this oversight because it's the only one reading u-boot,spl-boot-device DT property that is set using this table.
See patch here: https://urldefense.proofpoint.com/v2/url?u=https-3A__lore.kernel.org_u-2Dboo...
You can add your Suggested-by: I forgot to add it before sending.
please apply this too, i have send same patch for right spi flash node name before
Suggested-by: Lapkin Artem email2tema@gmail.com Tested-by: Lapkin Artem email2tema@gmail.com
Thanks! Quentin
On 2022/7/11 22:15, Quentin Schulz wrote:
From: Quentin Schulz quentin.schulz@theobroma-systems.com
When idbloader.img is flashed on the eMMC, the SPL still tries to load from SPI-NOR first.
This is due to an incorrect look-up in the Device Tree. Since commit 822556a93459 ("arm: dts: sync the Rockhip 3399 SoCs from Linux"), the node name (but not label) changed from sdhci@fe330000 to mmc@fe330000 meaning U-Boot SPL is not looking for the correct node name anymore and fails to find the "same-as-spl" node when eMMC is the medium from which the SPL booted.
Fixes: 822556a93459 ("arm: dts: sync the Rockhip 3399 SoCs from Linux") Cc: Quentin Schulz foss+uboot@0leil.net Signed-off-by: Quentin Schulz quentin.schulz@theobroma-systems.com
Reviewed-by: Kever Yang kever.yang@rock-chips.com
Thanks, - Kever
Sorry for resend, was not yet subscribed.
arch/arm/mach-rockchip/rk3399/rk3399.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-rockchip/rk3399/rk3399.c b/arch/arm/mach-rockchip/rk3399/rk3399.c index 01a05599cd..de11a3fa30 100644 --- a/arch/arm/mach-rockchip/rk3399/rk3399.c +++ b/arch/arm/mach-rockchip/rk3399/rk3399.c @@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; #define GRF_BASE 0xff770000
const char * const boot_devices[BROM_LAST_BOOTSOURCE + 1] = {
- [BROM_BOOTSOURCE_EMMC] = "/sdhci@fe330000",
- [BROM_BOOTSOURCE_EMMC] = "/mmc@fe330000", [BROM_BOOTSOURCE_SPINOR] = "/spi@ff1d0000/flash@0", [BROM_BOOTSOURCE_SD] = "/mmc@fe320000", };
@@ -181,7 +181,7 @@ const char *spl_decode_boot_device(u32 boot_device) const char *ofpath; } spl_boot_devices_tbl[] = { { BOOT_DEVICE_MMC1, "/mmc@fe320000" },
{ BOOT_DEVICE_MMC2, "/sdhci@fe330000" },
{ BOOT_DEVICE_MMC2, "/mmc@fe330000" },
participants (5)
-
Art Nikpal -
Kever Yang -
Quentin Schulz -
Quentin Schulz -
Xavier Drudis Ferran