Commit 5a98dcf5 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'dev_addr-fw-helpers' 



Jakub Kicinski says:

====================
net: add a helpers for loading netdev->dev_addr from FW

We're trying to make all writes to netdev->dev_addr go via helpers.
A lot of places pass netdev->dev_addr to of_get_ethdev_address() and
device_get_ethdev_addr() so this set adds new functions which wrap
the functionality.

v2 performs suggested code moves, adds a couple additional clean ups
on the device property side, and an extra patch converting drivers
which can benefit from device_get_ethdev_address().

v3 removes OF_NET and corrects kdoc.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 944b33ca 894b0fb0

drivers/base/property.c

+0 −63
Original line number Diff line number Diff line
@@ -15,7 +15,6 @@ 
#include <linux/of_graph.h>

#include <linux/of_irq.h>

#include <linux/property.h>

#include <linux/etherdevice.h>

#include <linux/phy.h>



struct fwnode_handle *dev_fwnode(struct device *dev)
@@ -935,68 +934,6 @@ int device_get_phy_mode(struct device *dev) 
}

EXPORT_SYMBOL_GPL(device_get_phy_mode);



static void *fwnode_get_mac_addr(struct fwnode_handle *fwnode,

				 const char *name, char *addr,

				 int alen)

{

	int ret = fwnode_property_read_u8_array(fwnode, name, addr, alen);



	if (ret == 0 && alen == ETH_ALEN && is_valid_ether_addr(addr))

		return addr;

	return NULL;

}



/**

 * fwnode_get_mac_address - Get the MAC from the firmware node

 * @fwnode:	Pointer to the firmware node

 * @addr:	Address of buffer to store the MAC in

 * @alen:	Length of the buffer pointed to by addr, should be ETH_ALEN

 *

 * Search the firmware node for the best MAC address to use.  'mac-address' is

 * checked first, because that is supposed to contain to "most recent" MAC

 * address. If that isn't set, then 'local-mac-address' is checked next,

 * because that is the default address.  If that isn't set, then the obsolete

 * 'address' is checked, just in case we're using an old device tree.

 *

 * Note that the 'address' property is supposed to contain a virtual address of

 * the register set, but some DTS files have redefined that property to be the

 * MAC address.

 *

 * All-zero MAC addresses are rejected, because those could be properties that

 * exist in the firmware tables, but were not updated by the firmware.  For

 * example, the DTS could define 'mac-address' and 'local-mac-address', with

 * zero MAC addresses.  Some older U-Boots only initialized 'local-mac-address'.

 * In this case, the real MAC is in 'local-mac-address', and 'mac-address'

 * exists but is all zeros.

*/

void *fwnode_get_mac_address(struct fwnode_handle *fwnode, char *addr, int alen)

{

	char *res;



	res = fwnode_get_mac_addr(fwnode, "mac-address", addr, alen);

	if (res)

		return res;



	res = fwnode_get_mac_addr(fwnode, "local-mac-address", addr, alen);

	if (res)

		return res;



	return fwnode_get_mac_addr(fwnode, "address", addr, alen);

}

EXPORT_SYMBOL(fwnode_get_mac_address);



/**

 * device_get_mac_address - Get the MAC for a given device

 * @dev:	Pointer to the device

 * @addr:	Address of buffer to store the MAC in

 * @alen:	Length of the buffer pointed to by addr, should be ETH_ALEN

 */

void *device_get_mac_address(struct device *dev, char *addr, int alen)

{

	return fwnode_get_mac_address(dev_fwnode(dev), addr, alen);

}

EXPORT_SYMBOL(device_get_mac_address);



/**

 * fwnode_irq_get - Get IRQ directly from a fwnode

 * @fwnode:	Pointer to the firmware node

drivers/net/ethernet/allwinner/sun4i-emac.c

+1 −1
Original line number Diff line number Diff line
@@ -852,7 +852,7 @@ static int emac_probe(struct platform_device *pdev) 
	}



	/* Read MAC-address from DT */

	ret = of_get_mac_address(np, ndev->dev_addr);

	ret = of_get_ethdev_address(np, ndev);

	if (ret) {

		/* if the MAC address is invalid get a random one */

		eth_hw_addr_random(ndev);

drivers/net/ethernet/altera/altera_tse_main.c

+1 −1
Original line number Diff line number Diff line
@@ -1524,7 +1524,7 @@ static int altera_tse_probe(struct platform_device *pdev) 
	priv->rx_dma_buf_sz = ALTERA_RXDMABUFFER_SIZE;



	/* get default MAC address from device tree */

	ret = of_get_mac_address(pdev->dev.of_node, ndev->dev_addr);

	ret = of_get_ethdev_address(pdev->dev.of_node, ndev);

	if (ret)

		eth_hw_addr_random(ndev);

drivers/net/ethernet/amd/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -168,7 +168,7 @@ config SUNLANCE 


config AMD_XGBE

	tristate "AMD 10GbE Ethernet driver"

	depends on ((OF_NET && OF_ADDRESS) || ACPI || PCI) && HAS_IOMEM

	depends on (OF_ADDRESS || ACPI || PCI) && HAS_IOMEM

	depends on X86 || ARM64 || COMPILE_TEST

	depends on PTP_1588_CLOCK_OPTIONAL

	select BITREVERSE

drivers/net/ethernet/apm/xgene-v2/main.c

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ static int xge_get_resources(struct xge_pdata *pdata) 
		return -ENOMEM;

	}



	if (!device_get_mac_address(dev, ndev->dev_addr, ETH_ALEN))

	if (device_get_ethdev_address(dev, ndev))

		eth_hw_addr_random(ndev);



	memcpy(ndev->perm_addr, ndev->dev_addr, ndev->addr_len);