From f696692b8704ccfa3800e57c8b6261ff337b8efd Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Tue, 4 Jun 2013 09:35:56 +0200 Subject: [PATCH] net: Set mac-address property Linux normally has no idea how to retrieve MAC Addresses, but instead expects the MAC address in the devicetree. This patch adds the MAC address to the devicetree for Linux if we find a valid one in barebox. This mechanism is limited of course to devices barebox has a driver for and which are probed themselves from the devicetree. Signed-off-by: Sascha Hauer --- include/net.h | 1 + net/eth.c | 54 +++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) diff --git a/include/net.h b/include/net.h index fa3c05a98..a4cfec712 100644 --- a/include/net.h +++ b/include/net.h @@ -52,6 +52,7 @@ struct eth_device { struct device_d dev; struct device_d *parent; + char *nodepath; struct list_head list; diff --git a/net/eth.c b/net/eth.c index bea7b12b4..7240b4db9 100644 --- a/net/eth.c +++ b/net/eth.c @@ -273,6 +273,52 @@ static int eth_set_ethaddr(struct device_d *dev, struct param_d *param, const ch return 0; } +#ifdef CONFIG_OFDEVICE +static int eth_of_fixup(struct device_node *root) +{ + struct eth_device *edev; + struct device_node *node; + int ret; + + /* + * Add the mac-address property for each network device we + * find a nodepath for and which has a valid mac address. + */ + list_for_each_entry(edev, &netdev_list, list) { + if (!edev->nodepath) { + dev_dbg(&edev->dev, "%s: no node to fixup\n", __func__); + continue; + } + + if (!is_valid_ether_addr(edev->ethaddr)) { + dev_dbg(&edev->dev, "%s: no valid mac address, cannot fixup\n", + __func__); + continue; + } + + node = of_find_node_by_path(root, edev->nodepath); + if (!node) { + dev_dbg(&edev->dev, "%s: fixup node %s not found\n", + __func__, edev->nodepath); + continue; + } + + ret = of_set_property(node, "mac-address", edev->ethaddr, 6, 1); + if (ret) + pr_err("Setting mac-address property of %s failed with: %s\n", + node->full_name, strerror(-ret)); + } + + return 0; +} + +static int eth_register_of_fixup(void) +{ + return of_register_fixup(eth_of_fixup); +} +late_initcall(eth_register_of_fixup); +#endif + int eth_register(struct eth_device *edev) { struct device_d *dev = &edev->dev; @@ -316,6 +362,10 @@ int eth_register(struct eth_device *edev) if (found) register_preset_mac_address(edev, ethaddr); + if (IS_ENABLED(CONFIG_OFDEVICE) && edev->parent && + edev->parent->device_node) + edev->nodepath = xstrdup(edev->parent->device_node->full_name); + if (!eth_current) eth_current = edev; @@ -328,6 +378,10 @@ void eth_unregister(struct eth_device *edev) eth_current = NULL; dev_remove_parameters(&edev->dev); + + if (IS_ENABLED(CONFIG_OFDEVICE) && edev->nodepath) + free(edev->nodepath); + unregister_device(&edev->dev); list_del(&edev->list); }