* [PATCH] net: eth: of_fixup_node: Use reproducible node name for fixup
@ 2021-03-29 13:10 Stefan Riedmueller
2021-03-30 5:40 ` Sascha Hauer
0 siblings, 1 reply; 2+ messages in thread
From: Stefan Riedmueller @ 2021-03-29 13:10 UTC (permalink / raw)
To: barebox; +Cc: Stefan Riedmueller
To be able to fixup older devicetrees, prior to v4.15 where leading
zeros of the unit addresses were removed, use the reproducible name to
find the corresponding nodes.
Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
---
net/eth.c | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/net/eth.c b/net/eth.c
index 626b35d5cc65..84f99d3aa822 100644
--- a/net/eth.c
+++ b/net/eth.c
@@ -304,7 +304,8 @@ static void eth_of_fixup_node(struct device_node *root,
const char *node_path, int ethid,
const u8 ethaddr[ETH_ALEN])
{
- struct device_node *node;
+ struct device_node *bb_node, *fixup_node;
+ char *name;
int ret;
if (!is_valid_ether_addr(ethaddr)) {
@@ -314,22 +315,25 @@ static void eth_of_fixup_node(struct device_node *root,
}
if (node_path) {
- node = of_find_node_by_path_from(root, node_path);
+ bb_node = of_find_node_by_path_from(0, node_path);
+ name = of_get_reproducible_name(bb_node);
+ fixup_node = of_find_node_by_reproducible_name(root, name);
+ free(name);
} else {
char eth[12];
sprintf(eth, "ethernet%d", ethid);
- node = of_find_node_by_alias(root, eth);
+ fixup_node = of_find_node_by_alias(root, eth);
}
- if (!node) {
+ if (!fixup_node) {
pr_debug("%s: no node to fixup\n", __func__);
return;
}
- ret = of_set_property(node, "mac-address", ethaddr, ETH_ALEN, 1);
+ ret = of_set_property(fixup_node, "mac-address", ethaddr, ETH_ALEN, 1);
if (ret)
pr_err("Setting mac-address property of %s failed with: %s\n",
- node->full_name, strerror(-ret));
+ fixup_node->full_name, strerror(-ret));
}
static int eth_of_fixup(struct device_node *root, void *unused)
--
2.25.1
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] net: eth: of_fixup_node: Use reproducible node name for fixup
2021-03-29 13:10 [PATCH] net: eth: of_fixup_node: Use reproducible node name for fixup Stefan Riedmueller
@ 2021-03-30 5:40 ` Sascha Hauer
0 siblings, 0 replies; 2+ messages in thread
From: Sascha Hauer @ 2021-03-30 5:40 UTC (permalink / raw)
To: Stefan Riedmueller; +Cc: barebox
On Mon, Mar 29, 2021 at 03:10:48PM +0200, Stefan Riedmueller wrote:
> To be able to fixup older devicetrees, prior to v4.15 where leading
> zeros of the unit addresses were removed, use the reproducible name to
> find the corresponding nodes.
Who would ever run such an old kernel ;)
Anyway, applied, thanks
Sascha
>
> Signed-off-by: Stefan Riedmueller <s.riedmueller@phytec.de>
> ---
> net/eth.c | 16 ++++++++++------
> 1 file changed, 10 insertions(+), 6 deletions(-)
>
> diff --git a/net/eth.c b/net/eth.c
> index 626b35d5cc65..84f99d3aa822 100644
> --- a/net/eth.c
> +++ b/net/eth.c
> @@ -304,7 +304,8 @@ static void eth_of_fixup_node(struct device_node *root,
> const char *node_path, int ethid,
> const u8 ethaddr[ETH_ALEN])
> {
> - struct device_node *node;
> + struct device_node *bb_node, *fixup_node;
> + char *name;
> int ret;
>
> if (!is_valid_ether_addr(ethaddr)) {
> @@ -314,22 +315,25 @@ static void eth_of_fixup_node(struct device_node *root,
> }
>
> if (node_path) {
> - node = of_find_node_by_path_from(root, node_path);
> + bb_node = of_find_node_by_path_from(0, node_path);
> + name = of_get_reproducible_name(bb_node);
> + fixup_node = of_find_node_by_reproducible_name(root, name);
> + free(name);
> } else {
> char eth[12];
> sprintf(eth, "ethernet%d", ethid);
> - node = of_find_node_by_alias(root, eth);
> + fixup_node = of_find_node_by_alias(root, eth);
> }
>
> - if (!node) {
> + if (!fixup_node) {
> pr_debug("%s: no node to fixup\n", __func__);
> return;
> }
>
> - ret = of_set_property(node, "mac-address", ethaddr, ETH_ALEN, 1);
> + ret = of_set_property(fixup_node, "mac-address", ethaddr, ETH_ALEN, 1);
> if (ret)
> pr_err("Setting mac-address property of %s failed with: %s\n",
> - node->full_name, strerror(-ret));
> + fixup_node->full_name, strerror(-ret));
> }
>
> static int eth_of_fixup(struct device_node *root, void *unused)
> --
> 2.25.1
>
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Steuerwalder Str. 21 | http://www.pengutronix.de/ |
31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-03-30 5:41 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-03-29 13:10 [PATCH] net: eth: of_fixup_node: Use reproducible node name for fixup Stefan Riedmueller
2021-03-30 5:40 ` Sascha Hauer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox