1 From 639dba857aa554f2a78572adc4cf3c32de9ec2e2 Mon Sep 17 00:00:00 2001
2 From: Ansuel Smith <ansuelsmth@gmail.com>
3 Date: Tue, 30 Mar 2021 18:21:14 +0200
4 Subject: [PATCH 2/2] of_net: add mac-address-increment support
6 Lots of embedded devices use the mac-address of other interface
7 extracted from nvmem cells and increments it by one or two. Add two
8 bindings to integrate this and directly use the right mac-address for
9 the interface. Some example are some routers that use the gmac
10 mac-address stored in the art partition and increments it by one for the
11 wifi. mac-address-increment-byte bindings is used to tell what byte of
12 the mac-address has to be increased (if not defined the last byte is
13 increased) and mac-address-increment tells how much the byte decided
14 early has to be increased.
16 Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
18 drivers/of/of_net.c | 59 ++++++++++++++++++++++++++++++++++-----------
19 1 file changed, 45 insertions(+), 14 deletions(-)
21 diff --git a/drivers/of/of_net.c b/drivers/of/of_net.c
22 index f072e2509cc9..0dbd1f7ef396 100644
23 --- a/drivers/of/of_net.c
24 +++ b/drivers/of/of_net.c
25 @@ -55,31 +55,36 @@ static void *of_get_mac_addr(struct device_node *np, const char *name)
29 -static const void *of_get_mac_addr_nvmem(struct device_node *np)
30 +static void *of_get_mac_addr_nvmem(struct device_node *np, int *err)
35 u8 nvmem_mac[ETH_ALEN];
36 struct platform_device *pdev = of_find_device_by_node(np);
39 - return ERR_PTR(-ENODEV);
45 ret = nvmem_get_mac_address(&pdev->dev, &nvmem_mac);
47 put_device(&pdev->dev);
48 - return ERR_PTR(ret);
53 mac = devm_kmemdup(&pdev->dev, nvmem_mac, ETH_ALEN, GFP_KERNEL);
54 put_device(&pdev->dev);
56 - return ERR_PTR(-ENOMEM);
65 -static const void *of_get_mac_address_mtd(struct device_node *np)
66 +static void *of_get_mac_address_mtd(struct device_node *np)
69 struct device_node *mtd_np = NULL;
70 @@ -167,28 +172,54 @@ static const void *of_get_mac_address_mtd(struct device_node *np)
71 * If a mtd-mac-address property exists, try to fetch the MAC address from the
72 * specified mtd device, and store it as a 'mac-address' property
74 + * DT can tell the system to increment the mac-address after is extracted by
76 + * - mac-address-increment-byte to decide what byte to increase
77 + * (if not defined is increased the last byte)
78 + * - mac-address-increment to decide how much to increase. The value will
79 + * not overflow to other bytes if the increment is over 255.
80 + * (example 00:01:02:03:04:ff + 1 == 00:01:02:03:04:00)
82 * Return: Will be a valid pointer on success and ERR_PTR in case of error.
84 const void *of_get_mac_address(struct device_node *np)
87 + u32 inc_idx, mac_inc;
91 + /* Check first if the increment byte is present and valid.
92 + * If not set assume to increment the last byte if found.
94 + if (of_property_read_u32(np, "mac-address-increment-byte", &inc_idx))
96 + if (inc_idx < 3 || inc_idx > 5)
97 + return ERR_PTR(-EINVAL);
99 addr = of_get_mac_addr(np, "mac-address");
104 addr = of_get_mac_addr(np, "local-mac-address");
109 addr = of_get_mac_addr(np, "address");
114 addr = of_get_mac_address_mtd(np);
119 + addr = of_get_mac_addr_nvmem(np, &ret);
121 + return ERR_PTR(ret);
124 + if (!of_property_read_u32(np, "mac-address-increment", &mac_inc))
125 + addr[inc_idx] += mac_inc;
127 - return of_get_mac_addr_nvmem(np);
130 EXPORT_SYMBOL(of_get_mac_address);