diff options
author | David Gibson <david@gibson.dropbear.id.au> | 2009-11-26 15:37:13 +1100 |
---|---|---|
committer | Jon Loeliger <jdl@jdl.com> | 2009-11-26 15:06:17 -0600 |
commit | d75b33af676d0beac8398651a7f09037555a550b (patch) | |
tree | 94337c43fe3dd4e70c487833cc3ecbb370baaadc /tests | |
parent | 0ef21055ee414697aac7226c171d921214ef3981 (diff) | |
download | device-tree-compiler-d75b33af676d0beac8398651a7f09037555a550b.tar.gz |
Support ePAPR compliant phandle properties
Currently, the Linux kernel, libfdt and dtc, when using flattened
device trees encode a node's phandle into a property named
"linux,phandle". The ePAPR specification, however - aiming as it is
to not be a Linux specific spec - requires that phandles be encoded in
a property named simply "phandle".
This patch adds support for this newer approach to dtc and libfdt.
Specifically:
- fdt_get_phandle() will now return the correct phandle if it
is supplied in either of these properties
- fdt_node_offset_by_phandle() will correctly find a node with
the given phandle encoded in either property.
- By default, when auto-generating phandles, dtc will encode
it into both properties for maximum compatibility. A new -H
option allows either only old-style or only new-style
properties to be generated.
- If phandle properties are explicitly supplied in the dts
file, dtc will not auto-generate ones in the alternate format.
- If both properties are supplied, dtc will check that they
have the same value.
- Some existing testcases are updated to use a mix of old and
new-style phandles, partially testing the changes.
- A new phandle_format test further tests the libfdt support,
and the -H option.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Makefile.tests | 3 | ||||
-rw-r--r-- | tests/include1.dts | 2 | ||||
-rw-r--r-- | tests/phandle_format.c | 78 | ||||
-rw-r--r-- | tests/references.dts | 3 | ||||
-rwxr-xr-x | tests/run_tests.sh | 6 | ||||
-rw-r--r-- | tests/sw_tree1.c | 2 | ||||
-rw-r--r-- | tests/test_tree1.dts | 2 | ||||
-rw-r--r-- | tests/trees.S | 5 |
8 files changed, 94 insertions, 7 deletions
diff --git a/tests/Makefile.tests b/tests/Makefile.tests index 2696581..ac21ade 100644 --- a/tests/Makefile.tests +++ b/tests/Makefile.tests @@ -10,7 +10,8 @@ LIB_TESTS_L = get_mem_rsv \ sw_tree1 \ move_and_save mangle-layout nopulate \ open_pack rw_tree1 set_name setprop del_property del_node \ - string_escapes references path-references boot-cpuid incbin \ + string_escapes references path-references phandle_format \ + boot-cpuid incbin \ extra-terminating-null \ dtbs_equal_ordered \ add_subnode_with_nops path_offset_aliases diff --git a/tests/include1.dts b/tests/include1.dts index 8d7e747..5d59d83 100644 --- a/tests/include1.dts +++ b/tests/include1.dts @@ -15,7 +15,7 @@ prop-int = <123456789>; /include/ "include8.dts" - linux,phandle = <0x2001>; + phandle = <0x2001>; compatible = "subsubnode2", "subsubnode"; prop-int = <0726746425>; }; diff --git a/tests/phandle_format.c b/tests/phandle_format.c new file mode 100644 index 0000000..7e4d816 --- /dev/null +++ b/tests/phandle_format.c @@ -0,0 +1,78 @@ +/* + * libfdt - Flat Device Tree manipulation + * Testcase for phandle format options + * Copyright (C) 2009 David Gibson, IBM Corporation. + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ +#include <stdlib.h> +#include <stdio.h> +#include <string.h> +#include <stdint.h> + +#include <fdt.h> +#include <libfdt.h> + +#include "tests.h" +#include "testdata.h" + +#define PHANDLE_LEGACY 0x1 +#define PHANDLE_EPAPR 0x2 +#define PHANDLE_BOTH 0x3 + +int main(int argc, char *argv[]) +{ + void *fdt; + int phandle_format; + int n4; + uint32_t h4; + + if (argc != 3) + CONFIG("Usage: %s <dtb file> <legacy|epapr|both>\n", argv[0]); + + test_init(argc, argv); + fdt = load_blob(argv[1]); + + if (streq(argv[2], "legacy")) + phandle_format = PHANDLE_LEGACY; + else if (streq(argv[2], "epapr")) + phandle_format = PHANDLE_EPAPR; + else if (streq(argv[2], "both")) + phandle_format = PHANDLE_BOTH; + else + CONFIG("Usage: %s <dtb file> <legacy|epapr|both>\n", argv[0]); + + n4 = fdt_path_offset(fdt, "/node4"); + if (n4 < 0) + FAIL("fdt_path_offset(/node4): %s", fdt_strerror(n4)); + + h4 = fdt_get_phandle(fdt, n4); + if ((h4 == 0) || (h4 == -1)) + FAIL("/node4 has bad phandle 0x%x\n", h4); + + if (phandle_format & PHANDLE_LEGACY) + check_getprop_cell(fdt, n4, "linux,phandle", h4); + else + if (fdt_getprop(fdt, n4, "linux,phandle", NULL)) + FAIL("linux,phandle property present in non-legacy mode"); + + if (phandle_format & PHANDLE_EPAPR) + check_getprop_cell(fdt, n4, "phandle", h4); + else + if (fdt_getprop(fdt, n4, "phandle", NULL)) + FAIL("phandle property present in legacy-only mode"); + + PASS(); +} diff --git a/tests/references.dts b/tests/references.dts index 19b28ac..640c931 100644 --- a/tests/references.dts +++ b/tests/references.dts @@ -8,7 +8,7 @@ lref = <&n2>; }; n2: node2 { - linux,phandle = <0x1>; + phandle = <0x1>; ref = <&{/node1}>; /* reference after target */ lref = <&n1>; }; @@ -29,5 +29,6 @@ * so check it actually works */ n5: node5 { linux,phandle = <&n5>; + phandle = <&n5>; }; }; diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 5d901c2..c532030 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -218,6 +218,12 @@ dtc_tests () { run_dtc_test -I dts -O dtb -o dtc_path-references.test.dtb path-references.dts run_test path-references dtc_path-references.test.dtb + run_test phandle_format dtc_references.test.dtb both + for f in legacy epapr both; do + run_dtc_test -I dts -O dtb -H $f -o dtc_references.test.$f.dtb references.dts + run_test phandle_format dtc_references.test.$f.dtb $f + done + run_dtc_test -I dts -O dtb -o dtc_comments.test.dtb comments.dts run_dtc_test -I dts -O dtb -o dtc_comments-cmp.test.dtb comments-cmp.dts run_test dtbs_equal_ordered dtc_comments.test.dtb dtc_comments-cmp.test.dtb diff --git a/tests/sw_tree1.c b/tests/sw_tree1.c index 687fb82..f2c430a 100644 --- a/tests/sw_tree1.c +++ b/tests/sw_tree1.c @@ -74,7 +74,7 @@ int main(int argc, char *argv[]) CHECK(fdt_property_cell(fdt, "linux,phandle", PHANDLE_1)); CHECK(fdt_property_cell(fdt, "prop-int", TEST_VALUE_2)); CHECK(fdt_begin_node(fdt, "subsubnode@0")); - CHECK(fdt_property_cell(fdt, "linux,phandle", PHANDLE_2)); + CHECK(fdt_property_cell(fdt, "phandle", PHANDLE_2)); CHECK(fdt_property(fdt, "compatible", "subsubnode2\0subsubnode", 23)); CHECK(fdt_property_cell(fdt, "prop-int", TEST_VALUE_2)); diff --git a/tests/test_tree1.dts b/tests/test_tree1.dts index 1593554..218c382 100644 --- a/tests/test_tree1.dts +++ b/tests/test_tree1.dts @@ -26,7 +26,7 @@ prop-int = <123456789>; subsubnode@0 { - linux,phandle = <0x2001>; + phandle = <0x2001>; compatible = "subsubnode2", "subsubnode"; prop-int = <0726746425>; }; diff --git a/tests/trees.S b/tests/trees.S index 609cdd6..66adf3f 100644 --- a/tests/trees.S +++ b/tests/trees.S @@ -103,7 +103,7 @@ test_tree1_struct: END_NODE BEGIN_NODE("subnode@2") - PROP_INT(test_tree1, phandle, PHANDLE_1) + PROP_INT(test_tree1, linux_phandle, PHANDLE_1) PROP_INT(test_tree1, prop_int, TEST_VALUE_2) BEGIN_NODE("subsubnode@0") @@ -125,7 +125,8 @@ test_tree1_strings: STRING(test_tree1, compatible, "compatible") STRING(test_tree1, prop_int, "prop-int") STRING(test_tree1, prop_str, "prop-str") - STRING(test_tree1, phandle, "linux,phandle") + STRING(test_tree1, linux_phandle, "linux,phandle") + STRING(test_tree1, phandle, "phandle") test_tree1_strings_end: test_tree1_end: |