Skip to content

Commit 24f5c71

Browse files
MikeLooijmansclaudiubeznea
authored andcommitted
of_net: Implement of_get_nvmem_mac_address helper
It's common practice to store MAC addresses for network interfaces into nvmem devices. However the code to actually do this in the kernel lacks, so this patch adds of_get_nvmem_mac_address() for drivers to obtain the address from an nvmem cell provider. This is particulary useful on devices where the ethernet interface cannot be configured by the bootloader, for example because it's in an FPGA. Signed-off-by: Mike Looijmans <mike.looijmans@topic.nl> Reviewed-by: Florian Fainelli <f.fainelli@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: David S. Miller <davem@davemloft.net>
1 parent 0e01cb3 commit 24f5c71

3 files changed

Lines changed: 48 additions & 0 deletions

File tree

Documentation/devicetree/bindings/net/ethernet.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ Documentation/devicetree/bindings/phy/phy-bindings.txt.
1010
the boot program; should be used in cases where the MAC address assigned to
1111
the device by the boot program is different from the "local-mac-address"
1212
property;
13+
- nvmem-cells: phandle, reference to an nvmem node for the MAC address;
14+
- nvmem-cell-names: string, should be "mac-address" if nvmem is to be used;
1315
- max-speed: number, specifies maximum speed in Mbit/s supported by the device;
1416
- max-frame-size: number, maximum transfer unit (IEEE defined MTU), rather than
1517
the maximum frame size (there's contradiction in the Devicetree

drivers/of/of_net.c

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
*/
88
#include <linux/etherdevice.h>
99
#include <linux/kernel.h>
10+
#include <linux/nvmem-consumer.h>
1011
#include <linux/of_net.h>
1112
#include <linux/phy.h>
1213
#include <linux/export.h>
@@ -80,3 +81,42 @@ const void *of_get_mac_address(struct device_node *np)
8081
return of_get_mac_addr(np, "address");
8182
}
8283
EXPORT_SYMBOL(of_get_mac_address);
84+
85+
/**
86+
* Obtain the MAC address from an nvmem provider named 'mac-address' through
87+
* device tree.
88+
* On success, copies the new address into memory pointed to by addr and
89+
* returns 0. Returns a negative error code otherwise.
90+
* @np: Device tree node containing the nvmem-cells phandle
91+
* @addr: Pointer to receive the MAC address using ether_addr_copy()
92+
*/
93+
int of_get_nvmem_mac_address(struct device_node *np, void *addr)
94+
{
95+
struct nvmem_cell *cell;
96+
const void *mac;
97+
size_t len;
98+
int ret;
99+
100+
cell = of_nvmem_cell_get(np, "mac-address");
101+
if (IS_ERR(cell))
102+
return PTR_ERR(cell);
103+
104+
mac = nvmem_cell_read(cell, &len);
105+
106+
nvmem_cell_put(cell);
107+
108+
if (IS_ERR(mac))
109+
return PTR_ERR(mac);
110+
111+
if (len < ETH_ALEN || !is_valid_ether_addr(mac)) {
112+
ret = -EINVAL;
113+
} else {
114+
ether_addr_copy(addr, mac);
115+
ret = 0;
116+
}
117+
118+
kfree(mac);
119+
120+
return ret;
121+
}
122+
EXPORT_SYMBOL(of_get_nvmem_mac_address);

include/linux/of_net.h

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
struct net_device;
1414
extern int of_get_phy_mode(struct device_node *np);
1515
extern const void *of_get_mac_address(struct device_node *np);
16+
extern int of_get_nvmem_mac_address(struct device_node *np, void *addr);
1617
extern struct net_device *of_find_net_device_by_node(struct device_node *np);
1718
#else
1819
static inline int of_get_phy_mode(struct device_node *np)
@@ -25,6 +26,11 @@ static inline const void *of_get_mac_address(struct device_node *np)
2526
return NULL;
2627
}
2728

29+
static inline int of_get_nvmem_mac_address(struct device_node *np, void *addr)
30+
{
31+
return -ENODEV;
32+
}
33+
2834
static inline struct net_device *of_find_net_device_by_node(struct device_node *np)
2935
{
3036
return NULL;

0 commit comments

Comments
 (0)