[PATCH] Add merging of labelled subnodes. This patch allows the following

Grant Likely grant.likely at secretlab.ca
Sun Sep 19 09:54:47 EST 2010


David, can you please ack adding your s-o-b to this one?  It is mostly
your patch anyway, but I had tested it and added a failure test case.
Then Jon will be able to merge it.

g.

---------- Forwarded message ----------
From: Grant Likely <grant.likely at secretlab.ca>
Date: Mon, Mar 1, 2010 at 9:54 AM
Subject: [PATCH] Add merging of labelled subnodes. This patch allows
the following
To: david at gibson.dropbear.id.au, jdl at jdl.com,
devicetree-discuss at lists.ozlabs.org


From: David Gibson <david at gibson.dropbear.id.au>

syntax:

/ {
       child {
               label: subchild {
               };
       };
};

&label {
       prop = "value";
};

which will result in the following tree:

/ {
       child {
               label: subchild {
                       prop = "value";
               };
       };
};

[David's s-o-b needed here]
Signed-off-by: Grant Likely <grant.likely at secretlab.ca>
---

Hi Jon,

This works well for me.  I've added another test case to ensure that using
a non-existent label will fail.  This patch is primarily from David now, so
I've changed the From: attribution, but it still needs his s-o-b line.

Cheers,
g.

 dtc-lexer.l                         |    2 +-
 dtc-parser.y                        |   24 ++++++++++++--------
 tests/nonexist-node-ref2.dts        |   10 +++++++++
 tests/run_tests.sh                  |    3 +++
 tests/test_tree1.dts                |    2 +-
 tests/test_tree1_merge.dts          |    4 +--
 tests/test_tree1_merge_labelled.dts |   41 +++++++++++++++++++++++++++++++++++
 7 files changed, 71 insertions(+), 15 deletions(-)
 create mode 100644 tests/nonexist-node-ref2.dts
 create mode 100644 tests/test_tree1_merge_labelled.dts

diff --git a/dtc-lexer.l b/dtc-lexer.l
index 3c3434c..5a7e476 100644
--- a/dtc-lexer.l
+++ b/dtc-lexer.l
@@ -109,7 +109,7 @@ static int pop_input_file(void);
                       return DT_LITERAL;
               }

