Skip to contentSkip to conversation

ARM: dts: rockchip: add missing model properties

PATCH In review Johan Jonker 2 participants 8 messages Mar 4, 2020 – Mar 13, 2020

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

PATCH 1/3 ARM: dts: rockchip: add missing model properties

A test with the command below gives these errors:

arch/arm/boot/dts/rk3288-evb-act8846.dt.yaml: /: 'model' is a required property arch/arm/boot/dts/rk3288-evb-rk808.dt.yaml: /: 'model' is a required property arch/arm/boot/dts/rk3288-r89.dt.yaml: /: 'model' is a required property

Fix this error by adding the missing model properties to the involved dts files.

make ARCH=arm dtbs_check DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/ schemas/root-node.yaml

---
 arch/arm/boot/dts/rk3288-evb-act8846.dts | 1 +
 arch/arm/boot/dts/rk3288-evb-rk808.dts   | 1 +
 arch/arm/boot/dts/rk3288-r89.dts         | 1 +
 3 files changed, 3 insertions(+)
arch/arm/boot/dts/rk3288-evb-act8846.dts +1 -0
index 80080767c..be695b8c1 100644
@@ -4,6 +4,7 @@
 #include "rk3288-evb.dtsi"
 
 / {
+	model = "Rockchip RK3288 EVB ACT8846";
 	compatible = "rockchip,rk3288-evb-act8846", "rockchip,rk3288";
 
 	vcc_lcd: vcc-lcd {
arch/arm/boot/dts/rk3288-evb-rk808.dts +1 -0
index 167882096..42384ea4c 100644
@@ -4,6 +4,7 @@
 #include "rk3288-evb.dtsi"
 
 / {
+	model = "Rockchip RK3288 EVB RK808";
 	compatible = "rockchip,rk3288-evb-rk808", "rockchip,rk3288";
 };
 
arch/arm/boot/dts/rk3288-r89.dts +1 -0
index a6ffc381a..a258c7ae5 100644
@@ -9,6 +9,7 @@
 #include "rk3288.dtsi"
 
 / {
+	model = "Netxeon R89";
 	compatible = "netxeon,r89", "rockchip,rk3288";
 
 	memory@0 {
Signature · 1 line
2.11.0
#1 lore raw

PATCH 2/3 ARM: dts: rockchip: add missing @0 to memory nodenames

A test with the command below gives for example this error:

arch/arm/boot/dts/rk3288-tinker.dt.yaml: /: memory:
False schema does not allow
{'device_type': ['memory'], 'reg': [[0, 0, 0, 2147483648]]}

The memory nodes all have a reg property that requires '@' in the nodename. Fix this error by adding the missing '@0' to the involved memory nodenames.

make ARCH=arm dtbs_check DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/ schemas/root-node.yaml

---
 arch/arm/boot/dts/rk3288-phycore-som.dtsi | 2 +-
 arch/arm/boot/dts/rk3288-tinker.dtsi      | 2 +-
 arch/arm/boot/dts/rk3288-veyron.dtsi      | 2 +-
 arch/arm/boot/dts/rk3288-vyasa.dts        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
arch/arm/boot/dts/rk3288-phycore-som.dtsi +1 -1
index 77a47b9b7..9e76166c3 100644
@@ -16,7 +16,7 @@
 	 * Set the minimum memory size here and
 	 * let the bootloader set the real size.
 	 */
-	memory {
+	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x0 0x0 0x8000000>;
 	};
arch/arm/boot/dts/rk3288-tinker.dtsi +1 -1
index 312582c1b..77ae303b0 100644
@@ -12,7 +12,7 @@
 		stdout-path = "serial2:115200n8";
 	};
 
-	memory {
+	memory@0 {
 		reg = <0x0 0x0 0x0 0x80000000>;
 		device_type = "memory";
 	};
arch/arm/boot/dts/rk3288-veyron.dtsi +1 -1
index 54a6838d7..c089ce008 100644
@@ -18,7 +18,7 @@
 	 * The default coreboot on veyron devices ignores memory@0 nodes
 	 * and would instead create another memory node.
 	 */
-	memory {
+	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x0 0x0 0x80000000>;
 	};
arch/arm/boot/dts/rk3288-vyasa.dts +1 -1
index ba06e9f97..889b95e95 100644
@@ -14,7 +14,7 @@
 		stdout-path = &uart2;
 	};
 
-	memory {
+	memory@0 {
 		reg = <0x0 0x0 0x0 0x80000000>;
 		device_type = "memory";
 	};
Signature · 1 line
2.11.0
maintainer
#2 lore raw

Re: [PATCH 2/3] ARM: dts: rockchip: add missing @0 to memory nodenames

Hi Johan,

Am Mittwoch, 4. März 2020, 08:40:50 CET schrieb Johan Jonker:

Quoted 6 lines

A test with the command below gives for example this error:

arch/arm/boot/dts/rk3288-tinker.dt.yaml: /: memory:
False schema does not allow
{'device_type': ['memory'], 'reg': [[0, 0, 0, 2147483648]]}

Quoted 7 lines

The memory nodes all have a reg property that requires '@' in the nodename. Fix this error by adding the missing '@0' to the involved memory nodenames.

make ARCH=arm dtbs_check DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/ schemas/root-node.yaml

changes to memory nodes you sadly cannot do in such an automated fashion. If you read the comment in rk3288-veyron.dtsi you'll see that a previous similar iteration broke all of those machines as their coreboot doesn't copy with memory@0 and would insert another memory node without @0

In the past iteration the consensus then was that memory without @0 is also ok (as it isn't changeable anyway).

As I don't really want to repeat that, I'd like actual hardware tests before touching memory nodes.

Heiko

#3 lore raw

Re: [PATCH 2/3] ARM: dts: rockchip: add missing @0 to memory nodenames

Hi Heiko,

Goal was to reduce the error output of existing code a little bit, so that we can use it for the review of new patches. Some questions:
As I don't have the hardware, where else is coreboot used? Is this a rk3288-veyron.dtsi problem only?
ie. Is it a option to produce a patch serie v2 without veyron? Can someone help testing?

Johan

Quoted 22 lines · Heiko Stuebner

Hi Johan,

Am Mittwoch, 4. März 2020, 08:40:50 CET schrieb Johan Jonker:

Quoted 6 lines

A test with the command below gives for example this error:

arch/arm/boot/dts/rk3288-tinker.dt.yaml: /: memory:
False schema does not allow
{'device_type': ['memory'], 'reg': [[0, 0, 0, 2147483648]]}

Quoted 7 lines

The memory nodes all have a reg property that requires '@' in the nodename. Fix this error by adding the missing '@0' to the involved memory nodenames.

make ARCH=arm dtbs_check DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/ schemas/root-node.yaml

changes to memory nodes you sadly cannot do in such an automated fashion. If you read the comment in rk3288-veyron.dtsi you'll see that a previous similar iteration broke all of those machines as their coreboot doesn't copy with memory@0 and would insert another memory node without @0

Quoted 6 lines

In the past iteration the consensus then was that memory without @0 is also ok (as it isn't changeable anyway).

As I don't really want to repeat that, I'd like actual hardware tests before touching memory nodes.

Any suggestion/feedback rapport welcome.

Quoted 4 lines

Heiko

maintainer
#4 lore raw

Re: [PATCH 2/3] ARM: dts: rockchip: add missing @0 to memory nodenames

Hi Johan, Rob,

Am Donnerstag, 5. März 2020, 23:21:52 CET schrieb Johan Jonker:

Quoted 7 lines

Goal was to reduce the error output of existing code a little bit, so that we can use it for the review of new patches. Some questions:
As I don't have the hardware, where else is coreboot used? Is this a rk3288-veyron.dtsi problem only?
ie. Is it a option to produce a patch serie v2 without veyron? Can someone help testing?

I believe that is more question for @Rob :

In the past we said that it would be ok to have "memory" nodes without address, so "memory {}" instead of "memory@0 {}", simply because bootloaders mess up sometimes.

Question now would be how to make the yaml bindings happy.

Thanks
Heiko

Quoted 40 lines

Johan

Quoted 22 lines · Heiko Stuebner

Hi Johan,

Am Mittwoch, 4. März 2020, 08:40:50 CET schrieb Johan Jonker:

Quoted 6 lines

A test with the command below gives for example this error:

arch/arm/boot/dts/rk3288-tinker.dt.yaml: /: memory:
False schema does not allow
{'device_type': ['memory'], 'reg': [[0, 0, 0, 2147483648]]}

Quoted 7 lines

The memory nodes all have a reg property that requires '@' in the nodename. Fix this error by adding the missing '@0' to the involved memory nodenames.

make ARCH=arm dtbs_check DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/ schemas/root-node.yaml

changes to memory nodes you sadly cannot do in such an automated fashion. If you read the comment in rk3288-veyron.dtsi you'll see that a previous similar iteration broke all of those machines as their coreboot doesn't copy with memory@0 and would insert another memory node without @0

Quoted 6 lines

In the past iteration the consensus then was that memory without @0 is also ok (as it isn't changeable anyway).

As I don't really want to repeat that, I'd like actual hardware tests before touching memory nodes.

Any suggestion/feedback rapport welcome.

Quoted 4 lines

Heiko

#5 lore raw

Re: [PATCH 2/3] ARM: dts: rockchip: add missing @0 to memory nodenames

Hi Heiko, Rob,

From https://coreboot.org/status/board-status.html

The only supported boards listed are:

Veyron Rockchip RK3288 boards Veyron Mickey Rockchip RK3288 board Veyron Rialto Rockchip RK3288 board Gru Rockchip RK3399 reference board

Fixed with:
ARM: dts: rockchip: Remove @0 from the veyron memory node
https://patchwork.kernel.org/patch/10688081/

The problem is rk3288-veyron only I think.
Else fix coreboot to comply with DT rules, not the other way around. Will make v2.

Can robh give advice here?

Thanks

Quoted 67 lines · Heiko Stuebner

Hi Johan, Rob,

Am Donnerstag, 5. März 2020, 23:21:52 CET schrieb Johan Jonker:

Quoted 7 lines

Goal was to reduce the error output of existing code a little bit, so that we can use it for the review of new patches. Some questions:
As I don't have the hardware, where else is coreboot used? Is this a rk3288-veyron.dtsi problem only?
ie. Is it a option to produce a patch serie v2 without veyron? Can someone help testing?

I believe that is more question for @Rob :

In the past we said that it would be ok to have "memory" nodes without address, so "memory {}" instead of "memory@0 {}", simply because bootloaders mess up sometimes.

Question now would be how to make the yaml bindings happy.

Thanks
Heiko

Quoted 40 lines

Johan

Quoted 22 lines · Heiko Stuebner

Hi Johan,

Am Mittwoch, 4. März 2020, 08:40:50 CET schrieb Johan Jonker:

Quoted 6 lines

A test with the command below gives for example this error:

arch/arm/boot/dts/rk3288-tinker.dt.yaml: /: memory:
False schema does not allow
{'device_type': ['memory'], 'reg': [[0, 0, 0, 2147483648]]}

Quoted 7 lines

The memory nodes all have a reg property that requires '@' in the nodename. Fix this error by adding the missing '@0' to the involved memory nodenames.

make ARCH=arm dtbs_check DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/ schemas/root-node.yaml

changes to memory nodes you sadly cannot do in such an automated fashion. If you read the comment in rk3288-veyron.dtsi you'll see that a previous similar iteration broke all of those machines as their coreboot doesn't copy with memory@0 and would insert another memory node without @0

Quoted 6 lines

In the past iteration the consensus then was that memory without @0 is also ok (as it isn't changeable anyway).

As I don't really want to repeat that, I'd like actual hardware tests before touching memory nodes.

Any suggestion/feedback rapport welcome.

Quoted 4 lines

Heiko

#6 lore raw

PATCH 3/3 arm64: dts: rockchip: add missing @0 to memory nodenames

In reply to Johan Jonker

A test with the command below gives these errors:

arch/arm64/boot/dts/rockchip/rk3368-evb-act8846.dt.yaml: /: memory:
False schema does not allow
{'reg': [[0, 0, 0, 1073741824]], 'device_type': ['memory']} arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dt.yaml: /: memory:
False schema does not allow
{'reg': [[0, 0, 0, 2147483648]], 'device_type': ['memory']} arch/arm64/boot/dts/rockchip/rk3368-r88.dt.yaml: /: memory:
False schema does not allow
{'reg': [[0, 0, 0, 1073741824]], 'device_type': ['memory']}

The memory nodes all have a reg property that requires '@' in the nodename. Fix this error by adding the missing '@0' to the involved memory nodenames.

make ARCH=arm64 dtbs_check DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/ schemas/root-node.yaml

---
 arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi           | 2 +-
 arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts | 2 +-
 arch/arm64/boot/dts/rockchip/rk3368-r88.dts            | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)
arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi +1 -1
index 1c52f47c4..b9e2e4bc0 100644
@@ -12,7 +12,7 @@
 		stdout-path = "serial2:115200n8";
 	};
 
-	memory {
+	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x0 0x0 0x40000000>;
 	};
arch/arm64/boot/dts/rockchip/rk3368-orion-r68-meta.dts +1 -1
index 6cc310255..9435008d5 100644
@@ -15,7 +15,7 @@
 		stdout-path = "serial2:115200n8";
 	};
 
-	memory {
+	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x0 0x0 0x80000000>;
 	};
arch/arm64/boot/dts/rockchip/rk3368-r88.dts +1 -1
index 006a1fb6a..cf11175ec 100644
@@ -15,7 +15,7 @@
 		stdout-path = "serial2:115200n8";
 	};
 
-	memory {
+	memory@0 {
 		device_type = "memory";
 		reg = <0x0 0x0 0x0 0x40000000>;
 	};
Signature · 1 line
2.11.0
maintainer
#7 lore raw
In reply to Johan Jonker

Am Mittwoch, 4. März 2020, 08:40:49 CET schrieb Johan Jonker:

Quoted 9 lines

A test with the command below gives these errors:

arch/arm/boot/dts/rk3288-evb-act8846.dt.yaml: /: 'model' is a required property arch/arm/boot/dts/rk3288-evb-rk808.dt.yaml: /: 'model' is a required property arch/arm/boot/dts/rk3288-r89.dt.yaml: /: 'model' is a required property

Quoted 8 lines

Fix this error by adding the missing model properties to the involved dts files.

make ARCH=arm dtbs_check DT_SCHEMA_FILES=~/.local/lib/python3.5/site-packages/dtschema/ schemas/root-node.yaml

applied for 5.7

Thanks
Heiko