| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20260112142009.1006236-75-herve.codina@bootlin.com>
Date: Mon, 12 Jan 2026 15:20:04 +0100
From: Herve Codina <herve.codina@...tlin.com>
To: David Gibson <david@...son.dropbear.id.au>,
Rob Herring <robh@...nel.org>,
Krzysztof Kozlowski <krzk@...nel.org>,
Conor Dooley <conor+dt@...nel.org>
Cc: Ayush Singh <ayush@...gleboard.org>,
Geert Uytterhoeven <geert@...ux-m68k.org>,
devicetree-compiler@...r.kernel.org,
devicetree@...r.kernel.org,
linux-kernel@...r.kernel.org,
devicetree-spec@...r.kernel.org,
Hui Pu <hui.pu@...ealthcare.com>,
Ian Ray <ian.ray@...ealthcare.com>,
Luca Ceresoli <luca.ceresoli@...tlin.com>,
Thomas Petazzoni <thomas.petazzoni@...tlin.com>,
Herve Codina <herve.codina@...tlin.com>
Subject: [RFC PATCH 74/77] tests: fdtaddon: Add a basic test for addons with unresolved phandle references
Addons can have unresolved phandle references. Those references are
resolved when the addon is applied.
Add a basic test for this feature.
Signed-off-by: Herve Codina <herve.codina@...tlin.com>
---
tests/fdtaddon_basics3-merged1.dtb.dts.expect | 36 +++++++++++++++++++
tests/fdtaddon_basics3-merged1.dtb.expect | 29 +++++++++++++++
tests/fdtaddon_basics3-merged2.dtb.dts.expect | 36 +++++++++++++++++++
tests/fdtaddon_basics3-merged2.dtb.expect | 29 +++++++++++++++
tests/fdtaddon_basics3.dtba.expect | 12 +++++++
tests/fdtaddon_basics3.dtsa | 17 +++++++++
tests/run_tests.sh | 2 +-
7 files changed, 160 insertions(+), 1 deletion(-)
create mode 100644 tests/fdtaddon_basics3-merged1.dtb.dts.expect
create mode 100644 tests/fdtaddon_basics3-merged1.dtb.expect
create mode 100644 tests/fdtaddon_basics3-merged2.dtb.dts.expect
create mode 100644 tests/fdtaddon_basics3-merged2.dtb.expect
create mode 100644 tests/fdtaddon_basics3.dtba.expect
create mode 100644 tests/fdtaddon_basics3.dtsa
diff --git a/tests/fdtaddon_basics3-merged1.dtb.dts.expect b/tests/fdtaddon_basics3-merged1.dtb.dts.expect
new file mode 100644
index 0000000..c1bf3cc
--- /dev/null
+++ b/tests/fdtaddon_basics3-merged1.dtb.dts.expect
@@ -0,0 +1,36 @@
+/dts-v1/;
+
+/ {
+
+ base-node {
+
+ sub-node {
+ prop = <0x00>;
+ phandle = <0x02>;
+ };
+ };
+
+ somewhere {
+
+ node-a1 {
+ compatible = "abc,aaa";
+ phandle = <0x01>;
+
+ /export/ node_a: &{/somewhere/node-a1};
+ /export/ other: &{/base-node/sub-node};
+
+ addon-node {
+ ref-other = <&{/base-node/sub-node} 0x0a>;
+ prop = <0x00>;
+ };
+ };
+
+ node-a2 {
+ compatible = "abc,aaa";
+ phandle = <0x03>;
+
+ /export/ node_a: &{/somewhere/node-a2};
+ /export/ other: &{/base-node/sub-node};
+ };
+ };
+};
diff --git a/tests/fdtaddon_basics3-merged1.dtb.expect b/tests/fdtaddon_basics3-merged1.dtb.expect
new file mode 100644
index 0000000..cb2ab03
--- /dev/null
+++ b/tests/fdtaddon_basics3-merged1.dtb.expect
@@ -0,0 +1,29 @@
+/dts-v1/;
+
+/ {
+ base-node {
+ sub-node {
+ prop = <0x00000000>;
+ phandle = <0x00000002>;
+ };
+ };
+ somewhere {
+ node-a1 {
+ compatible = "abc,aaa";
+ phandle = <0x00000001>;
+ // [FDT_EXPORT_SYM] 'node_a' -> phandle 0x00000001
+ // [FDT_EXPORT_SYM] 'other' -> phandle 0x00000002
+ addon-node {
+ ref-other = <0x00000002 0x0000000a>;
+ // [FDT_REF_LOCAL] ref-other[0]
+ prop = <0x00000000>;
+ };
+ };
+ node-a2 {
+ compatible = "abc,aaa";
+ phandle = <0x00000003>;
+ // [FDT_EXPORT_SYM] 'node_a' -> phandle 0x00000003
+ // [FDT_EXPORT_SYM] 'other' -> phandle 0x00000002
+ };
+ };
+};
diff --git a/tests/fdtaddon_basics3-merged2.dtb.dts.expect b/tests/fdtaddon_basics3-merged2.dtb.dts.expect
new file mode 100644
index 0000000..8dc9fd2
--- /dev/null
+++ b/tests/fdtaddon_basics3-merged2.dtb.dts.expect
@@ -0,0 +1,36 @@
+/dts-v1/;
+
+/ {
+
+ base-node {
+
+ sub-node {
+ prop = <0x00>;
+ phandle = <0x02>;
+ };
+ };
+
+ somewhere {
+
+ node-a1 {
+ compatible = "abc,aaa";
+ phandle = <0x01>;
+
+ /export/ node_a: &{/somewhere/node-a1};
+ /export/ other: &{/base-node/sub-node};
+ };
+
+ node-a2 {
+ compatible = "abc,aaa";
+ phandle = <0x03>;
+
+ /export/ node_a: &{/somewhere/node-a2};
+ /export/ other: &{/base-node/sub-node};
+
+ addon-node {
+ ref-other = <&{/base-node/sub-node} 0x0a>;
+ prop = <0x00>;
+ };
+ };
+ };
+};
diff --git a/tests/fdtaddon_basics3-merged2.dtb.expect b/tests/fdtaddon_basics3-merged2.dtb.expect
new file mode 100644
index 0000000..0bc106e
--- /dev/null
+++ b/tests/fdtaddon_basics3-merged2.dtb.expect
@@ -0,0 +1,29 @@
+/dts-v1/;
+
+/ {
+ base-node {
+ sub-node {
+ prop = <0x00000000>;
+ phandle = <0x00000002>;
+ };
+ };
+ somewhere {
+ node-a1 {
+ compatible = "abc,aaa";
+ phandle = <0x00000001>;
+ // [FDT_EXPORT_SYM] 'node_a' -> phandle 0x00000001
+ // [FDT_EXPORT_SYM] 'other' -> phandle 0x00000002
+ };
+ node-a2 {
+ compatible = "abc,aaa";
+ phandle = <0x00000003>;
+ // [FDT_EXPORT_SYM] 'node_a' -> phandle 0x00000003
+ // [FDT_EXPORT_SYM] 'other' -> phandle 0x00000002
+ addon-node {
+ ref-other = <0x00000002 0x0000000a>;
+ // [FDT_REF_LOCAL] ref-other[0]
+ prop = <0x00000000>;
+ };
+ };
+ };
+};
diff --git a/tests/fdtaddon_basics3.dtba.expect b/tests/fdtaddon_basics3.dtba.expect
new file mode 100644
index 0000000..14dad9c
--- /dev/null
+++ b/tests/fdtaddon_basics3.dtba.expect
@@ -0,0 +1,12 @@
+/dts-v1/;
+/addon/;
+
+// [FDT_IMPORT_SYM] 'node_a' (abc,aaa)
+// [FDT_IMPORT_SYM] 'other' ()
+&node_a {
+ addon-node {
+ prop = <0x00000000>;
+ ref-other = <0xffffffff 0x0000000a>;
+ // [FDT_REF_PHANDLE] ref-other[0], ref = other
+ };
+};
diff --git a/tests/fdtaddon_basics3.dtsa b/tests/fdtaddon_basics3.dtsa
new file mode 100644
index 0000000..8658b45
--- /dev/null
+++ b/tests/fdtaddon_basics3.dtsa
@@ -0,0 +1,17 @@
+// SPDX-License-Identifier: (GPL-2.0-or-later OR BSD-2-Clause)
+/*
+ * Copyright (C) 2026 Bootlin
+ */
+
+/dts-v1/;
+/addon/;
+
+/import/ node_a: "abc,aaa";
+/import/ other: "";
+
+&node_a {
+ addon-node {
+ prop = <0>;
+ ref-other = <&other 10>;
+ };
+};
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index d62496c..65b1abe 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -1189,7 +1189,7 @@ fdtaddon_tests() {
run_dtc_test -I dts -O dtb -o fdtaddon_base.dtb "$SRCDIR/fdtaddon_base.dts"
check_dtb fdtaddon_base.dtb
- for dt in fdtaddon_basics1 fdtaddon_basics2; do
+ for dt in fdtaddon_basics1 fdtaddon_basics2 fdtaddon_basics3; do
run_dtc_test -I dts -O dtb -o $dt.dtba "$SRCDIR/$dt.dtsa"
check_dtb $dt.dtba
--
2.52.0
Powered by blists - more mailing lists