mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

of: net: support NVMEM cells with MAC in text format 

Some NVMEM devices have text based cells. In such cases MAC is stored in
a XX:XX:XX:XX:XX:XX format. Use mac_pton() to parse such data and
support those NVMEM cells. This is required to support e.g. a very
popular U-Boot and its environment variables.

Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Rafał Miłecki 2021-12-23 13:27:47 +01:00 committed by David S. Miller
parent 271d3be1c3
commit 9ed319e411
1 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
net/core/of_net.c
View File

@ -61,7 +61,7 @@ static int of_get_mac_addr_nvmem(struct device_node *np, u8 *addr)
{ {
struct platform_device *pdev = of_find_device_by_node(np); struct platform_device *pdev = of_find_device_by_node(np);
struct nvmem_cell *cell; struct nvmem_cell *cell;
const void *mac; const void *buf;
size_t len; size_t len;
int ret; int ret;
@ -78,21 +78,32 @@ static int of_get_mac_addr_nvmem(struct device_node *np, u8 *addr)
if (IS_ERR(cell)) if (IS_ERR(cell))
return PTR_ERR(cell); return PTR_ERR(cell);
mac = nvmem_cell_read(cell, &len); buf = nvmem_cell_read(cell, &len);
nvmem_cell_put(cell); nvmem_cell_put(cell);
if (IS_ERR(mac)) if (IS_ERR(buf))
return PTR_ERR(mac); return PTR_ERR(buf);
if (len != ETH_ALEN || !is_valid_ether_addr(mac)) { ret = 0;
kfree(mac); if (len == ETH_ALEN) {
return -EINVAL; if (is_valid_ether_addr(buf))
memcpy(addr, buf, ETH_ALEN);
else
ret = -EINVAL;
} else if (len == 3 * ETH_ALEN - 1) {
u8 mac[ETH_ALEN];
if (mac_pton(buf, mac))
memcpy(addr, mac, ETH_ALEN);
else
ret = -EINVAL;
} else {
ret = -EINVAL;
} }
memcpy(addr, mac, ETH_ALEN); kfree(buf);
kfree(mac);
return 0; return ret;
} }
/** /**