Skip to contentSkip to conversation

ARM: dts: rockchip: assign a fixed index to mmc devices on rk322x boards

PATCH Applied Johan Jonker 3 participants 11 messages Jan 18, 2021 – Feb 10, 2021

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/5 ARM: dts: rockchip: assign a fixed index to mmc devices on rk322x boards

Recently introduced async probe on mmc devices can shuffle block IDs. Pin them to fixed values to ease booting in environments where UUIDs are not practical. Use newly introduced aliases for mmcblk devices from [1]. The sort order is based on reg address.

[1] https://patchwork.kernel.org/patch/11747669/

---
 arch/arm/boot/dts/rk322x.dtsi | 3 +++
 1 file changed, 3 insertions(+)
arch/arm/boot/dts/rk322x.dtsi +3 -0
index 9910f9b5c..f10c4d2fa 100644
@@ -14,6 +14,9 @@
 	interrupt-parent = <&gic>;
 
 	aliases {
+		mmc0 = &sdmmc;
+		mmc1 = &sdio;
+		mmc2 = &emmc;
 		serial0 = &uart0;
 		serial1 = &uart1;
 		serial2 = &uart2;
Signature · 7 lines
2.11.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#1 lore raw

PATCH 2/5 ARM: dts: rockchip: assign a fixed index to mmc devices on rv1108 boards

Recently introduced async probe on mmc devices can shuffle block IDs. Pin them to fixed values to ease booting in environments where UUIDs are not practical. Use newly introduced aliases for mmcblk devices from [1]. The sort order is based on reg address.

[1] https://patchwork.kernel.org/patch/11747669/

---
 arch/arm/boot/dts/rv1108.dtsi | 3 +++
 1 file changed, 3 insertions(+)
arch/arm/boot/dts/rv1108.dtsi +3 -0
index bec47e0be..a754851f4 100644
@@ -19,6 +19,9 @@
 		i2c1 = &i2c1;
 		i2c2 = &i2c2;
 		i2c3 = &i2c3;
+		mmc0 = &emmc;
+		mmc1 = &sdio;
+		mmc2 = &sdmmc;
 		serial0 = &uart0;
 		serial1 = &uart1;
 		serial2 = &uart2;
Signature · 7 lines
2.11.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#2 lore raw

Re: [PATCH 2/5] ARM: dts: rockchip: assign a fixed index to mmc devices on rv1108 boards

Quoted 7 lines · Johan Jonker

Recently introduced async probe on mmc devices can shuffle block IDs. Pin them to fixed values to ease booting in environments where UUIDs are not practical. Use newly introduced aliases for mmcblk devices from [1]. The sort order is based on reg address.

[1] https://patchwork.kernel.org/patch/11747669/

I just saw this in the pull request:

Quoted 10 lines
---
 arch/arm/boot/dts/rv1108.dtsi | 3 +++
 1 file changed, 3 insertions(+)
arch/arm/boot/dts/rv1108.dtsi +0 -0
index bec47e0be..a754851f4 100644

arch/arm/boot/dts/rv1108.dtsi line 27

Quoted 9 lines
arch/arm/boot/dts/rv1108.dtsi +3 -0
@@ -19,6 +19,9 @@
                i2c1 = &i2c1;
                i2c2 = &i2c2;
                i2c3 = &i2c3;
+               mmc0 = &emmc;
+               mmc1 = &sdio;
+               mmc2 = &sdmmc;
                serial0 = &uart0;
                serial1 = &uart1;
                serial2 = &uart2;

Please don't put these aliases into a .dtsi file, as not every board will provide each instance. The entire point of the aliases is to have sane enumeration, so you should start at index 0 for the first one that is actually present and count up from there.

I would suggest you move these aliases into the .dts files for the existing boards for the next cycle, and then make sure only the ones that are present have an alias.

It might actually be a good idea to have a warning in dtc when there is an alias pointing to a status="disabled" device, but I suspect there would be a lot of fallout from that.

Arnd

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

maintainer
#3 lore raw

Re: [PATCH 2/5] ARM: dts: rockchip: assign a fixed index to mmc devices on rv1108 boards

Am Dienstag, 9. Februar 2021, 23:25:40 CET schrieb Arnd Bergmann:

Quoted 27 lines · Johan Jonker
Quoted 7 lines

Recently introduced async probe on mmc devices can shuffle block IDs. Pin them to fixed values to ease booting in environments where UUIDs are not practical. Use newly introduced aliases for mmcblk devices from [1]. The sort order is based on reg address.

[1] https://patchwork.kernel.org/patch/11747669/

I just saw this in the pull request:

Quoted 16 lines
---
 arch/arm/boot/dts/rv1108.dtsi | 3 +++
 1 file changed, 3 insertions(+)
arch/arm/boot/dts/rv1108.dtsi +3 -0
index bec47e0be..a754851f4 100644
@@ -19,6 +19,9 @@
                i2c1 = &i2c1;
                i2c2 = &i2c2;
                i2c3 = &i2c3;
+               mmc0 = &emmc;
+               mmc1 = &sdio;
+               mmc2 = &sdmmc;
Quoted 8 lines

arch/arm/boot/dts/rv1108.dtsi line 27

Quoted 3 lines
arch/arm/boot/dts/rv1108.dtsi +0 -0
                serial0 = &uart0;
                serial1 = &uart1;
                serial2 = &uart2;

Please don't put these aliases into a .dtsi file, as not every board will provide each instance. The entire point of the aliases is to have sane enumeration, so you should start at index 0 for the first one that is actually present and count up from there.

Hmm, right now I don't see the disadvantage of missing mmc numbers. As similarly we count i2c and serial numbers for a long time, even though not all of them appear on every board.

Especially as the main goal is to simply have stable numbers and not having the mmc devices swap numbers on every boot.

So right now we're not using them from a userspace POV but instead agreed on following the address ordering of the soc. so when ordering mmc controllers by their io-address, mmc0 is the first one, then mmc1, etc.

So just for my understanding, what is different for mmc? I guess to guarantee ongoing numbering similar to sd{a,b,c,...} Or should all aliases be duplicted in each board dts and not live in any soc dtsi?

Heiko

Quoted 10 lines

I would suggest you move these aliases into the .dts files for the existing boards for the next cycle, and then make sure only the ones that are present have an alias.

It might actually be a good idea to have a warning in dtc when there is an alias pointing to a status="disabled" device, but I suspect there would be a lot of fallout from that.

Arnd

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

#4 lore raw

Re: [PATCH 2/5] ARM: dts: rockchip: assign a fixed index to mmc devices on rv1108 boards

Quoted 3 lines · Heiko Stübner

Am Dienstag, 9. Februar 2021, 23:25:40 CET schrieb Arnd Bergmann:

Hmm, right now I don't see the disadvantage of missing mmc numbers.

It's inconsistent with the normal use of these aliases across other platforms.

Quoted 2 lines

As similarly we count i2c and serial numbers for a long time, even though not all of them appear on every board.

Yes, that is a similar mistake.

Quoted 8 lines

Especially as the main goal is to simply have stable numbers and not having the mmc devices swap numbers on every boot.

So right now we're not using them from a userspace POV but instead agreed on following the address ordering of the soc. so when ordering mmc controllers by their io-address, mmc0 is the first one, then mmc1, etc.

Quoted 4 lines

So just for my understanding, what is different for mmc? I guess to guarantee ongoing numbering similar to sd{a,b,c,...} Or should all aliases be duplicted in each board dts and not live in any soc dtsi?

Each board should have its own aliases node that describes exactly which of the devices are wired up on that board, and in which order. If there are connectors on the board that are labeled in some form, then the aliases are meant to match what is written on the board or in its documentation.

Arnd

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

maintainer
#5 lore raw

Re: [PATCH 2/5] ARM: dts: rockchip: assign a fixed index to mmc devices on rv1108 boards

Am Mittwoch, 10. Februar 2021, 11:34:41 CET schrieb Arnd Bergmann:

Quoted 26 lines · Heiko Stübner
Quoted 3 lines

Am Dienstag, 9. Februar 2021, 23:25:40 CET schrieb Arnd Bergmann:

Hmm, right now I don't see the disadvantage of missing mmc numbers.

It's inconsistent with the normal use of these aliases across other platforms.

Quoted 2 lines

As similarly we count i2c and serial numbers for a long time, even though not all of them appear on every board.

Yes, that is a similar mistake.

Quoted 8 lines

Especially as the main goal is to simply have stable numbers and not having the mmc devices swap numbers on every boot.

So right now we're not using them from a userspace POV but instead agreed on following the address ordering of the soc. so when ordering mmc controllers by their io-address, mmc0 is the first one, then mmc1, etc.

Quoted 4 lines

So just for my understanding, what is different for mmc? I guess to guarantee ongoing numbering similar to sd{a,b,c,...} Or should all aliases be duplicted in each board dts and not live in any soc dtsi?

Quoted 5 lines

Each board should have its own aliases node that describes exactly which of the devices are wired up on that board, and in which order. If there are connectors on the board that are labeled in some form, then the aliases are meant to match what is written on the board or in its documentation.

Then we're at least in the clear for i2c, serial and the rest ... as these are numbered in the soc documentation, and all boards I've seen so far use these number also to identify these in schematics.

So an i2c2 is always i2c2 even if i2c1 is not populated.

And of course doing

	i2c0 = &i2c2

would definitly confuse people to no end.

So I guess we'll just move the mmc stuff over to board files.

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

#6 lore raw

Re: [PATCH 2/5] ARM: dts: rockchip: assign a fixed index to mmc devices on rv1108 boards

Quoted 9 lines · Heiko Stübner

Am Mittwoch, 10. Februar 2021, 11:34:41 CET schrieb Arnd Bergmann:

Quoted 7 lines · Heiko Stübner
Quoted 1 line

Am Dienstag, 9. Februar 2021, 23:25:40 CET schrieb Arnd Bergmann:

Each board should have its own aliases node that describes exactly which of the devices are wired up on that board, and in which order. If there are connectors on the board that are labeled in some form, then the aliases are meant to match what is written on the board or in its documentation.

Quoted 3 lines

Then we're at least in the clear for i2c, serial and the rest ... as these are numbered in the soc documentation, and all boards I've seen so far use these number also to identify these in schematics.

Ok, that is helpful. It would still be good to ensure that only aliases exist for nodes that are actually enabled.

Quoted 5 lines

So an i2c2 is always i2c2 even if i2c1 is not populated.

And of course doing

        i2c0 = &i2c2

would definitly confuse people to no end.

I think that's just an unfortunate choice of the labels here, it's sometimes easier to just refer to the node by the full path instead of the label.

Arnd

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip

#7 lore raw

PATCH 3/5 arm64: dts: rockchip: assign a fixed index to mmc devices on px30 boards

In reply to Johan Jonker

Recently introduced async probe on mmc devices can shuffle block IDs. Pin them to fixed values to ease booting in environments where UUIDs are not practical. Use newly introduced aliases for mmcblk devices from [1]. The sort order is based on reg address.

[1] https://patchwork.kernel.org/patch/11747669/

---
 arch/arm64/boot/dts/rockchip/px30.dtsi | 3 +++
 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/rockchip/px30.dtsi +3 -0
index 1a73a5114..c49366cf4 100644
@@ -25,6 +25,9 @@
 		i2c1 = &i2c1;
 		i2c2 = &i2c2;
 		i2c3 = &i2c3;
+		mmc0 = &sdmmc;
+		mmc1 = &sdio;
+		mmc2 = &emmc;
 		serial0 = &uart0;
 		serial1 = &uart1;
 		serial2 = &uart2;
Signature · 7 lines
2.11.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#8 lore raw

PATCH 4/5 arm64: dts: rockchip: assign a fixed index to mmc devices on rk3308 boards

In reply to Johan Jonker

Recently introduced async probe on mmc devices can shuffle block IDs. Pin them to fixed values to ease booting in environments where UUIDs are not practical. Use newly introduced aliases for mmcblk devices from [1]. The sort order is based on reg address.

[1] https://patchwork.kernel.org/patch/11747669/

---
 arch/arm64/boot/dts/rockchip/rk3308.dtsi | 3 +++
 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/rockchip/rk3308.dtsi +3 -0
index ad54acf5d..b360b059f 100644
@@ -24,6 +24,9 @@
 		i2c1 = &i2c1;
 		i2c2 = &i2c2;
 		i2c3 = &i2c3;
+		mmc0 = &sdmmc;
+		mmc1 = &emmc;
+		mmc2 = &sdio;
 		serial0 = &uart0;
 		serial1 = &uart1;
 		serial2 = &uart2;
Signature · 7 lines
2.11.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
#9 lore raw

PATCH 5/5 arm64: dts: rockchip: assign a fixed index to mmc devices on rk3368 boards

In reply to Johan Jonker

Recently introduced async probe on mmc devices can shuffle block IDs. Pin them to fixed values to ease booting in environments where UUIDs are not practical. Use newly introduced aliases for mmcblk devices from [1]. The sort order is based on reg address.

[1] https://patchwork.kernel.org/patch/11747669/

---
 arch/arm64/boot/dts/rockchip/rk3368.dtsi | 3 +++
 1 file changed, 3 insertions(+)
arch/arm64/boot/dts/rockchip/rk3368.dtsi +3 -0
index cd8274a35..b00ed0e74 100644
@@ -25,6 +25,9 @@
 		i2c3 = &i2c3;
 		i2c4 = &i2c4;
 		i2c5 = &i2c5;
+		mmc0 = &sdmmc;
+		mmc1 = &sdio0;
+		mmc2 = &emmc;
 		serial0 = &uart0;
 		serial1 = &uart1;
 		serial2 = &uart2;
Signature · 7 lines
2.11.0


_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip
maintainer Applied
#10 lore raw

Re: (subset) [PATCH 1/5] ARM: dts: rockchip: assign a fixed index to mmc devices on rk322x boards

In reply to Johan Jonker
Quoted 6 lines · Johan Jonker

Recently introduced async probe on mmc devices can shuffle block IDs. Pin them to fixed values to ease booting in environments where UUIDs are not practical. Use newly introduced aliases for mmcblk devices from [1]. The sort order is based on reg address.

[1] https://patchwork.kernel.org/patch/11747669/

Applied, thanks!

[1/5] ARM: dts: rockchip: assign a fixed index to mmc devices on rk322x boards

      commit: 94e8a5f6d0dee8e81bdcef6d3e86a027459df225
[2/5] ARM: dts: rockchip: assign a fixed index to mmc devices on rv1108 boards
      commit: 1034e2b6b8435758c0d699b77761365fd09a5f4a

Patches 3-5 as well, just before didn't like the separate branches

Best regards,

Signature · 6 lines
Heiko Stuebner <[email protected]>

_______________________________________________
Linux-rockchip mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-rockchip