net: eth: of_fixup_node: Use reproducible node name for fixup
PATCH 1/1 net: eth: of_fixup_node: Use reproducible node name for fixup
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 <[email protected]>
--- net/eth.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
net/eth.c +10 -6
@@ -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)
Signature · 7 lines
2.25.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Quoted 3 lines · 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.
Who would ever run such an old kernel ;)
Anyway, applied, thanks
Sascha
Quoted 60 lines
Signed-off-by Stefan Riedmueller <[email protected]>--- net/eth.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)net/eth.c +10
-6@@ -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)Signature · 7 lines
2.25.1 _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
Signature · 9 lines
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 [email protected] http://lists.infradead.org/mailman/listinfo/barebox