2019-06-20 23:19:38 +02:00
|
|
|
// SPDX-License-Identifier: GPL-2.0-or-later
|
2005-06-08 09:18:34 +02:00
|
|
|
/*
|
|
|
|
* (C) Copyright David Gibson <dwg@au1.ibm.com>, IBM Corporation. 2005.
|
|
|
|
*/
|
|
|
|
|
|
|
|
#include "dtc.h"
|
annotations: add positions
Extend the parser to record positions, in build_node,
build_node_delete, and build_property.
srcpos structures are added to the property and node types, and to the
parameter lists of the above functions that construct these types.
Nodes and properties that are created by the compiler rather than from
parsing source code have NULL as the srcpos value.
merge_nodes, defined in livetree.c, uses srcpos_extend to combine
multiple positions, resulting in a list of positions. srcpos_extend
is defined in srcpos.c. New elements are added at the end. This
requires the srcpos type, define in srcpos.h, to be a list structure
with a next field. This next field is initialized to NULL in
srcpos.h, in the macro YYLLOC_DEFAULT invoked implicitly by the
generated parser code.
Another change to srcpos.c is to make srcpos_copy always do a full
copy, including a copy of the file substructure. This is required
because when dtc is used on the output of cpp, the successive detected
file names overwrite the file name in the file structure. The next
field does not need to be deep copied, because it is always NULL when
srcpos_copy is called; an assert checks for this. File names are only
updated in uncopied position structures.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-11-16 17:29:59 +01:00
|
|
|
#include "srcpos.h"
|
2005-06-08 09:18:34 +02:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Tree building functions
|
|
|
|
*/
|
|
|
|
|
2010-02-24 08:22:17 +01:00
|
|
|
void add_label(struct label **labels, char *label)
|
|
|
|
{
|
2010-02-25 17:58:29 +01:00
|
|
|
struct label *new;
|
2010-02-24 08:22:17 +01:00
|
|
|
|
2010-02-25 17:58:29 +01:00
|
|
|
/* Make sure the label isn't already there */
|
2012-08-08 06:50:15 +02:00
|
|
|
for_each_label_withdel(*labels, new)
|
|
|
|
if (streq(new->label, label)) {
|
|
|
|
new->deleted = 0;
|
2010-02-25 17:58:29 +01:00
|
|
|
return;
|
2012-08-08 06:50:15 +02:00
|
|
|
}
|
2010-02-25 17:58:29 +01:00
|
|
|
|
|
|
|
new = xmalloc(sizeof(*new));
|
2012-09-28 20:39:22 +02:00
|
|
|
memset(new, 0, sizeof(*new));
|
2010-02-24 08:22:17 +01:00
|
|
|
new->label = label;
|
|
|
|
new->next = *labels;
|
|
|
|
*labels = new;
|
|
|
|
}
|
|
|
|
|
2012-08-08 06:50:15 +02:00
|
|
|
void delete_labels(struct label **labels)
|
|
|
|
{
|
|
|
|
struct label *label;
|
|
|
|
|
|
|
|
for_each_label(*labels, label)
|
|
|
|
label->deleted = 1;
|
|
|
|
}
|
|
|
|
|
annotations: add positions
Extend the parser to record positions, in build_node,
build_node_delete, and build_property.
srcpos structures are added to the property and node types, and to the
parameter lists of the above functions that construct these types.
Nodes and properties that are created by the compiler rather than from
parsing source code have NULL as the srcpos value.
merge_nodes, defined in livetree.c, uses srcpos_extend to combine
multiple positions, resulting in a list of positions. srcpos_extend
is defined in srcpos.c. New elements are added at the end. This
requires the srcpos type, define in srcpos.h, to be a list structure
with a next field. This next field is initialized to NULL in
srcpos.h, in the macro YYLLOC_DEFAULT invoked implicitly by the
generated parser code.
Another change to srcpos.c is to make srcpos_copy always do a full
copy, including a copy of the file substructure. This is required
because when dtc is used on the output of cpp, the successive detected
file names overwrite the file name in the file structure. The next
field does not need to be deep copied, because it is always NULL when
srcpos_copy is called; an assert checks for this. File names are only
updated in uncopied position structures.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-11-16 17:29:59 +01:00
|
|
|
struct property *build_property(char *name, struct data val,
|
|
|
|
struct srcpos *srcpos)
|
2005-06-08 09:18:34 +02:00
|
|
|
{
|
|
|
|
struct property *new = xmalloc(sizeof(*new));
|
|
|
|
|
2010-02-24 08:22:17 +01:00
|
|
|
memset(new, 0, sizeof(*new));
|
|
|
|
|
2005-06-08 09:18:34 +02:00
|
|
|
new->name = name;
|
|
|
|
new->val = val;
|
annotations: add positions
Extend the parser to record positions, in build_node,
build_node_delete, and build_property.
srcpos structures are added to the property and node types, and to the
parameter lists of the above functions that construct these types.
Nodes and properties that are created by the compiler rather than from
parsing source code have NULL as the srcpos value.
merge_nodes, defined in livetree.c, uses srcpos_extend to combine
multiple positions, resulting in a list of positions. srcpos_extend
is defined in srcpos.c. New elements are added at the end. This
requires the srcpos type, define in srcpos.h, to be a list structure
with a next field. This next field is initialized to NULL in
srcpos.h, in the macro YYLLOC_DEFAULT invoked implicitly by the
generated parser code.
Another change to srcpos.c is to make srcpos_copy always do a full
copy, including a copy of the file substructure. This is required
because when dtc is used on the output of cpp, the successive detected
file names overwrite the file name in the file structure. The next
field does not need to be deep copied, because it is always NULL when
srcpos_copy is called; an assert checks for this. File names are only
updated in uncopied position structures.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-11-16 17:29:59 +01:00
|
|
|
new->srcpos = srcpos_copy(srcpos);
|
2005-06-08 09:18:34 +02:00
|
|
|
|
|
|
|
return new;
|
|
|
|
}
|
|
|
|
|
2012-08-08 06:50:15 +02:00
|
|
|
struct property *build_property_delete(char *name)
|
|
|
|
{
|
|
|
|
struct property *new = xmalloc(sizeof(*new));
|
|
|
|
|
|
|
|
memset(new, 0, sizeof(*new));
|
|
|
|
|
|
|
|
new->name = name;
|
|
|
|
new->deleted = 1;
|
|
|
|
|
|
|
|
return new;
|
|
|
|
}
|
|
|
|
|
2005-06-08 09:18:34 +02:00
|
|
|
struct property *chain_property(struct property *first, struct property *list)
|
|
|
|
{
|
|
|
|
assert(first->next == NULL);
|
2007-09-18 03:44:04 +02:00
|
|
|
|
2005-06-08 09:18:34 +02:00
|
|
|
first->next = list;
|
2007-09-18 03:44:04 +02:00
|
|
|
return first;
|
2005-06-08 09:18:34 +02:00
|
|
|
}
|
|
|
|
|
2007-10-22 23:09:56 +02:00
|
|
|
struct property *reverse_properties(struct property *first)
|
|
|
|
{
|
|
|
|
struct property *p = first;
|
|
|
|
struct property *head = NULL;
|
|
|
|
struct property *next;
|
|
|
|
|
|
|
|
while (p) {
|
|
|
|
next = p->next;
|
|
|
|
p->next = head;
|
|
|
|
head = p;
|
|
|
|
p = next;
|
|
|
|
}
|
|
|
|
return head;
|
|
|
|
}
|
|
|
|
|
annotations: add positions
Extend the parser to record positions, in build_node,
build_node_delete, and build_property.
srcpos structures are added to the property and node types, and to the
parameter lists of the above functions that construct these types.
Nodes and properties that are created by the compiler rather than from
parsing source code have NULL as the srcpos value.
merge_nodes, defined in livetree.c, uses srcpos_extend to combine
multiple positions, resulting in a list of positions. srcpos_extend
is defined in srcpos.c. New elements are added at the end. This
requires the srcpos type, define in srcpos.h, to be a list structure
with a next field. This next field is initialized to NULL in
srcpos.h, in the macro YYLLOC_DEFAULT invoked implicitly by the
generated parser code.
Another change to srcpos.c is to make srcpos_copy always do a full
copy, including a copy of the file substructure. This is required
because when dtc is used on the output of cpp, the successive detected
file names overwrite the file name in the file structure. The next
field does not need to be deep copied, because it is always NULL when
srcpos_copy is called; an assert checks for this. File names are only
updated in uncopied position structures.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-11-16 17:29:59 +01:00
|
|
|
struct node *build_node(struct property *proplist, struct node *children,
|
|
|
|
struct srcpos *srcpos)
|
2005-06-08 09:18:34 +02:00
|
|
|
{
|
|
|
|
struct node *new = xmalloc(sizeof(*new));
|
|
|
|
struct node *child;
|
|
|
|
|
|
|
|
memset(new, 0, sizeof(*new));
|
|
|
|
|
2007-10-22 23:09:56 +02:00
|
|
|
new->proplist = reverse_properties(proplist);
|
2005-06-08 09:18:34 +02:00
|
|
|
new->children = children;
|
annotations: add positions
Extend the parser to record positions, in build_node,
build_node_delete, and build_property.
srcpos structures are added to the property and node types, and to the
parameter lists of the above functions that construct these types.
Nodes and properties that are created by the compiler rather than from
parsing source code have NULL as the srcpos value.
merge_nodes, defined in livetree.c, uses srcpos_extend to combine
multiple positions, resulting in a list of positions. srcpos_extend
is defined in srcpos.c. New elements are added at the end. This
requires the srcpos type, define in srcpos.h, to be a list structure
with a next field. This next field is initialized to NULL in
srcpos.h, in the macro YYLLOC_DEFAULT invoked implicitly by the
generated parser code.
Another change to srcpos.c is to make srcpos_copy always do a full
copy, including a copy of the file substructure. This is required
because when dtc is used on the output of cpp, the successive detected
file names overwrite the file name in the file structure. The next
field does not need to be deep copied, because it is always NULL when
srcpos_copy is called; an assert checks for this. File names are only
updated in uncopied position structures.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-11-16 17:29:59 +01:00
|
|
|
new->srcpos = srcpos_copy(srcpos);
|
2005-06-08 09:18:34 +02:00
|
|
|
|
|
|
|
for_each_child(new, child) {
|
|
|
|
child->parent = new;
|
|
|
|
}
|
|
|
|
|
|
|
|
return new;
|
|
|
|
}
|
|
|
|
|
annotations: add positions
Extend the parser to record positions, in build_node,
build_node_delete, and build_property.
srcpos structures are added to the property and node types, and to the
parameter lists of the above functions that construct these types.
Nodes and properties that are created by the compiler rather than from
parsing source code have NULL as the srcpos value.
merge_nodes, defined in livetree.c, uses srcpos_extend to combine
multiple positions, resulting in a list of positions. srcpos_extend
is defined in srcpos.c. New elements are added at the end. This
requires the srcpos type, define in srcpos.h, to be a list structure
with a next field. This next field is initialized to NULL in
srcpos.h, in the macro YYLLOC_DEFAULT invoked implicitly by the
generated parser code.
Another change to srcpos.c is to make srcpos_copy always do a full
copy, including a copy of the file substructure. This is required
because when dtc is used on the output of cpp, the successive detected
file names overwrite the file name in the file structure. The next
field does not need to be deep copied, because it is always NULL when
srcpos_copy is called; an assert checks for this. File names are only
updated in uncopied position structures.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-11-16 17:29:59 +01:00
|
|
|
struct node *build_node_delete(struct srcpos *srcpos)
|
2012-08-08 06:50:15 +02:00
|
|
|
{
|
|
|
|
struct node *new = xmalloc(sizeof(*new));
|
|
|
|
|
|
|
|
memset(new, 0, sizeof(*new));
|
|
|
|
|
|
|
|
new->deleted = 1;
|
annotations: add positions
Extend the parser to record positions, in build_node,
build_node_delete, and build_property.
srcpos structures are added to the property and node types, and to the
parameter lists of the above functions that construct these types.
Nodes and properties that are created by the compiler rather than from
parsing source code have NULL as the srcpos value.
merge_nodes, defined in livetree.c, uses srcpos_extend to combine
multiple positions, resulting in a list of positions. srcpos_extend
is defined in srcpos.c. New elements are added at the end. This
requires the srcpos type, define in srcpos.h, to be a list structure
with a next field. This next field is initialized to NULL in
srcpos.h, in the macro YYLLOC_DEFAULT invoked implicitly by the
generated parser code.
Another change to srcpos.c is to make srcpos_copy always do a full
copy, including a copy of the file substructure. This is required
because when dtc is used on the output of cpp, the successive detected
file names overwrite the file name in the file structure. The next
field does not need to be deep copied, because it is always NULL when
srcpos_copy is called; an assert checks for this. File names are only
updated in uncopied position structures.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-11-16 17:29:59 +01:00
|
|
|
new->srcpos = srcpos_copy(srcpos);
|
2012-08-08 06:50:15 +02:00
|
|
|
|
|
|
|
return new;
|
|
|
|
}
|
|
|
|
|
2010-02-24 08:22:17 +01:00
|
|
|
struct node *name_node(struct node *node, char *name)
|
2005-06-08 09:18:34 +02:00
|
|
|
{
|
|
|
|
assert(node->name == NULL);
|
|
|
|
|
|
|
|
node->name = name;
|
2005-06-16 06:36:37 +02:00
|
|
|
|
2005-06-08 09:18:34 +02:00
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
dtc: add ability to make nodes conditional on them being referenced
A number of platforms have a need to reduce the number of DT nodes,
mostly because of two similar constraints: the size of the DT blob, and
the time it takes to parse it.
As the DT is used in more and more SoCs, and by more projects, some
constraints start to appear in bootloaders running from SRAM with an
order of magnitude of 10kB. A typical DT is in the same order of
magnitude, so any effort to reduce the blob size is welcome in such an
environment.
Some platforms also want to reach very fast boot time, and the time it
takes to parse a typical DT starts to be noticeable.
Both of these issues can be mitigated by reducing the number of nodes in
the DT. The biggest provider of nodes is usually the pin controller and
its subnodes, usually one for each valid pin configuration in a given
SoC.
Obviously, a single, fixed, set of these nodes will be used by a given
board, so we can introduce a node property that will tell the DT
compiler to drop the nodes when they are not referenced in the tree, and
as such wouldn't be useful in the targetted system.
Signed-off-by: Maxime Ripard <maxime.ripard@bootlin.com>
Reviewed-by: Rob Herring <robh@kernel.org>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-05-03 22:27:26 +02:00
|
|
|
struct node *omit_node_if_unused(struct node *node)
|
|
|
|
{
|
|
|
|
node->omit_if_unused = 1;
|
|
|
|
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct node *reference_node(struct node *node)
|
|
|
|
{
|
|
|
|
node->is_referenced = 1;
|
|
|
|
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
2010-02-25 17:58:29 +01:00
|
|
|
struct node *merge_nodes(struct node *old_node, struct node *new_node)
|
|
|
|
{
|
|
|
|
struct property *new_prop, *old_prop;
|
|
|
|
struct node *new_child, *old_child;
|
|
|
|
struct label *l;
|
|
|
|
|
2012-08-08 06:50:15 +02:00
|
|
|
old_node->deleted = 0;
|
|
|
|
|
2010-02-25 17:58:29 +01:00
|
|
|
/* Add new node labels to old node */
|
2012-08-08 06:50:15 +02:00
|
|
|
for_each_label_withdel(new_node->labels, l)
|
2010-02-25 17:58:29 +01:00
|
|
|
add_label(&old_node->labels, l->label);
|
|
|
|
|
|
|
|
/* Move properties from the new node to the old node. If there
|
|
|
|
* is a collision, replace the old value with the new */
|
|
|
|
while (new_node->proplist) {
|
|
|
|
/* Pop the property off the list */
|
|
|
|
new_prop = new_node->proplist;
|
|
|
|
new_node->proplist = new_prop->next;
|
|
|
|
new_prop->next = NULL;
|
|
|
|
|
2012-08-08 06:50:15 +02:00
|
|
|
if (new_prop->deleted) {
|
|
|
|
delete_property_by_name(old_node, new_prop->name);
|
|
|
|
free(new_prop);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2010-02-25 17:58:29 +01:00
|
|
|
/* Look for a collision, set new value if there is */
|
2012-08-08 06:50:15 +02:00
|
|
|
for_each_property_withdel(old_node, old_prop) {
|
2010-02-25 17:58:29 +01:00
|
|
|
if (streq(old_prop->name, new_prop->name)) {
|
|
|
|
/* Add new labels to old property */
|
2012-08-08 06:50:15 +02:00
|
|
|
for_each_label_withdel(new_prop->labels, l)
|
2010-02-25 17:58:29 +01:00
|
|
|
add_label(&old_prop->labels, l->label);
|
|
|
|
|
|
|
|
old_prop->val = new_prop->val;
|
2012-08-08 06:50:15 +02:00
|
|
|
old_prop->deleted = 0;
|
annotations: add positions
Extend the parser to record positions, in build_node,
build_node_delete, and build_property.
srcpos structures are added to the property and node types, and to the
parameter lists of the above functions that construct these types.
Nodes and properties that are created by the compiler rather than from
parsing source code have NULL as the srcpos value.
merge_nodes, defined in livetree.c, uses srcpos_extend to combine
multiple positions, resulting in a list of positions. srcpos_extend
is defined in srcpos.c. New elements are added at the end. This
requires the srcpos type, define in srcpos.h, to be a list structure
with a next field. This next field is initialized to NULL in
srcpos.h, in the macro YYLLOC_DEFAULT invoked implicitly by the
generated parser code.
Another change to srcpos.c is to make srcpos_copy always do a full
copy, including a copy of the file substructure. This is required
because when dtc is used on the output of cpp, the successive detected
file names overwrite the file name in the file structure. The next
field does not need to be deep copied, because it is always NULL when
srcpos_copy is called; an assert checks for this. File names are only
updated in uncopied position structures.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-11-16 17:29:59 +01:00
|
|
|
free(old_prop->srcpos);
|
|
|
|
old_prop->srcpos = new_prop->srcpos;
|
2010-02-25 17:58:29 +01:00
|
|
|
free(new_prop);
|
|
|
|
new_prop = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
/* if no collision occurred, add property to the old node. */
|
|
|
|
if (new_prop)
|
|
|
|
add_property(old_node, new_prop);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Move the override child nodes into the primary node. If
|
|
|
|
* there is a collision, then merge the nodes. */
|
|
|
|
while (new_node->children) {
|
|
|
|
/* Pop the child node off the list */
|
|
|
|
new_child = new_node->children;
|
|
|
|
new_node->children = new_child->next_sibling;
|
|
|
|
new_child->parent = NULL;
|
|
|
|
new_child->next_sibling = NULL;
|
|
|
|
|
2012-08-08 06:50:15 +02:00
|
|
|
if (new_child->deleted) {
|
|
|
|
delete_node_by_name(old_node, new_child->name);
|
|
|
|
free(new_child);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
2010-02-25 17:58:29 +01:00
|
|
|
/* Search for a collision. Merge if there is */
|
2012-08-08 06:50:15 +02:00
|
|
|
for_each_child_withdel(old_node, old_child) {
|
2010-02-25 17:58:29 +01:00
|
|
|
if (streq(old_child->name, new_child->name)) {
|
|
|
|
merge_nodes(old_child, new_child);
|
|
|
|
new_child = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-09-26 18:12:26 +02:00
|
|
|
/* if no collision occurred, add child to the old node. */
|
2010-02-25 17:58:29 +01:00
|
|
|
if (new_child)
|
|
|
|
add_child(old_node, new_child);
|
|
|
|
}
|
|
|
|
|
annotations: add positions
Extend the parser to record positions, in build_node,
build_node_delete, and build_property.
srcpos structures are added to the property and node types, and to the
parameter lists of the above functions that construct these types.
Nodes and properties that are created by the compiler rather than from
parsing source code have NULL as the srcpos value.
merge_nodes, defined in livetree.c, uses srcpos_extend to combine
multiple positions, resulting in a list of positions. srcpos_extend
is defined in srcpos.c. New elements are added at the end. This
requires the srcpos type, define in srcpos.h, to be a list structure
with a next field. This next field is initialized to NULL in
srcpos.h, in the macro YYLLOC_DEFAULT invoked implicitly by the
generated parser code.
Another change to srcpos.c is to make srcpos_copy always do a full
copy, including a copy of the file substructure. This is required
because when dtc is used on the output of cpp, the successive detected
file names overwrite the file name in the file structure. The next
field does not need to be deep copied, because it is always NULL when
srcpos_copy is called; an assert checks for this. File names are only
updated in uncopied position structures.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-11-16 17:29:59 +01:00
|
|
|
old_node->srcpos = srcpos_extend(old_node->srcpos, new_node->srcpos);
|
|
|
|
|
2010-02-25 17:58:29 +01:00
|
|
|
/* The new node contents are now merged into the old node. Free
|
|
|
|
* the new node. */
|
|
|
|
free(new_node);
|
|
|
|
|
|
|
|
return old_node;
|
|
|
|
}
|
|
|
|
|
2017-11-20 18:12:18 +01:00
|
|
|
struct node * add_orphan_node(struct node *dt, struct node *new_node, char *ref)
|
2017-06-14 16:53:05 +02:00
|
|
|
{
|
|
|
|
static unsigned int next_orphan_fragment = 0;
|
|
|
|
struct node *node;
|
|
|
|
struct property *p;
|
|
|
|
struct data d = empty_data;
|
|
|
|
char *name;
|
|
|
|
|
Correct overlay syntactic sugar for generating target-path fragments
We've recently added "syntactic sugar" support to generate runtime dtb
overlays using similar syntax to the compile time overlays we've had for
a while. This worked with the &label { ... } syntax, adjusting an existing
labelled node, but would fail with the &{/path} { ... } syntax attempting
to adjust an existing node referenced by its path.
The previous code would always try to use the "target" property in the
output overlay, which needs to be fixed up, and __fixups__ can only encode
symbols, not paths, so the result could never work properly.
This adds support for the &{/path} syntax for overlays, translating it into
the "target-path" encoding in the output. It also changes existing
behaviour a little because we now unconditionally one fragment for each
overlay section in the source. Previously we would only create a fragment
if we couldn't locally resolve the node referenced. We need this for
path references, because the path is supposed to be referencing something
in the (not yet known) base tree, rather than the overlay tree we are
working with now. In particular one useful case for path based overlays
is using &{/} - but the constructed overlay tree will always have a root
node, meaning that without the change that would attempt to resolve the
fragment locally, which is not what we want.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-03-06 03:27:53 +01:00
|
|
|
if (ref[0] == '/') {
|
2019-05-17 22:28:04 +02:00
|
|
|
d = data_add_marker(d, TYPE_STRING, ref);
|
Correct overlay syntactic sugar for generating target-path fragments
We've recently added "syntactic sugar" support to generate runtime dtb
overlays using similar syntax to the compile time overlays we've had for
a while. This worked with the &label { ... } syntax, adjusting an existing
labelled node, but would fail with the &{/path} { ... } syntax attempting
to adjust an existing node referenced by its path.
The previous code would always try to use the "target" property in the
output overlay, which needs to be fixed up, and __fixups__ can only encode
symbols, not paths, so the result could never work properly.
This adds support for the &{/path} syntax for overlays, translating it into
the "target-path" encoding in the output. It also changes existing
behaviour a little because we now unconditionally one fragment for each
overlay section in the source. Previously we would only create a fragment
if we couldn't locally resolve the node referenced. We need this for
path references, because the path is supposed to be referencing something
in the (not yet known) base tree, rather than the overlay tree we are
working with now. In particular one useful case for path based overlays
is using &{/} - but the constructed overlay tree will always have a root
node, meaning that without the change that would attempt to resolve the
fragment locally, which is not what we want.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-03-06 03:27:53 +01:00
|
|
|
d = data_append_data(d, ref, strlen(ref) + 1);
|
2017-06-14 16:53:05 +02:00
|
|
|
|
annotations: add positions
Extend the parser to record positions, in build_node,
build_node_delete, and build_property.
srcpos structures are added to the property and node types, and to the
parameter lists of the above functions that construct these types.
Nodes and properties that are created by the compiler rather than from
parsing source code have NULL as the srcpos value.
merge_nodes, defined in livetree.c, uses srcpos_extend to combine
multiple positions, resulting in a list of positions. srcpos_extend
is defined in srcpos.c. New elements are added at the end. This
requires the srcpos type, define in srcpos.h, to be a list structure
with a next field. This next field is initialized to NULL in
srcpos.h, in the macro YYLLOC_DEFAULT invoked implicitly by the
generated parser code.
Another change to srcpos.c is to make srcpos_copy always do a full
copy, including a copy of the file substructure. This is required
because when dtc is used on the output of cpp, the successive detected
file names overwrite the file name in the file structure. The next
field does not need to be deep copied, because it is always NULL when
srcpos_copy is called; an assert checks for this. File names are only
updated in uncopied position structures.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-11-16 17:29:59 +01:00
|
|
|
p = build_property("target-path", d, NULL);
|
Correct overlay syntactic sugar for generating target-path fragments
We've recently added "syntactic sugar" support to generate runtime dtb
overlays using similar syntax to the compile time overlays we've had for
a while. This worked with the &label { ... } syntax, adjusting an existing
labelled node, but would fail with the &{/path} { ... } syntax attempting
to adjust an existing node referenced by its path.
The previous code would always try to use the "target" property in the
output overlay, which needs to be fixed up, and __fixups__ can only encode
symbols, not paths, so the result could never work properly.
This adds support for the &{/path} syntax for overlays, translating it into
the "target-path" encoding in the output. It also changes existing
behaviour a little because we now unconditionally one fragment for each
overlay section in the source. Previously we would only create a fragment
if we couldn't locally resolve the node referenced. We need this for
path references, because the path is supposed to be referencing something
in the (not yet known) base tree, rather than the overlay tree we are
working with now. In particular one useful case for path based overlays
is using &{/} - but the constructed overlay tree will always have a root
node, meaning that without the change that would attempt to resolve the
fragment locally, which is not what we want.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-03-06 03:27:53 +01:00
|
|
|
} else {
|
|
|
|
d = data_add_marker(d, REF_PHANDLE, ref);
|
|
|
|
d = data_append_integer(d, 0xffffffff, 32);
|
|
|
|
|
annotations: add positions
Extend the parser to record positions, in build_node,
build_node_delete, and build_property.
srcpos structures are added to the property and node types, and to the
parameter lists of the above functions that construct these types.
Nodes and properties that are created by the compiler rather than from
parsing source code have NULL as the srcpos value.
merge_nodes, defined in livetree.c, uses srcpos_extend to combine
multiple positions, resulting in a list of positions. srcpos_extend
is defined in srcpos.c. New elements are added at the end. This
requires the srcpos type, define in srcpos.h, to be a list structure
with a next field. This next field is initialized to NULL in
srcpos.h, in the macro YYLLOC_DEFAULT invoked implicitly by the
generated parser code.
Another change to srcpos.c is to make srcpos_copy always do a full
copy, including a copy of the file substructure. This is required
because when dtc is used on the output of cpp, the successive detected
file names overwrite the file name in the file structure. The next
field does not need to be deep copied, because it is always NULL when
srcpos_copy is called; an assert checks for this. File names are only
updated in uncopied position structures.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-11-16 17:29:59 +01:00
|
|
|
p = build_property("target", d, NULL);
|
Correct overlay syntactic sugar for generating target-path fragments
We've recently added "syntactic sugar" support to generate runtime dtb
overlays using similar syntax to the compile time overlays we've had for
a while. This worked with the &label { ... } syntax, adjusting an existing
labelled node, but would fail with the &{/path} { ... } syntax attempting
to adjust an existing node referenced by its path.
The previous code would always try to use the "target" property in the
output overlay, which needs to be fixed up, and __fixups__ can only encode
symbols, not paths, so the result could never work properly.
This adds support for the &{/path} syntax for overlays, translating it into
the "target-path" encoding in the output. It also changes existing
behaviour a little because we now unconditionally one fragment for each
overlay section in the source. Previously we would only create a fragment
if we couldn't locally resolve the node referenced. We need this for
path references, because the path is supposed to be referencing something
in the (not yet known) base tree, rather than the overlay tree we are
working with now. In particular one useful case for path based overlays
is using &{/} - but the constructed overlay tree will always have a root
node, meaning that without the change that would attempt to resolve the
fragment locally, which is not what we want.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-03-06 03:27:53 +01:00
|
|
|
}
|
2017-06-14 16:53:05 +02:00
|
|
|
|
|
|
|
xasprintf(&name, "fragment@%u",
|
|
|
|
next_orphan_fragment++);
|
|
|
|
name_node(new_node, "__overlay__");
|
annotations: add positions
Extend the parser to record positions, in build_node,
build_node_delete, and build_property.
srcpos structures are added to the property and node types, and to the
parameter lists of the above functions that construct these types.
Nodes and properties that are created by the compiler rather than from
parsing source code have NULL as the srcpos value.
merge_nodes, defined in livetree.c, uses srcpos_extend to combine
multiple positions, resulting in a list of positions. srcpos_extend
is defined in srcpos.c. New elements are added at the end. This
requires the srcpos type, define in srcpos.h, to be a list structure
with a next field. This next field is initialized to NULL in
srcpos.h, in the macro YYLLOC_DEFAULT invoked implicitly by the
generated parser code.
Another change to srcpos.c is to make srcpos_copy always do a full
copy, including a copy of the file substructure. This is required
because when dtc is used on the output of cpp, the successive detected
file names overwrite the file name in the file structure. The next
field does not need to be deep copied, because it is always NULL when
srcpos_copy is called; an assert checks for this. File names are only
updated in uncopied position structures.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-11-16 17:29:59 +01:00
|
|
|
node = build_node(p, new_node, NULL);
|
2017-06-14 16:53:05 +02:00
|
|
|
name_node(node, name);
|
|
|
|
|
|
|
|
add_child(dt, node);
|
2017-11-20 18:12:18 +01:00
|
|
|
return dt;
|
2017-06-14 16:53:05 +02:00
|
|
|
}
|
|
|
|
|
2005-06-08 09:18:34 +02:00
|
|
|
struct node *chain_node(struct node *first, struct node *list)
|
|
|
|
{
|
|
|
|
assert(first->next_sibling == NULL);
|
|
|
|
|
|
|
|
first->next_sibling = list;
|
|
|
|
return first;
|
|
|
|
}
|
|
|
|
|
|
|
|
void add_property(struct node *node, struct property *prop)
|
|
|
|
{
|
2005-10-21 09:26:45 +02:00
|
|
|
struct property **p;
|
|
|
|
|
|
|
|
prop->next = NULL;
|
|
|
|
|
|
|
|
p = &node->proplist;
|
|
|
|
while (*p)
|
|
|
|
p = &((*p)->next);
|
|
|
|
|
|
|
|
*p = prop;
|
2005-06-08 09:18:34 +02:00
|
|
|
}
|
|
|
|
|
2012-08-08 06:50:15 +02:00
|
|
|
void delete_property_by_name(struct node *node, char *name)
|
|
|
|
{
|
|
|
|
struct property *prop = node->proplist;
|
|
|
|
|
|
|
|
while (prop) {
|
2017-02-13 05:57:54 +01:00
|
|
|
if (streq(prop->name, name)) {
|
2012-08-08 06:50:15 +02:00
|
|
|
delete_property(prop);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
prop = prop->next;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void delete_property(struct property *prop)
|
|
|
|
{
|
|
|
|
prop->deleted = 1;
|
|
|
|
delete_labels(&prop->labels);
|
|
|
|
}
|
|
|
|
|
2005-06-08 09:18:34 +02:00
|
|
|
void add_child(struct node *parent, struct node *child)
|
|
|
|
{
|
2005-10-21 09:26:45 +02:00
|
|
|
struct node **p;
|
|
|
|
|
|
|
|
child->next_sibling = NULL;
|
2008-07-07 03:19:13 +02:00
|
|
|
child->parent = parent;
|
2005-10-21 09:26:45 +02:00
|
|
|
|
|
|
|
p = &parent->children;
|
|
|
|
while (*p)
|
|
|
|
p = &((*p)->next_sibling);
|
|
|
|
|
|
|
|
*p = child;
|
2005-06-08 09:18:34 +02:00
|
|
|
}
|
|
|
|
|
2012-08-08 06:50:15 +02:00
|
|
|
void delete_node_by_name(struct node *parent, char *name)
|
|
|
|
{
|
|
|
|
struct node *node = parent->children;
|
|
|
|
|
|
|
|
while (node) {
|
2017-02-13 05:57:54 +01:00
|
|
|
if (streq(node->name, name)) {
|
2012-08-08 06:50:15 +02:00
|
|
|
delete_node(node);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
node = node->next_sibling;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
void delete_node(struct node *node)
|
|
|
|
{
|
|
|
|
struct property *prop;
|
|
|
|
struct node *child;
|
|
|
|
|
|
|
|
node->deleted = 1;
|
|
|
|
for_each_child(node, child)
|
|
|
|
delete_node(child);
|
|
|
|
for_each_property(node, prop)
|
|
|
|
delete_property(prop);
|
|
|
|
delete_labels(&node->labels);
|
|
|
|
}
|
|
|
|
|
2016-12-07 13:48:18 +01:00
|
|
|
void append_to_property(struct node *node,
|
2019-05-17 22:28:04 +02:00
|
|
|
char *name, const void *data, int len,
|
|
|
|
enum markertype type)
|
2016-12-07 13:48:18 +01:00
|
|
|
{
|
|
|
|
struct data d;
|
|
|
|
struct property *p;
|
|
|
|
|
|
|
|
p = get_property(node, name);
|
|
|
|
if (p) {
|
2019-05-17 22:28:04 +02:00
|
|
|
d = data_add_marker(p->val, type, name);
|
|
|
|
d = data_append_data(d, data, len);
|
2016-12-07 13:48:18 +01:00
|
|
|
p->val = d;
|
|
|
|
} else {
|
2019-05-17 22:28:04 +02:00
|
|
|
d = data_add_marker(empty_data, type, name);
|
|
|
|
d = data_append_data(d, data, len);
|
annotations: add positions
Extend the parser to record positions, in build_node,
build_node_delete, and build_property.
srcpos structures are added to the property and node types, and to the
parameter lists of the above functions that construct these types.
Nodes and properties that are created by the compiler rather than from
parsing source code have NULL as the srcpos value.
merge_nodes, defined in livetree.c, uses srcpos_extend to combine
multiple positions, resulting in a list of positions. srcpos_extend
is defined in srcpos.c. New elements are added at the end. This
requires the srcpos type, define in srcpos.h, to be a list structure
with a next field. This next field is initialized to NULL in
srcpos.h, in the macro YYLLOC_DEFAULT invoked implicitly by the
generated parser code.
Another change to srcpos.c is to make srcpos_copy always do a full
copy, including a copy of the file substructure. This is required
because when dtc is used on the output of cpp, the successive detected
file names overwrite the file name in the file structure. The next
field does not need to be deep copied, because it is always NULL when
srcpos_copy is called; an assert checks for this. File names are only
updated in uncopied position structures.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-11-16 17:29:59 +01:00
|
|
|
p = build_property(name, d, NULL);
|
2016-12-07 13:48:18 +01:00
|
|
|
add_property(node, p);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2010-02-24 08:22:17 +01:00
|
|
|
struct reserve_info *build_reserve_entry(uint64_t address, uint64_t size)
|
2005-10-24 10:18:38 +02:00
|
|
|
{
|
|
|
|
struct reserve_info *new = xmalloc(sizeof(*new));
|
|
|
|
|
2010-02-24 08:22:17 +01:00
|
|
|
memset(new, 0, sizeof(*new));
|
|
|
|
|
2017-03-06 02:04:45 +01:00
|
|
|
new->address = address;
|
|
|
|
new->size = size;
|
2005-10-24 10:18:38 +02:00
|
|
|
|
|
|
|
return new;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct reserve_info *chain_reserve_entry(struct reserve_info *first,
|
|
|
|
struct reserve_info *list)
|
|
|
|
{
|
|
|
|
assert(first->next == NULL);
|
|
|
|
|
|
|
|
first->next = list;
|
|
|
|
return first;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct reserve_info *add_reserve_entry(struct reserve_info *list,
|
|
|
|
struct reserve_info *new)
|
|
|
|
{
|
|
|
|
struct reserve_info *last;
|
|
|
|
|
|
|
|
new->next = NULL;
|
|
|
|
|
|
|
|
if (! list)
|
|
|
|
return new;
|
|
|
|
|
|
|
|
for (last = list; last->next; last = last->next)
|
|
|
|
;
|
|
|
|
|
|
|
|
last->next = new;
|
|
|
|
|
|
|
|
return list;
|
|
|
|
}
|
2005-06-08 09:18:34 +02:00
|
|
|
|
2016-05-31 03:58:42 +02:00
|
|
|
struct dt_info *build_dt_info(unsigned int dtsflags,
|
|
|
|
struct reserve_info *reservelist,
|
|
|
|
struct node *tree, uint32_t boot_cpuid_phys)
|
2007-10-18 09:22:30 +02:00
|
|
|
{
|
2016-05-31 03:58:42 +02:00
|
|
|
struct dt_info *dti;
|
2007-10-18 09:22:30 +02:00
|
|
|
|
2016-05-31 03:58:42 +02:00
|
|
|
dti = xmalloc(sizeof(*dti));
|
|
|
|
dti->dtsflags = dtsflags;
|
|
|
|
dti->reservelist = reservelist;
|
|
|
|
dti->dt = tree;
|
|
|
|
dti->boot_cpuid_phys = boot_cpuid_phys;
|
2007-10-18 09:22:30 +02:00
|
|
|
|
2016-05-31 03:58:42 +02:00
|
|
|
return dti;
|
2007-10-18 09:22:30 +02:00
|
|
|
}
|
|
|
|
|
2005-06-08 09:18:34 +02:00
|
|
|
/*
|
|
|
|
* Tree accessor functions
|
|
|
|
*/
|
|
|
|
|
2007-12-04 04:26:15 +01:00
|
|
|
const char *get_unitname(struct node *node)
|
2005-06-08 09:18:34 +02:00
|
|
|
{
|
|
|
|
if (node->name[node->basenamelen] == '\0')
|
|
|
|
return "";
|
|
|
|
else
|
|
|
|
return node->name + node->basenamelen + 1;
|
|
|
|
}
|
|
|
|
|
2007-12-04 04:26:15 +01:00
|
|
|
struct property *get_property(struct node *node, const char *propname)
|
2005-06-08 09:18:34 +02:00
|
|
|
{
|
|
|
|
struct property *prop;
|
|
|
|
|
|
|
|
for_each_property(node, prop)
|
|
|
|
if (streq(prop->name, propname))
|
|
|
|
return prop;
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2007-11-01 06:49:26 +01:00
|
|
|
cell_t propval_cell(struct property *prop)
|
2005-06-08 09:18:34 +02:00
|
|
|
{
|
|
|
|
assert(prop->val.len == sizeof(cell_t));
|
2017-03-06 02:08:53 +01:00
|
|
|
return fdt32_to_cpu(*((fdt32_t *)prop->val.val));
|
2005-06-08 09:18:34 +02:00
|
|
|
}
|
|
|
|
|
2020-10-12 18:19:43 +02:00
|
|
|
cell_t propval_cell_n(struct property *prop, unsigned int n)
|
2017-09-01 20:53:01 +02:00
|
|
|
{
|
|
|
|
assert(prop->val.len / sizeof(cell_t) >= n);
|
|
|
|
return fdt32_to_cpu(*((fdt32_t *)prop->val.val + n));
|
|
|
|
}
|
|
|
|
|
2010-02-23 09:56:41 +01:00
|
|
|
struct property *get_property_by_label(struct node *tree, const char *label,
|
|
|
|
struct node **node)
|
|
|
|
{
|
|
|
|
struct property *prop;
|
|
|
|
struct node *c;
|
|
|
|
|
|
|
|
*node = tree;
|
|
|
|
|
|
|
|
for_each_property(tree, prop) {
|
2010-02-24 08:22:17 +01:00
|
|
|
struct label *l;
|
|
|
|
|
|
|
|
for_each_label(prop->labels, l)
|
|
|
|
if (streq(l->label, label))
|
|
|
|
return prop;
|
2010-02-23 09:56:41 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
for_each_child(tree, c) {
|
|
|
|
prop = get_property_by_label(c, label, node);
|
|
|
|
if (prop)
|
|
|
|
return prop;
|
|
|
|
}
|
|
|
|
|
|
|
|
*node = NULL;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct marker *get_marker_label(struct node *tree, const char *label,
|
|
|
|
struct node **node, struct property **prop)
|
|
|
|
{
|
|
|
|
struct marker *m;
|
|
|
|
struct property *p;
|
|
|
|
struct node *c;
|
|
|
|
|
|
|
|
*node = tree;
|
|
|
|
|
|
|
|
for_each_property(tree, p) {
|
|
|
|
*prop = p;
|
|
|
|
m = p->val.markers;
|
|
|
|
for_each_marker_of_type(m, LABEL)
|
|
|
|
if (streq(m->ref, label))
|
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
|
|
|
for_each_child(tree, c) {
|
|
|
|
m = get_marker_label(c, label, node, prop);
|
|
|
|
if (m)
|
|
|
|
return m;
|
|
|
|
}
|
|
|
|
|
|
|
|
*prop = NULL;
|
|
|
|
*node = NULL;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2007-12-04 04:26:15 +01:00
|
|
|
struct node *get_subnode(struct node *node, const char *nodename)
|
2005-06-08 09:18:34 +02:00
|
|
|
{
|
|
|
|
struct node *child;
|
|
|
|
|
2005-06-16 09:04:00 +02:00
|
|
|
for_each_child(node, child)
|
|
|
|
if (streq(child->name, nodename))
|
|
|
|
return child;
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2007-12-04 04:26:15 +01:00
|
|
|
struct node *get_node_by_path(struct node *tree, const char *path)
|
2005-06-16 09:04:00 +02:00
|
|
|
{
|
2007-12-04 04:26:15 +01:00
|
|
|
const char *p;
|
2005-06-16 09:04:00 +02:00
|
|
|
struct node *child;
|
|
|
|
|
2012-08-08 06:50:15 +02:00
|
|
|
if (!path || ! (*path)) {
|
|
|
|
if (tree->deleted)
|
|
|
|
return NULL;
|
2005-06-16 09:04:00 +02:00
|
|
|
return tree;
|
2012-08-08 06:50:15 +02:00
|
|
|
}
|
2005-06-16 09:04:00 +02:00
|
|
|
|
|
|
|
while (path[0] == '/')
|
|
|
|
path++;
|
|
|
|
|
|
|
|
p = strchr(path, '/');
|
|
|
|
|
|
|
|
for_each_child(tree, child) {
|
2021-06-11 19:10:38 +02:00
|
|
|
if (p && strprefixeq(path, (size_t)(p - path), child->name))
|
2005-06-16 09:04:00 +02:00
|
|
|
return get_node_by_path(child, p+1);
|
|
|
|
else if (!p && streq(path, child->name))
|
2005-06-08 09:18:34 +02:00
|
|
|
return child;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
dtc: Flexible tree checking infrastructure (v2)
dtc: Flexible tree checking infrastructure
Here, at last, is a substantial start on revising dtc's infrastructure
for checking the tree; this is the rework I've been saying was
necessary practically since dtc was first release.
In the new model, we have a table of "check" structures, each with a
name, references to checking functions, and status variables. Each
check can (in principle) be individually switched off or on (as either
a warning or error). Checks have a list of prerequisites, so if
checks need to rely on results from earlier checks to make sense (or
even to avoid crashing) they just need to list the relevant other
checks there.
For now, only the "structural" checks and the fixups for phandle
references are converted to the new mechanism. The rather more
involved semantic checks (which is where this new mechanism will
really be useful) will have to be converted in future patches.
At present, there's no user interface for turning on/off the checks -
the -f option now forces output even if "error" level checks fail.
Again, future patches will be needed to add the fine-grained control,
but that should be quite straightforward with the infrastructure
implemented here.
Also adds a testcase for the handling of bad references, which catches
a bug encountered while developing this patch.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-11-22 04:38:07 +01:00
|
|
|
struct node *get_node_by_label(struct node *tree, const char *label)
|
2007-02-07 04:29:07 +01:00
|
|
|
{
|
|
|
|
struct node *child, *node;
|
2010-02-24 08:22:17 +01:00
|
|
|
struct label *l;
|
2007-02-07 04:29:07 +01:00
|
|
|
|
|
|
|
assert(label && (strlen(label) > 0));
|
|
|
|
|
2010-02-24 08:22:17 +01:00
|
|
|
for_each_label(tree->labels, l)
|
|
|
|
if (streq(l->label, label))
|
|
|
|
return tree;
|
2007-02-07 04:29:07 +01:00
|
|
|
|
|
|
|
for_each_child(tree, child) {
|
|
|
|
node = get_node_by_label(child, label);
|
|
|
|
if (node)
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2007-11-01 06:49:26 +01:00
|
|
|
struct node *get_node_by_phandle(struct node *tree, cell_t phandle)
|
2005-06-08 09:18:34 +02:00
|
|
|
{
|
2007-09-18 03:44:04 +02:00
|
|
|
struct node *child, *node;
|
2005-06-08 09:18:34 +02:00
|
|
|
|
2021-06-18 19:20:28 +02:00
|
|
|
if (!phandle_is_valid(phandle)) {
|
2017-10-24 16:14:18 +02:00
|
|
|
assert(generate_fixups);
|
|
|
|
return NULL;
|
|
|
|
}
|
2005-06-08 09:18:34 +02:00
|
|
|
|
2012-08-08 06:50:15 +02:00
|
|
|
if (tree->phandle == phandle) {
|
|
|
|
if (tree->deleted)
|
|
|
|
return NULL;
|
2005-06-08 09:18:34 +02:00
|
|
|
return tree;
|
2012-08-08 06:50:15 +02:00
|
|
|
}
|
2005-06-08 09:18:34 +02:00
|
|
|
|
|
|
|
for_each_child(tree, child) {
|
|
|
|
node = get_node_by_phandle(child, phandle);
|
|
|
|
if (node)
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
return NULL;
|
|
|
|
}
|
2007-02-07 04:29:07 +01:00
|
|
|
|
2007-12-04 04:26:15 +01:00
|
|
|
struct node *get_node_by_ref(struct node *tree, const char *ref)
|
dtc: Flexible tree checking infrastructure (v2)
dtc: Flexible tree checking infrastructure
Here, at last, is a substantial start on revising dtc's infrastructure
for checking the tree; this is the rework I've been saying was
necessary practically since dtc was first release.
In the new model, we have a table of "check" structures, each with a
name, references to checking functions, and status variables. Each
check can (in principle) be individually switched off or on (as either
a warning or error). Checks have a list of prerequisites, so if
checks need to rely on results from earlier checks to make sense (or
even to avoid crashing) they just need to list the relevant other
checks there.
For now, only the "structural" checks and the fixups for phandle
references are converted to the new mechanism. The rather more
involved semantic checks (which is where this new mechanism will
really be useful) will have to be converted in future patches.
At present, there's no user interface for turning on/off the checks -
the -f option now forces output even if "error" level checks fail.
Again, future patches will be needed to add the fine-grained control,
but that should be quite straightforward with the infrastructure
implemented here.
Also adds a testcase for the handling of bad references, which catches
a bug encountered while developing this patch.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-11-22 04:38:07 +01:00
|
|
|
{
|
2014-05-09 12:48:49 +02:00
|
|
|
if (streq(ref, "/"))
|
|
|
|
return tree;
|
|
|
|
else if (ref[0] == '/')
|
dtc: Flexible tree checking infrastructure (v2)
dtc: Flexible tree checking infrastructure
Here, at last, is a substantial start on revising dtc's infrastructure
for checking the tree; this is the rework I've been saying was
necessary practically since dtc was first release.
In the new model, we have a table of "check" structures, each with a
name, references to checking functions, and status variables. Each
check can (in principle) be individually switched off or on (as either
a warning or error). Checks have a list of prerequisites, so if
checks need to rely on results from earlier checks to make sense (or
even to avoid crashing) they just need to list the relevant other
checks there.
For now, only the "structural" checks and the fixups for phandle
references are converted to the new mechanism. The rather more
involved semantic checks (which is where this new mechanism will
really be useful) will have to be converted in future patches.
At present, there's no user interface for turning on/off the checks -
the -f option now forces output even if "error" level checks fail.
Again, future patches will be needed to add the fine-grained control,
but that should be quite straightforward with the infrastructure
implemented here.
Also adds a testcase for the handling of bad references, which catches
a bug encountered while developing this patch.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2007-11-22 04:38:07 +01:00
|
|
|
return get_node_by_path(tree, ref);
|
|
|
|
else
|
|
|
|
return get_node_by_label(tree, ref);
|
|
|
|
}
|
|
|
|
|
|
|
|
cell_t get_node_phandle(struct node *root, struct node *node)
|
2007-10-18 09:22:30 +02:00
|
|
|
{
|
|
|
|
static cell_t phandle = 1; /* FIXME: ick, static local */
|
2018-07-13 02:20:05 +02:00
|
|
|
struct data d = empty_data;
|
2007-10-18 09:22:30 +02:00
|
|
|
|
2021-06-18 19:20:28 +02:00
|
|
|
if (phandle_is_valid(node->phandle))
|
2007-10-18 09:22:30 +02:00
|
|
|
return node->phandle;
|
|
|
|
|
|
|
|
while (get_node_by_phandle(root, phandle))
|
|
|
|
phandle++;
|
|
|
|
|
|
|
|
node->phandle = phandle;
|
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>
2009-11-26 05:37:13 +01:00
|
|
|
|
2018-07-13 02:20:05 +02:00
|
|
|
d = data_add_marker(d, TYPE_UINT32, NULL);
|
|
|
|
d = data_append_cell(d, phandle);
|
|
|
|
|
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>
2009-11-26 05:37:13 +01:00
|
|
|
if (!get_property(node, "linux,phandle")
|
|
|
|
&& (phandle_format & PHANDLE_LEGACY))
|
annotations: add positions
Extend the parser to record positions, in build_node,
build_node_delete, and build_property.
srcpos structures are added to the property and node types, and to the
parameter lists of the above functions that construct these types.
Nodes and properties that are created by the compiler rather than from
parsing source code have NULL as the srcpos value.
merge_nodes, defined in livetree.c, uses srcpos_extend to combine
multiple positions, resulting in a list of positions. srcpos_extend
is defined in srcpos.c. New elements are added at the end. This
requires the srcpos type, define in srcpos.h, to be a list structure
with a next field. This next field is initialized to NULL in
srcpos.h, in the macro YYLLOC_DEFAULT invoked implicitly by the
generated parser code.
Another change to srcpos.c is to make srcpos_copy always do a full
copy, including a copy of the file substructure. This is required
because when dtc is used on the output of cpp, the successive detected
file names overwrite the file name in the file structure. The next
field does not need to be deep copied, because it is always NULL when
srcpos_copy is called; an assert checks for this. File names are only
updated in uncopied position structures.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-11-16 17:29:59 +01:00
|
|
|
add_property(node, build_property("linux,phandle", d, NULL));
|
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>
2009-11-26 05:37:13 +01:00
|
|
|
|
|
|
|
if (!get_property(node, "phandle")
|
|
|
|
&& (phandle_format & PHANDLE_EPAPR))
|
annotations: add positions
Extend the parser to record positions, in build_node,
build_node_delete, and build_property.
srcpos structures are added to the property and node types, and to the
parameter lists of the above functions that construct these types.
Nodes and properties that are created by the compiler rather than from
parsing source code have NULL as the srcpos value.
merge_nodes, defined in livetree.c, uses srcpos_extend to combine
multiple positions, resulting in a list of positions. srcpos_extend
is defined in srcpos.c. New elements are added at the end. This
requires the srcpos type, define in srcpos.h, to be a list structure
with a next field. This next field is initialized to NULL in
srcpos.h, in the macro YYLLOC_DEFAULT invoked implicitly by the
generated parser code.
Another change to srcpos.c is to make srcpos_copy always do a full
copy, including a copy of the file substructure. This is required
because when dtc is used on the output of cpp, the successive detected
file names overwrite the file name in the file structure. The next
field does not need to be deep copied, because it is always NULL when
srcpos_copy is called; an assert checks for this. File names are only
updated in uncopied position structures.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-11-16 17:29:59 +01:00
|
|
|
add_property(node, build_property("phandle", d, NULL));
|
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>
2009-11-26 05:37:13 +01:00
|
|
|
|
|
|
|
/* If the node *does* have a phandle property, we must
|
dtc: Handle linux,phandle properties which self-reference
Currently, dtc will generate phandles for nodes which are referenced
elsewhere in the tree. phandles can also be explicitly assigned by
defining the linux,phandle property. However, there is no way,
currently to tell dtc to generate a phandle for a node if it is not
referenced elsewhere. This is inconvenient when it's expected that
later processing on the flat tree might add nodes which _will_
the node in question.
One way one might attempt to do this is with the construct:
mynode: mynode {
linux,phandle = <&mynode>;
/* ... */
};
Though it's a trifle odd, there's really only one sensible meaning
which can be assigned to this construct: allocate a unique phandle to
"mynode" and put that in its linux,phandle property (as always).
Currently, however, dtc will choke on this self-reference. This patch
corrects this, making the construct above give the expected results.
It also ensures a more meaningful error message is given if you
attempt to process the nonsensical construct:
mynode: mynode {
linux,phandle = <&someothernode>;
/* ... */
};
The 'references' testcase is extended to cover this case, as well.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2008-11-07 02:49:44 +01:00
|
|
|
* be dealing with a self-referencing phandle, which will be
|
|
|
|
* fixed up momentarily in the caller */
|
2007-10-18 09:22:30 +02:00
|
|
|
|
|
|
|
return node->phandle;
|
|
|
|
}
|
2010-02-19 05:50:50 +01:00
|
|
|
|
|
|
|
uint32_t guess_boot_cpuid(struct node *tree)
|
|
|
|
{
|
|
|
|
struct node *cpus, *bootcpu;
|
|
|
|
struct property *reg;
|
|
|
|
|
|
|
|
cpus = get_node_by_path(tree, "/cpus");
|
|
|
|
if (!cpus)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
|
|
|
|
bootcpu = cpus->children;
|
|
|
|
if (!bootcpu)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
reg = get_property(bootcpu, "reg");
|
|
|
|
if (!reg || (reg->val.len != sizeof(uint32_t)))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/* FIXME: Sanity check node? */
|
|
|
|
|
|
|
|
return propval_cell(reg);
|
|
|
|
}
|
2010-11-09 23:51:09 +01:00
|
|
|
|
|
|
|
static int cmp_reserve_info(const void *ax, const void *bx)
|
|
|
|
{
|
|
|
|
const struct reserve_info *a, *b;
|
|
|
|
|
|
|
|
a = *((const struct reserve_info * const *)ax);
|
|
|
|
b = *((const struct reserve_info * const *)bx);
|
|
|
|
|
2017-03-06 02:04:45 +01:00
|
|
|
if (a->address < b->address)
|
2010-11-09 23:51:09 +01:00
|
|
|
return -1;
|
2017-03-06 02:04:45 +01:00
|
|
|
else if (a->address > b->address)
|
2010-11-09 23:51:09 +01:00
|
|
|
return 1;
|
2017-03-06 02:04:45 +01:00
|
|
|
else if (a->size < b->size)
|
2010-11-09 23:51:09 +01:00
|
|
|
return -1;
|
2017-03-06 02:04:45 +01:00
|
|
|
else if (a->size > b->size)
|
2010-11-09 23:51:09 +01:00
|
|
|
return 1;
|
|
|
|
else
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2016-05-31 03:58:42 +02:00
|
|
|
static void sort_reserve_entries(struct dt_info *dti)
|
2010-11-09 23:51:09 +01:00
|
|
|
{
|
|
|
|
struct reserve_info *ri, **tbl;
|
|
|
|
int n = 0, i = 0;
|
|
|
|
|
2016-05-31 03:58:42 +02:00
|
|
|
for (ri = dti->reservelist;
|
2010-11-09 23:51:09 +01:00
|
|
|
ri;
|
|
|
|
ri = ri->next)
|
|
|
|
n++;
|
|
|
|
|
|
|
|
if (n == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
tbl = xmalloc(n * sizeof(*tbl));
|
|
|
|
|
2016-05-31 03:58:42 +02:00
|
|
|
for (ri = dti->reservelist;
|
2010-11-09 23:51:09 +01:00
|
|
|
ri;
|
|
|
|
ri = ri->next)
|
|
|
|
tbl[i++] = ri;
|
|
|
|
|
|
|
|
qsort(tbl, n, sizeof(*tbl), cmp_reserve_info);
|
|
|
|
|
2016-05-31 03:58:42 +02:00
|
|
|
dti->reservelist = tbl[0];
|
2010-11-09 23:51:09 +01:00
|
|
|
for (i = 0; i < (n-1); i++)
|
|
|
|
tbl[i]->next = tbl[i+1];
|
|
|
|
tbl[n-1]->next = NULL;
|
|
|
|
|
|
|
|
free(tbl);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int cmp_prop(const void *ax, const void *bx)
|
|
|
|
{
|
|
|
|
const struct property *a, *b;
|
|
|
|
|
|
|
|
a = *((const struct property * const *)ax);
|
|
|
|
b = *((const struct property * const *)bx);
|
|
|
|
|
|
|
|
return strcmp(a->name, b->name);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sort_properties(struct node *node)
|
|
|
|
{
|
|
|
|
int n = 0, i = 0;
|
|
|
|
struct property *prop, **tbl;
|
|
|
|
|
2012-08-08 06:50:15 +02:00
|
|
|
for_each_property_withdel(node, prop)
|
2010-11-09 23:51:09 +01:00
|
|
|
n++;
|
|
|
|
|
|
|
|
if (n == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
tbl = xmalloc(n * sizeof(*tbl));
|
|
|
|
|
2012-08-08 06:50:15 +02:00
|
|
|
for_each_property_withdel(node, prop)
|
2010-11-09 23:51:09 +01:00
|
|
|
tbl[i++] = prop;
|
|
|
|
|
|
|
|
qsort(tbl, n, sizeof(*tbl), cmp_prop);
|
|
|
|
|
|
|
|
node->proplist = tbl[0];
|
|
|
|
for (i = 0; i < (n-1); i++)
|
|
|
|
tbl[i]->next = tbl[i+1];
|
|
|
|
tbl[n-1]->next = NULL;
|
|
|
|
|
|
|
|
free(tbl);
|
|
|
|
}
|
|
|
|
|
|
|
|
static int cmp_subnode(const void *ax, const void *bx)
|
|
|
|
{
|
|
|
|
const struct node *a, *b;
|
|
|
|
|
|
|
|
a = *((const struct node * const *)ax);
|
|
|
|
b = *((const struct node * const *)bx);
|
|
|
|
|
|
|
|
return strcmp(a->name, b->name);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sort_subnodes(struct node *node)
|
|
|
|
{
|
|
|
|
int n = 0, i = 0;
|
|
|
|
struct node *subnode, **tbl;
|
|
|
|
|
2012-08-08 06:50:15 +02:00
|
|
|
for_each_child_withdel(node, subnode)
|
2010-11-09 23:51:09 +01:00
|
|
|
n++;
|
|
|
|
|
|
|
|
if (n == 0)
|
|
|
|
return;
|
|
|
|
|
|
|
|
tbl = xmalloc(n * sizeof(*tbl));
|
|
|
|
|
2012-08-08 06:50:15 +02:00
|
|
|
for_each_child_withdel(node, subnode)
|
2010-11-09 23:51:09 +01:00
|
|
|
tbl[i++] = subnode;
|
|
|
|
|
|
|
|
qsort(tbl, n, sizeof(*tbl), cmp_subnode);
|
|
|
|
|
|
|
|
node->children = tbl[0];
|
|
|
|
for (i = 0; i < (n-1); i++)
|
|
|
|
tbl[i]->next_sibling = tbl[i+1];
|
|
|
|
tbl[n-1]->next_sibling = NULL;
|
|
|
|
|
|
|
|
free(tbl);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void sort_node(struct node *node)
|
|
|
|
{
|
|
|
|
struct node *c;
|
|
|
|
|
|
|
|
sort_properties(node);
|
|
|
|
sort_subnodes(node);
|
2012-08-08 06:50:15 +02:00
|
|
|
for_each_child_withdel(node, c)
|
2010-11-09 23:51:09 +01:00
|
|
|
sort_node(c);
|
|
|
|
}
|
|
|
|
|
2016-05-31 03:58:42 +02:00
|
|
|
void sort_tree(struct dt_info *dti)
|
2010-11-09 23:51:09 +01:00
|
|
|
{
|
2016-05-31 03:58:42 +02:00
|
|
|
sort_reserve_entries(dti);
|
|
|
|
sort_node(dti->dt);
|
2010-11-09 23:51:09 +01:00
|
|
|
}
|
2016-12-07 13:48:18 +01:00
|
|
|
|
|
|
|
/* utility helper to avoid code duplication */
|
|
|
|
static struct node *build_and_name_child_node(struct node *parent, char *name)
|
|
|
|
{
|
|
|
|
struct node *node;
|
|
|
|
|
annotations: add positions
Extend the parser to record positions, in build_node,
build_node_delete, and build_property.
srcpos structures are added to the property and node types, and to the
parameter lists of the above functions that construct these types.
Nodes and properties that are created by the compiler rather than from
parsing source code have NULL as the srcpos value.
merge_nodes, defined in livetree.c, uses srcpos_extend to combine
multiple positions, resulting in a list of positions. srcpos_extend
is defined in srcpos.c. New elements are added at the end. This
requires the srcpos type, define in srcpos.h, to be a list structure
with a next field. This next field is initialized to NULL in
srcpos.h, in the macro YYLLOC_DEFAULT invoked implicitly by the
generated parser code.
Another change to srcpos.c is to make srcpos_copy always do a full
copy, including a copy of the file substructure. This is required
because when dtc is used on the output of cpp, the successive detected
file names overwrite the file name in the file structure. The next
field does not need to be deep copied, because it is always NULL when
srcpos_copy is called; an assert checks for this. File names are only
updated in uncopied position structures.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-11-16 17:29:59 +01:00
|
|
|
node = build_node(NULL, NULL, NULL);
|
2016-12-07 13:48:18 +01:00
|
|
|
name_node(node, xstrdup(name));
|
|
|
|
add_child(parent, node);
|
|
|
|
|
|
|
|
return node;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct node *build_root_node(struct node *dt, char *name)
|
|
|
|
{
|
|
|
|
struct node *an;
|
|
|
|
|
|
|
|
an = get_subnode(dt, name);
|
|
|
|
if (!an)
|
|
|
|
an = build_and_name_child_node(dt, name);
|
|
|
|
|
|
|
|
if (!an)
|
|
|
|
die("Could not build root node /%s\n", name);
|
|
|
|
|
|
|
|
return an;
|
|
|
|
}
|
|
|
|
|
2016-05-31 03:58:42 +02:00
|
|
|
static bool any_label_tree(struct dt_info *dti, struct node *node)
|
2016-12-07 13:48:18 +01:00
|
|
|
{
|
|
|
|
struct node *c;
|
|
|
|
|
|
|
|
if (node->labels)
|
|
|
|
return true;
|
|
|
|
|
|
|
|
for_each_child(node, c)
|
2016-05-31 03:58:42 +02:00
|
|
|
if (any_label_tree(dti, c))
|
2016-12-07 13:48:18 +01:00
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2016-05-31 03:58:42 +02:00
|
|
|
static void generate_label_tree_internal(struct dt_info *dti,
|
2016-12-07 13:48:18 +01:00
|
|
|
struct node *an, struct node *node,
|
|
|
|
bool allocph)
|
|
|
|
{
|
2016-05-31 03:58:42 +02:00
|
|
|
struct node *dt = dti->dt;
|
2016-12-07 13:48:18 +01:00
|
|
|
struct node *c;
|
|
|
|
struct property *p;
|
|
|
|
struct label *l;
|
|
|
|
|
|
|
|
/* if there are labels */
|
|
|
|
if (node->labels) {
|
|
|
|
|
|
|
|
/* now add the label in the node */
|
|
|
|
for_each_label(node->labels, l) {
|
|
|
|
|
|
|
|
/* check whether the label already exists */
|
|
|
|
p = get_property(an, l->label);
|
|
|
|
if (p) {
|
|
|
|
fprintf(stderr, "WARNING: label %s already"
|
|
|
|
" exists in /%s", l->label,
|
|
|
|
an->name);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* insert it */
|
|
|
|
p = build_property(l->label,
|
2019-05-17 22:28:04 +02:00
|
|
|
data_copy_escape_string(node->fullpath,
|
|
|
|
strlen(node->fullpath)),
|
annotations: add positions
Extend the parser to record positions, in build_node,
build_node_delete, and build_property.
srcpos structures are added to the property and node types, and to the
parameter lists of the above functions that construct these types.
Nodes and properties that are created by the compiler rather than from
parsing source code have NULL as the srcpos value.
merge_nodes, defined in livetree.c, uses srcpos_extend to combine
multiple positions, resulting in a list of positions. srcpos_extend
is defined in srcpos.c. New elements are added at the end. This
requires the srcpos type, define in srcpos.h, to be a list structure
with a next field. This next field is initialized to NULL in
srcpos.h, in the macro YYLLOC_DEFAULT invoked implicitly by the
generated parser code.
Another change to srcpos.c is to make srcpos_copy always do a full
copy, including a copy of the file substructure. This is required
because when dtc is used on the output of cpp, the successive detected
file names overwrite the file name in the file structure. The next
field does not need to be deep copied, because it is always NULL when
srcpos_copy is called; an assert checks for this. File names are only
updated in uncopied position structures.
Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
2018-11-16 17:29:59 +01:00
|
|
|
NULL);
|
2016-12-07 13:48:18 +01:00
|
|
|
add_property(an, p);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* force allocation of a phandle for this node */
|
|
|
|
if (allocph)
|
|
|
|
(void)get_node_phandle(dt, node);
|
|
|
|
}
|
|
|
|
|
|
|
|
for_each_child(node, c)
|
2016-05-31 03:58:42 +02:00
|
|
|
generate_label_tree_internal(dti, an, c, allocph);
|
2016-12-07 13:48:18 +01:00
|
|
|
}
|
|
|
|
|
2016-05-31 03:58:42 +02:00
|
|
|
static bool any_fixup_tree(struct dt_info *dti, struct node *node)
|
2016-12-07 13:48:18 +01:00
|
|
|
{
|
|
|
|
struct node *c;
|
|
|
|
struct property *prop;
|
|
|
|
struct marker *m;
|
|
|
|
|
|
|
|
for_each_property(node, prop) {
|
|
|
|
m = prop->val.markers;
|
|
|
|
for_each_marker_of_type(m, REF_PHANDLE) {
|
2016-05-31 03:58:42 +02:00
|
|
|
if (!get_node_by_ref(dti->dt, m->ref))
|
2016-12-07 13:48:18 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for_each_child(node, c) {
|
2016-05-31 03:58:42 +02:00
|
|
|
if (any_fixup_tree(dti, c))
|
2016-12-07 13:48:18 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2016-05-31 03:58:42 +02:00
|
|
|
static void add_fixup_entry(struct dt_info *dti, struct node *fn,
|
2016-12-07 13:48:18 +01:00
|
|
|
struct node *node, struct property *prop,
|
|
|
|
struct marker *m)
|
|
|
|
{
|
|
|
|
char *entry;
|
|
|
|
|
|
|
|
/* m->ref can only be a REF_PHANDLE, but check anyway */
|
|
|
|
assert(m->type == REF_PHANDLE);
|
|
|
|
|
|
|
|
/* there shouldn't be any ':' in the arguments */
|
|
|
|
if (strchr(node->fullpath, ':') || strchr(prop->name, ':'))
|
|
|
|
die("arguments should not contain ':'\n");
|
|
|
|
|
|
|
|
xasprintf(&entry, "%s:%s:%u",
|
|
|
|
node->fullpath, prop->name, m->offset);
|
2019-05-17 22:28:04 +02:00
|
|
|
append_to_property(fn, m->ref, entry, strlen(entry) + 1, TYPE_STRING);
|
2017-02-07 22:26:25 +01:00
|
|
|
|
|
|
|
free(entry);
|
2016-12-07 13:48:18 +01:00
|
|
|
}
|
|
|
|
|
2016-05-31 03:58:42 +02:00
|
|
|
static void generate_fixups_tree_internal(struct dt_info *dti,
|
2016-12-07 13:48:18 +01:00
|
|
|
struct node *fn,
|
|
|
|
struct node *node)
|
|
|
|
{
|
2016-05-31 03:58:42 +02:00
|
|
|
struct node *dt = dti->dt;
|
2016-12-07 13:48:18 +01:00
|
|
|
struct node *c;
|
|
|
|
struct property *prop;
|
|
|
|
struct marker *m;
|
|
|
|
struct node *refnode;
|
|
|
|
|
|
|
|
for_each_property(node, prop) {
|
|
|
|
m = prop->val.markers;
|
|
|
|
for_each_marker_of_type(m, REF_PHANDLE) {
|
|
|
|
refnode = get_node_by_ref(dt, m->ref);
|
|
|
|
if (!refnode)
|
2016-05-31 03:58:42 +02:00
|
|
|
add_fixup_entry(dti, fn, node, prop, m);
|
2016-12-07 13:48:18 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for_each_child(node, c)
|
2016-05-31 03:58:42 +02:00
|
|
|
generate_fixups_tree_internal(dti, fn, c);
|
2016-12-07 13:48:18 +01:00
|
|
|
}
|
|
|
|
|
2016-05-31 03:58:42 +02:00
|
|
|
static bool any_local_fixup_tree(struct dt_info *dti, struct node *node)
|
2016-12-07 13:48:18 +01:00
|
|
|
{
|
|
|
|
struct node *c;
|
|
|
|
struct property *prop;
|
|
|
|
struct marker *m;
|
|
|
|
|
|
|
|
for_each_property(node, prop) {
|
|
|
|
m = prop->val.markers;
|
|
|
|
for_each_marker_of_type(m, REF_PHANDLE) {
|
2016-05-31 03:58:42 +02:00
|
|
|
if (get_node_by_ref(dti->dt, m->ref))
|
2016-12-07 13:48:18 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for_each_child(node, c) {
|
2016-05-31 03:58:42 +02:00
|
|
|
if (any_local_fixup_tree(dti, c))
|
2016-12-07 13:48:18 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2016-05-31 03:58:42 +02:00
|
|
|
static void add_local_fixup_entry(struct dt_info *dti,
|
2016-12-07 13:48:18 +01:00
|
|
|
struct node *lfn, struct node *node,
|
|
|
|
struct property *prop, struct marker *m,
|
|
|
|
struct node *refnode)
|
|
|
|
{
|
|
|
|
struct node *wn, *nwn; /* local fixup node, walk node, new */
|
2017-03-06 02:08:53 +01:00
|
|
|
fdt32_t value_32;
|
2016-12-07 13:48:18 +01:00
|
|
|
char **compp;
|
|
|
|
int i, depth;
|
|
|
|
|
2019-05-20 10:12:09 +02:00
|
|
|
/* walk back retrieving depth */
|
2016-12-07 13:48:18 +01:00
|
|
|
depth = 0;
|
|
|
|
for (wn = node; wn; wn = wn->parent)
|
|
|
|
depth++;
|
|
|
|
|
|
|
|
/* allocate name array */
|
|
|
|
compp = xmalloc(sizeof(*compp) * depth);
|
|
|
|
|
|
|
|
/* store names in the array */
|
|
|
|
for (wn = node, i = depth - 1; wn; wn = wn->parent, i--)
|
|
|
|
compp[i] = wn->name;
|
|
|
|
|
|
|
|
/* walk the path components creating nodes if they don't exist */
|
|
|
|
for (wn = lfn, i = 1; i < depth; i++, wn = nwn) {
|
|
|
|
/* if no node exists, create it */
|
|
|
|
nwn = get_subnode(wn, compp[i]);
|
|
|
|
if (!nwn)
|
|
|
|
nwn = build_and_name_child_node(wn, compp[i]);
|
|
|
|
}
|
|
|
|
|
|
|
|
free(compp);
|
|
|
|
|
|
|
|
value_32 = cpu_to_fdt32(m->offset);
|
2019-05-17 22:28:04 +02:00
|
|
|
append_to_property(wn, prop->name, &value_32, sizeof(value_32), TYPE_UINT32);
|
2016-12-07 13:48:18 +01:00
|
|
|
}
|
|
|
|
|
2016-05-31 03:58:42 +02:00
|
|
|
static void generate_local_fixups_tree_internal(struct dt_info *dti,
|
2016-12-07 13:48:18 +01:00
|
|
|
struct node *lfn,
|
|
|
|
struct node *node)
|
|
|
|
{
|
2016-05-31 03:58:42 +02:00
|
|
|
struct node *dt = dti->dt;
|
2016-12-07 13:48:18 +01:00
|
|
|
struct node *c;
|
|
|
|
struct property *prop;
|
|
|
|
struct marker *m;
|
|
|
|
struct node *refnode;
|
|
|
|
|
|
|
|
for_each_property(node, prop) {
|
|
|
|
m = prop->val.markers;
|
|
|
|
for_each_marker_of_type(m, REF_PHANDLE) {
|
|
|
|
refnode = get_node_by_ref(dt, m->ref);
|
|
|
|
if (refnode)
|
2016-05-31 03:58:42 +02:00
|
|
|
add_local_fixup_entry(dti, lfn, node, prop, m, refnode);
|
2016-12-07 13:48:18 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
for_each_child(node, c)
|
2016-05-31 03:58:42 +02:00
|
|
|
generate_local_fixups_tree_internal(dti, lfn, c);
|
2016-12-07 13:48:18 +01:00
|
|
|
}
|
|
|
|
|
2016-05-31 03:58:42 +02:00
|
|
|
void generate_label_tree(struct dt_info *dti, char *name, bool allocph)
|
2016-12-07 13:48:18 +01:00
|
|
|
{
|
2016-05-31 03:58:42 +02:00
|
|
|
if (!any_label_tree(dti, dti->dt))
|
2016-12-07 13:48:18 +01:00
|
|
|
return;
|
2016-05-31 03:58:42 +02:00
|
|
|
generate_label_tree_internal(dti, build_root_node(dti->dt, name),
|
|
|
|
dti->dt, allocph);
|
2016-12-07 13:48:18 +01:00
|
|
|
}
|
|
|
|
|
2016-05-31 03:58:42 +02:00
|
|
|
void generate_fixups_tree(struct dt_info *dti, char *name)
|
2016-12-07 13:48:18 +01:00
|
|
|
{
|
2016-05-31 03:58:42 +02:00
|
|
|
if (!any_fixup_tree(dti, dti->dt))
|
2016-12-07 13:48:18 +01:00
|
|
|
return;
|
2016-05-31 03:58:42 +02:00
|
|
|
generate_fixups_tree_internal(dti, build_root_node(dti->dt, name),
|
|
|
|
dti->dt);
|
2016-12-07 13:48:18 +01:00
|
|
|
}
|
|
|
|
|
2016-05-31 03:58:42 +02:00
|
|
|
void generate_local_fixups_tree(struct dt_info *dti, char *name)
|
2016-12-07 13:48:18 +01:00
|
|
|
{
|
2016-05-31 03:58:42 +02:00
|
|
|
if (!any_local_fixup_tree(dti, dti->dt))
|
2016-12-07 13:48:18 +01:00
|
|
|
return;
|
2016-05-31 03:58:42 +02:00
|
|
|
generate_local_fixups_tree_internal(dti, build_root_node(dti->dt, name),
|
|
|
|
dti->dt);
|
2016-12-07 13:48:18 +01:00
|
|
|
}
|