From cd39aba402ea7e7a11e173b0b5aa96e42bf1f2ac Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 29 Jul 2021 00:29:53 +0200 Subject: generic: write back netdev MAC-address to device-tree The label-mac logic relies on the mac-address property of a netdev devices of-node. However, the mac address can also be stored as a different property or read from e.g. an mtd device. Create this node when reading a mac-address from OF if it does not already exist and copy the mac-address used for the device to this property. This way, the MAC address can be accessed using procfs. Signed-off-by: David Bauer --- .../683-of_net-add-mac-address-to-of-tree.patch | 44 ++++++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch (limited to 'target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch') diff --git a/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch b/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch new file mode 100644 index 0000000000..3e331bac63 --- /dev/null +++ b/target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch @@ -0,0 +1,44 @@ +--- a/drivers/of/of_net.c ++++ b/drivers/of/of_net.c +@@ -132,6 +132,33 @@ static void *of_get_mac_address_mtd(stru + #endif + } + ++static int of_add_mac_address(struct device_node *np, u8* addr) ++{ ++ struct property *prop; ++ u8 *np_addr; ++ ++ np_addr = of_get_mac_addr(np, "mac-address"); ++ if (np_addr) { ++ memcpy(np_addr, addr, ETH_ALEN); ++ return 0; ++ } ++ ++ prop = kzalloc(sizeof(*prop), GFP_KERNEL); ++ if (!prop) ++ return 0; ++ ++ prop->name = "mac-address"; ++ prop->length = ETH_ALEN; ++ prop->value = kmemdup(addr, ETH_ALEN, GFP_KERNEL); ++ if (!prop->value || of_add_property(np, prop)) ++ goto free; ++ ++ return 0; ++free: ++ kfree(prop->value); ++ kfree(prop); ++ return -ENOMEM; ++} + + /** + * Search the device tree for the best MAC address to use. 'mac-address' is +@@ -205,6 +232,7 @@ found: + if (!of_property_read_u32(np, "mac-address-increment", &mac_inc)) + addr[inc_idx] += mac_inc; + ++ of_add_mac_address(np, addr); + return addr; + } + EXPORT_SYMBOL(of_get_mac_address); -- cgit v1.2.3