[PATCH] net: eth: Fixup OF tree with registered MAC addresses too

[Sascha Hauer]

On Tue, Oct 20, 2015 at 11:13:19PM +0000, Trent Piepho wrote:
> The eth code registers an OF tree fixup that looks for any nodes in
> the Linux oftree that match eth devices loaded in barebox and sets the
> mac-address property in those nodes.  The purpose is to pass MAC
> addresses to the Linux kernel for drivers that expect the MAC address
> to be in the device tree.
> 
> If barebox does not have a driver for the network device, either
> because it has been disabled or because one does not exist, then the
> OF tree will not be fixed up to include a MAC address.
> 
> The eth code also has a list of MAC addresses which board code has
> registered, usually done when it reads the address from an EEPROM or
> on-chip memory.  If an eth device is created later in the boot, it
> will look here for an address.
> 
> The registered MAC address list is not used for the OF tree fix up,
> and this patch changes that.  This way barebox can place a MAC address
> in the device-tree without needing a driver for the network device.
> 
> Signed-off-by: Trent Piepho <tpiepho at kymetacorp.com>
> ---
>  net/eth.c | 65
> +++++++++++++++++++++++++++++++++++++++++++--------------------

Your mailer wraps the lines. Could you try and fix that?

>  1 file changed, 45 insertions(+), 20 deletions(-)
> 
> diff --git a/net/eth.c b/net/eth.c
> index b22e556..46cf429 100644
> --- a/net/eth.c
> +++ b/net/eth.c
> @@ -289,12 +289,54 @@ static int eth_param_set_ethaddr(struct param_d
> *param, void *priv)
>  }
>  
>  #ifdef CONFIG_OFTREE
> -static int eth_of_fixup(struct device_node *root, void *unused)
> +static void eth_of_fixup_node(struct device_node *root,
> +			      const char *node_path, int ethid,
> +			      const u8 ethaddr[6])
>  {
> -	struct eth_device *edev;
>  	struct device_node *node;
>  	int ret;
>  

You could move the is_valid_ether_addr() check here so we do not do this
in each caller.

> +	if (node_path) {
> +		node = of_find_node_by_path_from(root, node_path);
> +	} else {
> +		char eth[12];
> +		sprintf(eth, "ethernet%d", ethid);
> +		node = of_find_node_by_alias(root, eth);
> +	}
> +
> +	if (!node) {
> +		pr_debug("%s: no node to fixup\n", __func__);
> +		return;
> +	}
> +
> +	ret = of_set_property(node, "mac-address", ethaddr, 6, 1);
> +	if (ret)
> +		pr_err("Setting mac-address property of %s failed with: %s\n",
> +		       node->full_name, strerror(-ret));
> +}

Can we have the factor out of common code into eth_of_fixup_node() as a
separate patch please? That makes the change that comes in this patch
more obvious and easier to follow.

Sascha

> +
> +static int eth_of_fixup(struct device_node *root, void *unused)
> +{
> +	struct eth_device *edev;
> +	struct eth_ethaddr *addr;
> +
> +	/*
> +	 * Add the mac-address property for each ethaddr and then each network
> +	 * device we find a node path for and which has a valid mac address.
> +	 * This will find both network devices barebox was told about as well
> as
> +	 * addresses registered by boards but for which no network device was
> +	 * ever loaded.
> +	 */
> +	list_for_each_entry(addr, &ethaddr_list, list) {
> +		if (!is_valid_ether_addr(addr->ethaddr)) {
> +			debug("%s: no valid mac address, cannot fixup\n",
> +				__func__);
> +			continue;
> +		}
> +
> +		eth_of_fixup_node(root, addr->node ? addr->node->full_name : NULL,
> addr->ethid, addr->ethaddr);
> +	}
> +
>  	/*
>  	 * Add the mac-address property for each network device we
>  	 * find a nodepath for and which has a valid mac address.
> @@ -306,24 +348,7 @@ static int eth_of_fixup(struct device_node *root,
> void *unused)
>  				__func__);
>  			continue;
>  		}
> -
> -		if (edev->nodepath) {
> -			node = of_find_node_by_path_from(root, edev->nodepath);
> -		} else {
> -			char eth[12];
> -			sprintf(eth, "ethernet%d", edev->dev.id);
> -			node = of_find_node_by_alias(root, eth);
> -		}
> -
> -		if (!node) {
> -			dev_dbg(&edev->dev, "%s: no node to fixup\n", __func__);
> -			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));
> +		eth_of_fixup_node(root, edev->nodepath, edev->dev.id, edev->ethaddr);
>  	}
>  
>  	return 0;
> -- 
> 1.8.3.1
> 
> 
> _______________________________________________
> barebox mailing list
> barebox at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |