dtc: add ability to make nodes conditional on them being referenced
PATCH 1/2 dtc: add ability to make nodes conditional on them being referenced
From: Heiko Stuebner <[email protected]>
On i.MX, which carries a lot of pin-groups of which most are unused on individual boards, they noticed that this plethora of nodes also results in the runtime-lookup-performance also degrading [0].
A i.MX-specific solution defining the pingroups in the board files but using macros to reference the pingroup-data was not well received.
This patch is trying to solve this issue in a more general way, by adding the ability to mark nodes as needing to be referenced somewhere in the tree.
To mark a node a needing to be referenced it must be prefixed with /delete-if-unreferenced/. This makes dtc check the nodes reference-status when creating the flattened tree, dropping it if unreferenced.
For example, the i.MX6SL pingroup
/delete-if-unreferenced/ pinctrl_ecspi1_1: ecspi1grp-1 {
fsl,pins = <
MX6SL_PAD_ECSPI1_MISO__ECSPI1_MISO 0x100b1
MX6SL_PAD_ECSPI1_MOSI__ECSPI1_MOSI 0x100b1
MX6SL_PAD_ECSPI1_SCLK__ECSPI1_SCLK 0x100b1
>;
};would only be included in the dtb if it got referenced somewhere as pingroup via
node {
pinctrl-0 <&pinctrl_ecscpi1_1>;
};[0] http://thread.gmane.org/gmane.linux.ports.arm.kernel/275912/
---
Hi,
This is a respin of the patch previously sent by Heiko here:
https://patchwork.kernel.org/patch/3840371/
With hopefully all your comments addressed.
Let me know what you think,
Maxime
checks.c | 2 ++ dtc-lexer.l | 7 +++++++ dtc-parser.y | 5 +++++ dtc.h | 4 ++++ flattree.c | 3 +++ livetree.c | 14 ++++++++++++++ 6 files changed, 35 insertions(+)
checks.c +2 -0
@@ -571,6 +571,8 @@ static void fixup_phandle_references(struct check *c, struct dt_info *dti, phandle =get_node_phandle (dt, refnode); *((fdt32_t *)(prop->val.val + m->offset)) =cpu_to_fdt32 (phandle); + +reference_node (refnode); } } }
dtc-lexer.l +7 -0
@@ -153,6 +153,13 @@ static void PRINTF(1, 2) lexical_error(const char *fmt, ...); return DT_DEL_NODE; } +<*>"/delete-if-unreferenced/" { + DPRINT("Keyword: /delete-if-unreferenced/\n"); + DPRINT("<PROPNODENAME>\n"); + BEGIN(PROPNODENAME); + return DT_DEL_UNREFERENCED; + } + <*>{LABEL}: { DPRINT("Label: %s\n", yytext); yylval.labelref = xstrdup(yytext);
dtc-parser.y +5 -0
@@ -63,6 +63,7 @@ extern bool treesource_error; %token DT_BITS %token DT_DEL_PROP %token DT_DEL_NODE +%token DT_DEL_UNREFERENCED %token <propnodename> DT_PROPNODENAME %token <integer> DT_LITERAL %token <integer> DT_CHAR_LITERAL
@@ -523,6 +524,10 @@ subnode: { $$ = name_node(build_node_delete(), $2); } + | DT_DEL_UNREFERENCED subnode + { + $$ = mark_node_needs_reference($2); + } | DT_LABEL subnode { add_label(&$2->labels, $1);
dtc.h +4 -0
@@ -168,6 +168,8 @@ struct node {struct label *labels;const struct bus_type *bus; + +int needs_reference, is_referenced; };#define for_each_label_withdel (l0, l) \
@@ -202,6 +204,8 @@ struct property *reverse_properties(struct property *first);struct node *build_node (struct property *proplist,struct node *children);struct node *build_node_delete (void );struct node *name_node (struct node *node,char *name); +struct node *mark_node_needs_reference (struct node *node); +struct node *reference_node (struct node *node);struct node *chain_node (struct node *first,struct node *list);struct node *merge_nodes (struct node *old_node,struct node *new_node);struct node *add_orphan_node (struct node *old_node,struct node *new_node,char *ref);
flattree.c +3 -0
@@ -258,6 +258,9 @@ static void flatten_tree(struct node *tree, struct emitter *emit,if (tree->deleted)return ; +if (tree->needs_reference && !tree->is_referenced) +return ; + emit->beginnode (etarget, tree->labels);if (vi->flags &FTF_FULLPATH )
livetree.c +14 -0
@@ -134,6 +134,20 @@ struct node *name_node(struct node *node, char *name)return node; } +struct node *mark_node_needs_reference (struct node *node) +{ + node->needs_reference =1 ; + +return node; +} + +struct node *reference_node (struct node *node) +{ + node->is_referenced =1 ; + +return node; +} +struct node *merge_nodes (struct node *old_node,struct node *new_node) {struct property *new_prop, *old_prop;
Signature · 1 line
2.14.3
A message that is not in the archive (sent off-list or not yet received): 20180203091432.19463-1-maxime.ripard-LDxbnhwyfcJBDgjK7y7TUQ@public.gmane.org
PATCH 2/2 tests: Add a test case for the delete-if-unreferenced keyword
The newly introduced /delete-if-unreferenced/ needs a few test cases, make sure to test them.
--- tests/delete-unreferenced.dts | 15 +++++++++++++++ tests/run_tests.sh | 5 +++++ 2 files changed, 20 insertions(+) create mode 100644 tests/delete-unreferenced.dts
tests/delete-unreferenced.dts new file +15 -0
@@ -0,0 +1,15 @@ +/dts-v1/; + +/ { + /delete-if-unreferenced/ node1: node1 { + bar = <0xdeadbeef>; + }; + + /delete-if-unreferenced/ node2: node2 { + foo = <0x42>; + }; + + node3: node3 { + test = <&node2>; + }; +};
tests/run_tests.sh +5 -0
@@ -543,6 +543,11 @@ dtc_tests () { run_dtc_test -I dts -O dtb -o dtc_tree1_delete.test.dtb test_tree1_delete.dts tree1_tests dtc_tree1_delete.test.dtb + # Check delete-if-unreferenced functionality + run_dtc_test -I dts -O dtb -o delete-unreferenced.test.dtb delete-unreferenced.dts + run_test check_path delete-unreferenced.test.dtb not-exists "/node1" + run_test check_path delete-unreferenced.test.dtb exists "/node2" + run_dtc_test -I dts -O dts -o delete_reinstate_multilabel.dts.test.dts delete_reinstate_multilabel.dts run_wrap_test cmp delete_reinstate_multilabel.dts.test.dts delete_reinstate_multilabel_ref.dts
Signature · 1 line
2.14.3