mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-04 18:09:57 +00:00
![Michael Walle](/assets/img/avatar_default.png)
of_get_mac_address() returns a "const void*" pointer to a MAC address. Lately, support to fetch the MAC address by an NVMEM provider was added. But this will only work with platform devices. It will not work with PCI devices (e.g. of an integrated root complex) and esp. not with DSA ports. There is an of_* variant of the nvmem binding which works without devices. The returned data of a nvmem_cell_read() has to be freed after use. On the other hand the return of_get_mac_address() points to some static data without a lifetime. The trick for now, was to allocate a device resource managed buffer which is then returned. This will only work if we have an actual device. Change it, so that the caller of of_get_mac_address() has to supply a buffer where the MAC address is written to. Unfortunately, this will touch all drivers which use the of_get_mac_address(). Usually the code looks like: const char *addr; addr = of_get_mac_address(np); if (!IS_ERR(addr)) ether_addr_copy(ndev->dev_addr, addr); This can then be simply rewritten as: of_get_mac_address(np, ndev->dev_addr); Sometimes is_valid_ether_addr() is used to test the MAC address. of_get_mac_address() already makes sure, it just returns a valid MAC address. Thus we can just test its return code. But we have to be careful if there are still other sources for the MAC address before the of_get_mac_address(). In this case we have to keep the is_valid_ether_addr() call. The following coccinelle patch was used to convert common cases to the new style. Afterwards, I've manually gone over the drivers and fixed the return code variable: either used a new one or if one was already available use that. Mansour Moufid, thanks for that coccinelle patch! <spml> @a@ identifier x; expression y, z; @@ - x = of_get_mac_address(y); + x = of_get_mac_address(y, z); <... - ether_addr_copy(z, x); ...> @@ identifier a.x; @@ - if (<+... x ...+>) {} @@ identifier a.x; @@ if (<+... x ...+>) { ... } - else {} @@ identifier a.x; expression e; @@ - if (<+... x ...+>@e) - {} - else + if (!(e)) {...} @@ expression x, y, z; @@ - x = of_get_mac_address(y, z); + of_get_mac_address(y, z); ... when != x </spml> All drivers, except drivers/net/ethernet/aeroflex/greth.c, were compile-time tested. Suggested-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Michael Walle <michael@walle.cc> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
36 lines
799 B
C
36 lines
799 B
C
/* SPDX-License-Identifier: GPL-2.0-only */
|
|
/*
|
|
* OF helpers for network devices.
|
|
*/
|
|
|
|
#ifndef __LINUX_OF_NET_H
|
|
#define __LINUX_OF_NET_H
|
|
|
|
#include <linux/phy.h>
|
|
|
|
#ifdef CONFIG_OF_NET
|
|
#include <linux/of.h>
|
|
|
|
struct net_device;
|
|
extern int of_get_phy_mode(struct device_node *np, phy_interface_t *interface);
|
|
extern int of_get_mac_address(struct device_node *np, u8 *mac);
|
|
extern struct net_device *of_find_net_device_by_node(struct device_node *np);
|
|
#else
|
|
static inline int of_get_phy_mode(struct device_node *np,
|
|
phy_interface_t *interface)
|
|
{
|
|
return -ENODEV;
|
|
}
|
|
|
|
static inline int of_get_mac_address(struct device_node *np, u8 *mac)
|
|
{
|
|
return -ENODEV;
|
|
}
|
|
|
|
static inline struct net_device *of_find_net_device_by_node(struct device_node *np)
|
|
{
|
|
return NULL;
|
|
}
|
|
#endif
|
|
|
|
#endif /* __LINUX_OF_NET_H */
|