arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399-roc-pc boards.
Subsystems (2)
PATCH 1/1 arm64: dts: rockchip: Assign a fixed index to mmc devices on rk3399-roc-pc boards.
Recently introduced async probe on mmc devices can shuffle block IDs. Pin them to fixed values to ease booting in evironments where UUIDs are not practical. Use newly introduced aliases for mmcblk devices from [1].
[1]
https://patchwork.kernel.org/patch/11747669/
--- arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 5 +++++ 1 file changed, 5 insertions(+)
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +5 -0
@@ -13,6 +13,11 @@ / { model = "Firefly ROC-RK3399-PC Board"; compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399"; + aliases { + mmc0 = &sdmmc; + mmc1 = &sdhci; + }; + chosen { stdout-path = "serial2:1500000n8"; };
Signature · 7 lines
2.28.0 _______________________________________________ Linux-rockchip mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-rockchip
Heiko Stübner
maintainerHi Markus,
Am Mittwoch, 4. November 2020, 10:49:45 CET schrieb Markus Reichl:
Quoted 17 lines
Recently introduced async probe on mmc devices can shuffle block IDs. Pin them to fixed values to ease booting in evironments where UUIDs are not practical. Use newly introduced aliases for mmcblk devices from [1].
[1]
https://patchwork.kernel.org/patch/11747669/Signed-off-by Markus Reichl <[email protected]>--- arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 5 +++++ 1 file changed, 5 insertions(+)arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +0
-0
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi / { · line 20
Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +5
-0@@ -13,6 +13,11 @@ / { model = "Firefly ROC-RK3399-PC Board"; compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399"; + aliases { + mmc0 = &sdmmc; + mmc1 = &sdhci; + }; +
Any reason for this odering?
I.e. some previous incarnations had it ordered as (emmc, mmc, sdio). This is also true for the ChromeOS out-of-tree usage of those, the rk3399 dts in the chromeos-4.4 tree also orders this as sdhci, sdmmc, sdio.
And I guess a further question would be when we're doing arbitary orderings anyway, why is this not in rk3399.dtsi ;-) ?
Heiko
Hi Heiko,
Am 04.11.20 um 11:51 schrieb Heiko Stübner:
Quoted 23 lines
Hi Markus,
Am Mittwoch, 4. November 2020, 10:49:45 CET schrieb Markus Reichl:
Quoted 20 lines
Recently introduced async probe on mmc devices can shuffle block IDs. Pin them to fixed values to ease booting in evironments where UUIDs are not practical. Use newly introduced aliases for mmcblk devices from [1].
[1]
https://patchwork.kernel.org/patch/11747669/Signed-off-by Markus Reichl <[email protected]>--- arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 5 +++++ 1 file changed, 5 insertions(+)arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +0
-0@@ -13,6 +13,11 @@ / { model = "Firefly ROC-RK3399-PC Board"; compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399";
Quoted 7 lines
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi / { · line 20
Quoted 5 lines
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +5
-0+ aliases { + mmc0 = &sdmmc; + mmc1 = &sdhci; + }; +Any reason for this odering?
Without pinning roc-pc mostly booted as
mmcblk0 = sdmmc = µSD
mmcblk1 = sdhci = eMMC
so I kept this behaviour in aliases
roc-pc-mezzanine with populated SDIO-M2-slot booted mmc0 = sdio = (no mmcblk)
mmcblk1 = sdmmc = µSD
mmcblk2 = sdhci = eMMC
With my aliases both boards behave the same now and the optional SDIO slot goes out of the way to mmc2.
Quoted 4 lines
I.e. some previous incarnations had it ordered as (emmc, mmc, sdio). This is also true for the ChromeOS out-of-tree usage of those, the rk3399 dts in the chromeos-4.4 tree also orders this as sdhci, sdmmc, sdio.
The boards from my zoo (exynos, rk3399) mostly come up with SD-card as mmc0 and eMMC as mmc1 in mainline as opposed in some vendor kernels. but I have no objection to set it the other way round if this is more common with rk3399 boards.
Quoted 3 lines
And I guess a further question would be when we're doing arbitary orderings anyway, why is this not in
rk3399.dtsi;-) ?
I restricted the ordering to the boards I have, not to confuse other established use cases, but if a standard ordering is desired this can go to rk3399.dtsi.
Quoted 5 lines
Heiko
Gruß,
Signature · 1 line
Markus Reichl
Quoted 39 lines · Markus Reichl
Hi Heiko,
Am 04.11.20 um 11:51 schrieb Heiko Stübner:
Quoted 23 lines
Hi Markus,
Am Mittwoch, 4. November 2020, 10:49:45 CET schrieb Markus Reichl:
Quoted 20 lines
Recently introduced async probe on mmc devices can shuffle block IDs. Pin them to fixed values to ease booting in evironments where UUIDs are not practical. Use newly introduced aliases for mmcblk devices from [1].
[1]
https://patchwork.kernel.org/patch/11747669/Signed-off-by Markus Reichl <[email protected]>---
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 5 +++++1 file changed, 5 insertions(+)arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +0
-0@@ -13,6 +13,11 @@ / { model = "Firefly ROC-RK3399-PC Board"; compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399";Quoted 7 lines
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi / { · line 20
Quoted 5 lines
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +5
-0+ aliases { + mmc0 = &sdmmc; + mmc1 = &sdhci; + }; +Any reason for this odering?
Without pinning roc-pc mostly booted as
mmcblk0 = sdmmc = µSD
mmcblk1 = sdhci = eMMC
so I kept this behaviour in aliases
Quoted 4 lines
roc-pc-mezzanine with populated SDIO-M2-slot booted mmc0 = sdio = (no mmcblk)
mmcblk1 = sdmmc = µSD
mmcblk2 = sdhci = eMMC
FWIW that's also how my NanoPC-T4 behaves. Given that it's the order they appear in the DT, not too surprising ;)
Robin.
Quoted 27 lines
With my aliases both boards behave the same now and the optional SDIO slot goes out of the way to mmc2.
Quoted 4 lines
I.e. some previous incarnations had it ordered as (emmc, mmc, sdio). This is also true for the ChromeOS out-of-tree usage of those, the rk3399 dts in the chromeos-4.4 tree also orders this as sdhci, sdmmc, sdio.
The boards from my zoo (exynos, rk3399) mostly come up with SD-card as mmc0 and eMMC as mmc1 in mainline as opposed in some vendor kernels. but I have no objection to set it the other way round if this is more common with rk3399 boards.
Quoted 3 lines
And I guess a further question would be when we're doing arbitary orderings anyway, why is this not in
rk3399.dtsi;-) ?I restricted the ordering to the boards I have, not to confuse other established use cases, but if a standard ordering is desired this can go to
rk3399.dtsi.Quoted 5 lines
Heiko
Gruß,
Hi,
Quoted 32 lines · Heiko Stübner
Hi Markus,
Am Mittwoch, 4. November 2020, 10:49:45 CET schrieb Markus Reichl:
Quoted 17 lines
Recently introduced async probe on mmc devices can shuffle block IDs. Pin them to fixed values to ease booting in evironments where UUIDs are not practical. Use newly introduced aliases for mmcblk devices from [1].
[1]
https://patchwork.kernel.org/patch/11747669/Signed-off-by Markus Reichl <[email protected]>--- arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 5 +++++ 1 file changed, 5 insertions(+)arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +0
-0arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi / { · line 20
Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +5
-0@@ -13,6 +13,11 @@ / { model = "Firefly ROC-RK3399-PC Board"; compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399"; + aliases { + mmc0 = &sdmmc; + mmc1 = &sdhci; + }; +Any reason for this odering?
Quoted 6 lines
I.e. some previous incarnations had it ordered as (emmc, mmc, sdio). This is also true for the ChromeOS out-of-tree usage of those, the rk3399 dts in the chromeos-4.4 tree also orders this as sdhci, sdmmc, sdio.
And I guess a further question would be when we're doing arbitary orderings anyway, why is this not in
rk3399.dtsi;-) ?
Though I personally like the idea of eMMC, which is typically built-in, as being the "0" number, I'm personally happy with any numbering scheme that's consistent. Ordering them by base address is OK w/ me and seems less controversial. That seems like it could go in rk3399.dtsi and then if a particular board wanted a different order they could override it in their board file. The downside of putting in rk3399 is that boards that don't have all SD/MMC interfaces enabled would definitely get a new number compared to old kernels, but hopefully this is the last time?
-Doug
Heiko Stübner
maintainerAm Mittwoch, 4. November 2020, 16:42:01 CET schrieb Doug Anderson:
Quoted 42 lines
Hi,
Quoted 32 lines · Heiko Stübner
Hi Markus,
Am Mittwoch, 4. November 2020, 10:49:45 CET schrieb Markus Reichl:
Quoted 17 lines
Recently introduced async probe on mmc devices can shuffle block IDs. Pin them to fixed values to ease booting in evironments where UUIDs are not practical. Use newly introduced aliases for mmcblk devices from [1].
[1]
https://patchwork.kernel.org/patch/11747669/Signed-off-by Markus Reichl <[email protected]>--- arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 5 +++++ 1 file changed, 5 insertions(+)arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +0
-0arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi / { · line 20
Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +5
-0@@ -13,6 +13,11 @@ / { model = "Firefly ROC-RK3399-PC Board"; compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399"; + aliases { + mmc0 = &sdmmc; + mmc1 = &sdhci; + }; +Any reason for this odering?
Quoted 6 lines
I.e. some previous incarnations had it ordered as (emmc, mmc, sdio). This is also true for the ChromeOS out-of-tree usage of those, the rk3399 dts in the chromeos-4.4 tree also orders this as sdhci, sdmmc, sdio.
And I guess a further question would be when we're doing arbitary orderings anyway, why is this not in
rk3399.dtsi;-) ?
Quoted 6 lines
Though I personally like the idea of eMMC, which is typically built-in, as being the "0" number, I'm personally happy with any numbering scheme that's consistent. Ordering them by base address is OK w/ me and seems less controversial. That seems like it could go in
rk3399.dtsiand then if a particular board wanted a different order they could override it in their board file.
Yep that sounds sensible and ordering by base address at least is one "simple" type of order without too much explanation needed.
So I guess we'd get a sdio + sdmmc + sdhci ordering
@Markus: if nobody else complains, can you do a "simple" rk3399.dtsi change with that please?
Quoted 4 lines
The downside of putting
in rk3399 is that boards that don't have all SD/MMC interfaces enabled would definitely get a new number compared to old kernels, but hopefully this is the last time?
With that new asynchronous mmc-probe-thingy in 5.10 that "caused" this, it sounds like everything gets a new number anyway ;-) .
Heiko
Quoted 51 lines · Heiko Stübner
Am Mittwoch, 4. November 2020, 16:42:01 CET schrieb Doug Anderson:
Quoted 42 lines
Hi,
Quoted 32 lines · Heiko Stübner
Hi Markus,
Am Mittwoch, 4. November 2020, 10:49:45 CET schrieb Markus Reichl:
Quoted 17 lines
Recently introduced async probe on mmc devices can shuffle block IDs. Pin them to fixed values to ease booting in evironments where UUIDs are not practical. Use newly introduced aliases for mmcblk devices from [1].
[1]
https://patchwork.kernel.org/patch/11747669/Signed-off-by Markus Reichl <[email protected]>--- arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 5 +++++ 1 file changed, 5 insertions(+)arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +0
-0arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi / { · line 20
Quoted 8 lines
arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi +5
-0@@ -13,6 +13,11 @@ / { model = "Firefly ROC-RK3399-PC Board"; compatible = "firefly,roc-rk3399-pc", "rockchip,rk3399"; + aliases { + mmc0 = &sdmmc; + mmc1 = &sdhci; + }; +Any reason for this odering?
Quoted 6 lines
I.e. some previous incarnations had it ordered as (emmc, mmc, sdio). This is also true for the ChromeOS out-of-tree usage of those, the rk3399 dts in the chromeos-4.4 tree also orders this as sdhci, sdmmc, sdio.
And I guess a further question would be when we're doing arbitary orderings anyway, why is this not in
rk3399.dtsi;-) ?Quoted 6 lines
Though I personally like the idea of eMMC, which is typically built-in, as being the "0" number, I'm personally happy with any numbering scheme that's consistent. Ordering them by base address is OK w/ me and seems less controversial. That seems like it could go in
rk3399.dtsiand then if a particular board wanted a different order they could override it in their board file.
Quoted 8 lines
Yep that sounds sensible and ordering by base address at least is one "simple" type of order without too much explanation needed.
So I guess we'd get a sdio + sdmmc + sdhci ordering
@Markus: if nobody else complains, can you do a "simple"
rk3399.dtsichange with that please?
Please also fix the LED triggers. :)
Quoted 7 lines
Quoted 4 lines
The downside of putting
in rk3399 is that boards that don't have all SD/MMC interfaces enabled would definitely get a new number compared to old kernels, but hopefully this is the last time?With that new asynchronous mmc-probe-thingy in 5.10 that "caused" this, it sounds like everything gets a new number anyway ;-) .
Yup.