-\&{LABEL}      {       /* label reference */
+<*>\&{LABEL}   {       /* label reference */
                       DPRINT("Ref: %s\n", yytext+1);
                       yylval.labelref = xstrdup(yytext+1);
                       return DT_REF;
diff --git a/dtc-parser.y b/dtc-parser.y
index dea19c1..ed87d3b 100644
--- a/dtc-parser.y
+++ b/dtc-parser.y
@@ -74,7 +74,6 @@ static unsigned long long eval_literal(const char
*s, int base, int bits);
 %type <prop> propdef
 %type <proplist> proplist

-%type <node> devicetree
 %type <node> devicetrees
 %type <node> nodedef
 %type <node> subnode
@@ -121,20 +120,25 @@ addr:
         ;

 devicetrees:
-         devicetree
+         '/' nodedef
               {
-                       $$ = $1;
+                       $$ = name_node($2, "");
               }
-       | devicetrees devicetree
+       | devicetrees '/' nodedef
               {
-                       $$ = merge_nodes($1, $2);
+                       $$ = merge_nodes($1, $3);
               }
-       ;
-
-devicetree:
-         '/' nodedef
+       | devicetrees DT_REF nodedef
               {
-                       $$ = name_node($2, "");
+                       struct node *target;
+
+                       target = get_node_by_label($1, $2);
+                       if (target)
+                               merge_nodes(target, $3);
+                       else
+                               yyerror("label does not exist in "
+                                       " node redefinition");
+                       $$ = $1;
               }
       ;

diff --git a/tests/nonexist-node-ref2.dts b/tests/nonexist-node-ref2.dts
new file mode 100644
index 0000000..44b4ebe
--- /dev/null
+++ b/tests/nonexist-node-ref2.dts
@@ -0,0 +1,10 @@
+/dts-v1/;
+
+/ {
+       label: node {
+       };
+};
+
+/* Try to redefine a node using a non-existent label */
+&nosuchnode {
+};
diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index 43b9d44..3ce71c4 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -300,6 +300,8 @@ dtc_tests () {
    # Check merge/overlay functionality
    run_dtc_test -I dts -O dtb -o dtc_tree1_merge.test.dtb test_tree1_merge.dts
    tree1_tests dtc_tree1_merge.test.dtb test_tree1.dtb
+    run_dtc_test -I dts -O dtb -o dtc_tree1_merge_labelled.test.dtb
test_tree1_merge_labelled.dts
+    tree1_tests dtc_tree1_merge_labelled.test.dtb test_tree1.dtb
    run_dtc_test -I dts -O dtb -o multilabel_merge.test.dtb multilabel_merge.dts
    run_test references multilabel.test.dtb
    run_test dtbs_equal_ordered multilabel.test.dtb multilabel_merge.test.dtb
@@ -312,6 +314,7 @@ dtc_tests () {
    check_tests minusone-phandle.dts explicit_phandles
    run_sh_test dtc-checkfails.sh phandle_references -- -I dts -O dtb
nonexist-node-ref.dts
    run_sh_test dtc-checkfails.sh phandle_references -- -I dts -O dtb
nonexist-label-ref.dts
+    run_sh_test dtc-fatal.sh -I dts -O dtb nonexist-node-ref2.dts
    check_tests bad-name-property.dts name_properties

    check_tests bad-ncells.dts address_cells_is_cell
size_cells_is_cell interrupt_cells_is_cell
diff --git a/tests/test_tree1.dts b/tests/test_tree1.dts
index 218c382..4f0ce45 100644
--- a/tests/test_tree1.dts
+++ b/tests/test_tree1.dts
@@ -25,7 +25,7 @@
               linux,phandle = <0x2000>;
               prop-int = <123456789>;

-               subsubnode at 0 {
+               ssn0: subsubnode at 0 {
                       phandle = <0x2001>;
                       compatible = "subsubnode2", "subsubnode";
                       prop-int = <0726746425>;
diff --git a/tests/test_tree1_merge.dts b/tests/test_tree1_merge.dts
index f580da8..fc191fd 100644
--- a/tests/test_tree1_merge.dts
+++ b/tests/test_tree1_merge.dts
@@ -34,12 +34,10 @@
               prop-int = [deadbeef];
       };
       subnode at 2 {
-               subsubnode at 0 {
+               ssn0: subsubnode at 0 {
                       phandle = <0x2001>;
                       compatible = "subsubnode2", "subsubnode";
                       prop-int = <0726746425>;
               };
       };
 };
-
-
diff --git a/tests/test_tree1_merge_labelled.dts
b/tests/test_tree1_merge_labelled.dts
new file mode 100644
index 0000000..46a6840
--- /dev/null
+++ b/tests/test_tree1_merge_labelled.dts
@@ -0,0 +1,41 @@
+/dts-v1/;
+
+/memreserve/ 0xdeadbeef00000000 0x100000;
+/memreserve/ 123456789 010000;
+
+/ {
+       compatible = "test_tree1";
+       prop-int = <0xdeadbeef>;
+       prop-str = "hello world";
+
+       subnode at 1 {
+               compatible = "subnode1";
+               prop-int = [deadbeef];
+
+               subsubnode {
+                       compatible = "subsubnode1", "subsubnode";
+                       prop-int = <0xdeadbeef>;
+               };
+
+               ss1 {
+               };
+       };
+
+       subnode at 2 {
+               linux,phandle = <0x2000>;
+               prop-int = <123456789>;
+
+               ssn0: subsubnode at 0 {
+                       phandle = <0x2001>;
+                       prop-int = <0xbad>;
+               };
+
+               ss2 {
+               };
+       };
+};
+
+&ssn0 {
+       compatible = "subsubnode2", "subsubnode";
+       prop-int = <0726746425>;
+};




-- 
Grant Likely, B.Sc., P.Eng.
Secret Lab Technologies Ltd.


More information about the devicetree-discuss mailing list