Add capability to create property from old property
v2 cover Add capability to create property from old property
Allow construction of new values for a property using old property value.
This was originally suggested in /append-property/ Patch series [0] and can be used to achieve the same results (and much more).
In practice, it looks as follows:
dts-v1/;
/ {
str-prop = "0";
int-prop = <0>;
};/ {
str-prop = /./, "1", /./;
int-prop = /./, <1>, /./;
};dts to source output with -T -T also works as expected:
/dts-v1/;
/ { /* base.dts:3:3-5:3, base.dts:7:3-9:3 */
int-prop = <0x00 0x01>, <0x02 0x03>, <0x00 0x01>; /* base.dts:4:9-4:26, base.dts:8:9-8:36 */ }; /* base.dts:3:3-5:3, base.dts:7:3-9:3 */
[0]: https://lore.kernel.org/devicetree-compiler/Z24nldCpXpoT7RaK@zatzit/T/#t
---
Changes in v2:
- Compare against expected dtb instead of checking each property
individually in tests.
- Use xstrdup when copying refs so each marker has it's own copy.
- Pass struct data by value, not by pointer.
- Add srcpos_free helper to properly free srcpos which have been
extended previously.
- Remove open items since my original choices seem correct.
- Link to v1: https://lore.kernel.org/r/[email protected]
---
Ayush Singh (4):
Add alloc_marker
srcpos: Define srcpos_free
dtc: Add /./
tests: Add test for /./
data.c | 20 +++++++++++++----- dtc-lexer.l | 5 +++++ dtc-parser.y | 5 +++++ dtc.h | 3 +++ livetree.c | 50 ++++++++++++++++++++++++++++++++++++++++++-- srcpos.c | 11 ++++++++++ srcpos.h | 1 + tests/prev_prop.dts | 25 ++++++++++++++++++++++ tests/prev_prop_expected.dts | 13 ++++++++++++ tests/run_tests.sh | 5 +++++ 10 files changed, 131 insertions(+), 7 deletions(-)
---
base-commit: ce1d8588880aecd7af264e422a16a8b33617cef7
change-id: 20241227-previous-value-c22d4eeaae72
Best regards,
Signature · 1 line
Ayush Singh <[email protected]>
PATCH v2 1/4 Add alloc_marker
- Add helper to allocate new marker
--- data.c | 20 +++++++++++++++----- dtc.h | 2 ++ 2 files changed, 17 insertions(+), 5 deletions(-)
data.c +15 -5
@@ -228,11 +228,7 @@ struct data data_add_marker(struct data d, enum markertype type, char *ref) {struct marker *m; - m =xmalloc (sizeof (*m)); - m->offset = d.len; - m->type = type; - m->ref = ref; - m->next =NULL ; + m =alloc_marker (d.len, type, ref);return data_append_markers (d, m); }
@@ -254,3 +250,17 @@ bool data_is_one_string(struct data d)return true; } + +struct marker *alloc_marker (unsigned int offset,enum markertype type, +char *ref) +{ +struct marker *m; + + m =xmalloc (sizeof (*m)); + m->offset = offset; + m->type = type; + m->ref = ref; + m->next =NULL ; + +return m; +}
dtc.h +2 -0
@@ -183,6 +183,8 @@ struct data data_append_byte(struct data d, uint8_t byte);struct data data_append_zeroes (struct data d,int len);struct data data_append_align (struct data d,int align); +struct marker *alloc_marker (unsigned int offset,enum markertype type, +char *ref);struct data data_add_marker (struct data d,enum markertype type,char *ref);bool data_is_one_string (struct data d);
Signature · 1 line
2.48.1
Re: [PATCH v2 1/4] Add alloc_marker
Quoted 4 lines · Ayush Singh
- Add helper to allocate new marker
Reviewed-by David Gibson <[email protected]>Signed-off-by Ayush Singh <[email protected]>
This is a reasonable cleanup regardless of anything else. Applied.
Quoted 54 lines
--- data.c | 20 +++++++++++++++----- dtc.h | 2 ++ 2 files changed, 17 insertions(+), 5 deletions(-)data.c +15
-5@@ -228,11 +228,7 @@ struct data data_add_marker(struct data d, enum markertype type, char *ref) {struct marker *m; - m =xmalloc (sizeof (*m)); - m->offset = d.len; - m->type = type; - m->ref = ref; - m->next =NULL ; + m =alloc_marker (d.len, type, ref);return data_append_markers (d, m); }@@ -254,3 +250,17 @@ bool data_is_one_string(struct data d)return true; } + +struct marker *alloc_marker (unsigned int offset,enum markertype type, +char *ref) +{ +struct marker *m; + + m =xmalloc (sizeof (*m)); + m->offset = offset; + m->type = type; + m->ref = ref; + m->next =NULL ; + +return m; +}dtc.h +2
-0@@ -183,6 +183,8 @@ struct data data_append_byte(struct data d, uint8_t byte);struct data data_append_zeroes (struct data d,int len);struct data data_append_align (struct data d,int align); +struct marker *alloc_marker (unsigned int offset,enum markertype type, +char *ref);struct data data_add_marker (struct data d,enum markertype type,char *ref);bool data_is_one_string (struct data d);
Signature · 4 lines
David Gibson (he or they) | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you, not the other way | around. http://www.ozlabs.org/~dgibson
PATCH v2 2/4 srcpos: Define srcpos_free
In reply to Ayush Singhsrcpos can be chained together using srcpos_extend. However, in such cases, we need to free all the chained nodes.
srcpos_free is a helper to recursively free all the linked srcpos.
--- srcpos.c | 11 +++++++++++ srcpos.h | 1 + 2 files changed, 12 insertions(+)
srcpos.c +11 -0
@@ -287,6 +287,17 @@ struct srcpos *srcpos_extend(struct srcpos *pos, struct srcpos *newtail)return pos; } +void srcpos_free (struct srcpos *pos) +{ +struct srcpos *p_next; + +while (pos) { + p_next = pos->next; +free (pos); + pos = p_next; + } +} +char *srcpos_string (struct srcpos *pos) {
srcpos.h +1 -0
@@ -88,6 +88,7 @@ extern void srcpos_update(struct srcpos *pos, const char *text, int len);extern struct srcpos *srcpos_copy (struct srcpos *pos);extern struct srcpos *srcpos_extend (struct srcpos *new_srcpos,struct srcpos *old_srcpos); +extern void srcpos_free (struct srcpos *pos);extern char *srcpos_string (struct srcpos *pos);extern char *srcpos_string_first (struct srcpos *pos,int level);extern char *srcpos_string_last (struct srcpos *pos,int level);
Signature · 1 line
2.48.1
Re: [PATCH v2 2/4] srcpos: Define srcpos_free
Quoted 6 lines · Ayush Singh
srcpos can be chained together using
srcpos_extend. However, in such cases, we need to free all the chained nodes.
srcpos_freeis a helper to recursively free all the linked srcpos.Signed-off-by Ayush Singh <[email protected]>
This should also _use_ the new function in any existing places it make sense. On a quick glance I can only see one such place, in merge_nodes() where we use a plain free() on the srcpos info of an overwritten property.
Quoted 40 lines
--- srcpos.c | 11 +++++++++++ srcpos.h | 1 + 2 files changed, 12 insertions(+)srcpos.c +11
-0@@ -287,6 +287,17 @@ struct srcpos *srcpos_extend(struct srcpos *pos, struct srcpos *newtail)return pos; } +void srcpos_free (struct srcpos *pos) +{ +struct srcpos *p_next; + +while (pos) { + p_next = pos->next; +free (pos); + pos = p_next; + } +} +char *srcpos_string (struct srcpos *pos) {srcpos.h +1
-0@@ -88,6 +88,7 @@ extern void srcpos_update(struct srcpos *pos, const char *text, int len);extern struct srcpos *srcpos_copy (struct srcpos *pos);extern struct srcpos *srcpos_extend (struct srcpos *new_srcpos,struct srcpos *old_srcpos); +extern void srcpos_free (struct srcpos *pos);extern char *srcpos_string (struct srcpos *pos);extern char *srcpos_string_first (struct srcpos *pos,int level);extern char *srcpos_string_last (struct srcpos *pos,int level);
Signature · 4 lines
David Gibson (he or they) | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you, not the other way | around. http://www.ozlabs.org/~dgibson
PATCH v2 3/4 dtc: Add /./
In reply to Ayush SinghAllow constructing new values for a property using old property values. Can be used to append, pre-append, duplicate, etc.
In practice, it looks as follows:
dts-v1/;
/ {
str-prop = "0";
int-prop = <0>;
};/ {
str-prop = /./, "1", /./;
int-prop = /./, <1>, /./;
};dts to source output with -T -T also works as expected:
/dts-v1/;
/ { /* base.dts:3:3-5:3, base.dts:7:3-9:3 */
int-prop = <0x00 0x01>, <0x02 0x03>, <0x00 0x01>; /* base.dts:4:9-4:26, base.dts:8:9-8:36 */ }; /* base.dts:3:3-5:3, base.dts:7:3-9:3 */
--- dtc-lexer.l | 5 +++++ dtc-parser.y | 5 +++++ dtc.h | 1 + livetree.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 59 insertions(+), 2 deletions(-)
dtc-lexer.l +5 -0
@@ -144,6 +144,11 @@ static void PRINTF(1, 2) lexical_error(const char *fmt, ...); return DT_OMIT_NO_REF; } +<*>"/./" { + DPRINT("Keyword: /./\n"); + return DT_PREV_PROP; + } + <*>{LABEL}: { DPRINT("Label: %s\n", yytext); yylval.labelref = xstrdup(yytext);
dtc-parser.y +5 -0
@@ -57,6 +57,7 @@ static bool is_ref_relative(const char *ref) %token DT_LSHIFT DT_RSHIFT DT_LE DT_GE DT_EQ DT_NE DT_AND DT_OR %token DT_BITS %token DT_DEL_PROP +%token DT_PREV_PROP %token DT_DEL_NODE %token DT_OMIT_NO_REF %token <propnodename> DT_PROPNODENAME
@@ -308,6 +309,10 @@ propdata: { $$ = data_merge($1, $2); } + | propdataprefix DT_PREV_PROP + { + $$ = data_add_marker($1, PREV_VALUE, NULL); + } | propdataprefix arrayprefix '>' { $$ = data_merge($1, $2.data);
dtc.h +1 -0
@@ -110,6 +110,7 @@ enum markertype {REF_PHANDLE ,REF_PATH ,LABEL , +PREV_VALUE ,TYPE_UINT8 ,TYPE_UINT16 , TYPE_UINT32,
livetree.c +48 -2
68 lines not on this page · raw message
Signature · 1 line
2.48.1
Re: [PATCH v2 3/4] dtc: Add /./
Quoted 17 lines · Ayush Singh
Allow constructing new values for a property using old property values. Can be used to append, pre-append, duplicate, etc.
In practice, it looks as follows:
dts-v1/;
/ { str-prop = "0"; int-prop = <0>; };/ { str-prop = /./, "1", /./; int-prop = /./, <1>, /./; };
Quoted 7 lines
dts to source output with -T -T also works as expected:
/dts-v1/;
/ { /* base.dts:3:3-5:3, base.dts:7:3-9:3 */
int-prop = <0x00 0x01>, <0x02 0x03>, <0x00 0x01>; /* base.dts:4:9-4:26, base.dts:8:9-8:36 */ }; /* base.dts:3:3-5:3, base.dts:7:3-9:3 */
I think it will be a bit easier to understand if the two examples correspond to another, i.e. to have both int-prop and str-prop with the matching value from the first example in this example.
Re: [PATCH v2 3/4] dtc: Add /./
In reply to Ayush SinghQuoted 54 lines · Ayush Singh
Allow constructing new values for a property using old property values. Can be used to append, pre-append, duplicate, etc.
In practice, it looks as follows:
dts-v1/;
/ { str-prop = "0"; int-prop = <0>; };/ { str-prop = /./, "1", /./; int-prop = /./, <1>, /./; };dts to source output with -T -T also works as expected:
/dts-v1/;
/ { /* base.dts:3:3-5:3, base.dts:7:3-9:3 */
int-prop = <0x00 0x01>, <0x02 0x03>, <0x00 0x01>; /* base.dts:4:9-4:26, base.dts:8:9-8:36 */ }; /* base.dts:3:3-5:3, base.dts:7:3-9:3 */Signed-off-by Ayush Singh <[email protected]>--- dtc-lexer.l | 5 +++++ dtc-parser.y | 5 +++++ dtc.h | 1 + livetree.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++-- 4 files changed, 59 insertions(+), 2 deletions(-)dtc-lexer.l +5
-0@@ -144,6 +144,11 @@ static void PRINTF(1, 2) lexical_error(const char *fmt, ...); return DT_OMIT_NO_REF; } +<*>"/./" { + DPRINT("Keyword: /./\n"); + return DT_PREV_PROP; + } + <*>{LABEL}: { DPRINT("Label: %s\n", yytext); yylval.labelref = xstrdup(yytext);dtc-parser.y +0
-0
dtc-parser.y static bool is_ref_relative(const char *ref) · line 60
Quoted 4 lines
dtc-parser.y +1
-0@@ -57,6 +57,7 @@ static bool is_ref_relative(const char *ref) %token DT_LSHIFT DT_RSHIFT DT_LE DT_GE DT_EQ DT_NE DT_AND DT_OR %token DT_BITS %token DT_DEL_PROP +%token DT_PREV_PROP
I think DT_PREV_VALUE would be a better name. "prev prop" suggests the property defined immediately above, rather than the previous value of this property.
Quoted 31 lines
dtc-parser.y +4
-0%token DT_DEL_NODE %token DT_OMIT_NO_REF %token <propnodename> DT_PROPNODENAME@@ -308,6 +309,10 @@ propdata: { $$ = data_merge($1, $2); } + | propdataprefix DT_PREV_PROP + { + $$ = data_add_marker($1, PREV_VALUE, NULL); + } | propdataprefix arrayprefix '>' { $$ = data_merge($1, $2.data);dtc.h +1
-0@@ -110,6 +110,7 @@ enum markertype {REF_PHANDLE ,REF_PATH ,LABEL , +PREV_VALUE ,TYPE_UINT8 ,TYPE_UINT16 , TYPE_UINT32,livetree.c +0
-0
livetree.c struct node *reference_node(struct node *node) · line 143
Quoted 5 lines
livetree.c +2
-0@@ -139,10 +139,40 @@ struct node *reference_node(struct node *node)return node; } +static struct data data_insert_old_value (struct data d,struct marker *m, +struct data old)
Nothing in this function requires 'old' to be the previous value of the property. So 'data_insert_data()' would be a better name. It's also strictly about manipulating a struct data so it should go in data.c, not livetree.c.
Quoted 21 lines
livetree.c +21
-0+{ +unsigned int offset = m->offset; +struct marker *next = m->next; +struct marker *marker; +struct data new_data; +char *ref; + + new_data =data_insert_at_marker (d, m, old.val, old.len); + +/* Copy all markers from old value */ + marker = old.markers; +for_each_marker (marker) { + ref =NULL ; + +if (marker->ref) + ref =xstrdup (marker->ref); + + m->next =alloc_marker (marker->offset + offset, marker->type, + ref); + m = m->next; + }
livetree.c struct node *reference_node(struct node *node) · line 174
Quoted 10 lines
livetree.c +6
-0+ m->next = next; + +return new_data; +} +struct node *merge_nodes (struct node *old_node,struct node *new_node) {struct property *new_prop, *old_prop;struct node *new_child, *old_child; +bool prev_value_used = false;
This is logically per-property, not per-node. So it needs to be initialised to false for each property, not just once per node. So it might as well be local to the first while loop as well.
Quoted 34 lines
livetree.c +19
-2+struct marker *marker;struct label *l; old_node->deleted =0 ;@@ -172,10 +202,26 @@ struct node *merge_nodes(struct node *old_node, struct node *new_node)for_each_label_withdel (new_prop->labels, l)add_label (&old_prop->labels, l->label); + marker = new_prop->val.markers; +for_each_marker_of_type (marker,PREV_VALUE ) { + new_prop->val =data_insert_old_value ( + new_prop->val, marker, + old_prop->val); + prev_value_used = true; + } + old_prop->val = new_prop->val; old_prop->deleted =0 ; -free (old_prop->srcpos); - old_prop->srcpos = new_prop->srcpos; + +if (prev_value_used) { + old_prop->srcpos = +srcpos_extend (old_prop->srcpos, + new_prop->srcpos); + }else { +srcpos_free (old_prop->srcpos); + old_prop->srcpos = new_prop->srcpos; + } +free (new_prop); new_prop =NULL ;break ;
Signature · 4 lines
David Gibson (he or they) | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you, not the other way | around. http://www.ozlabs.org/~dgibson
PATCH v2 4/4 tests: Add test for /./
In reply to Ayush Singh- Test /./ on a string and int array.
- Also test on subnode property.
--- tests/prev_prop.dts | 25 +++++++++++++++++++++++++ tests/prev_prop_expected.dts | 13 +++++++++++++ tests/run_tests.sh | 5 +++++ 3 files changed, 43 insertions(+)
tests/prev_prop.dts new file +25 -0
@@ -0,0 +1,25 @@ +/dts-v1/; + +/ { + str-prop = "1", "2"; + int-prop = <1 2>; + + mixed-prop = "1", <0>; + + subnode { + str-prop = "1", "2"; + int-prop = <1 2>; + }; +}; + +/ { + str-prop = /./, "3", "4", /./, "6"; + int-prop = /./, <3 4>, /./, <6>; + + mixed-prop = <1>, /./, "0"; + + subnode { + str-prop = /./, "3", "4", /./; + int-prop = /./, <3 4>, /./; + }; +};
tests/prev_prop_expected.dts new file +13 -0
@@ -0,0 +1,13 @@ +/dts-v1/; + +/ { + str-prop = "1", "2", "3", "4", "1", "2", "6"; + int-prop = <1 2 3 4 1 2 6>; + + mixed-prop = <1>, "1", <0>, "0"; + + subnode { + str-prop = "1", "2", "3", "4", "1", "2"; + int-prop = <1 2 3 4 1 2>; + }; +};
tests/run_tests.sh +5 -0
@@ -708,6 +708,11 @@ dtc_tests () { run_dtc_test -I dts -O dtb -o dtc_tree1_delete.test.dtb "$SRCDIR/test_tree1_delete.dts" tree1_tests dtc_tree1_delete.test.dtb + # Check previous property functionality + run_dtc_test -I dts -O dtb -o prev_prop.test.dtb "$SRCDIR/prev_prop.dts" + run_dtc_test -I dts -O dtb -o prev_prop_expected.test.dtb "$SRCDIR/prev_prop_expected.dts" + run_test dtbs_equal_ordered prev_prop.test.dtb prev_prop_expected.test.dtb + # Check omit-if-no-ref functionality run_dtc_test -I dts -O dtb -o omit-no-ref.test.dtb "$SRCDIR/omit-no-ref.dts" run_test check_path omit-no-ref.test.dtb not-exists "/node1"
Signature · 1 line
2.48.1