target/linux/generic/pending-5.15/683-of_net-add-mac-address-to-of-tree.patch

   1 From 8585756342caa6d27008d1ad0c18023e4211a40a Mon Sep 17 00:00:00 2001
   2 From: OpenWrt community <openwrt-devel@lists.openwrt.org>
   3 Date: Wed, 13 Jul 2022 12:22:48 +0200
   4 Subject: [PATCH] of/of_net: write back netdev MAC-address to device-tree
   5
   6 The label-mac logic relies on the mac-address property of a netdev
   7 devices of-node. However, the mac address can also be stored as a
   8 different property or read from e.g. an mtd device.
   9
  10 Create this node when reading a mac-address from OF if it does not
  11 already exist and copy the mac-address used for the device to this
  12 property. This way, the MAC address can be accessed using procfs.
  13
  14 ---
  15  net/core/of_net.c | 22 ++++++++++++++++++++++
  16  1 file changed, 22 insertions(+)
  17
  18 diff --git a/net/core/of_net.c b/net/core/of_net.c
  19 index 71c38b532f72..43b28c8ddff9 100644
  20 --- a/net/core/of_net.c
  21 +++ b/net/core/of_net.c
  22 @@ -95,6 +95,27 @@ static int of_get_mac_addr_nvmem(struct device_node *np, u8 *addr)
  23         return 0;
  24  }
  25
  26 +static int of_add_mac_address(struct device_node *np, u8* addr)
  27 +{
  28 +       struct property *prop;
  29 +
  30 +       prop = kzalloc(sizeof(*prop), GFP_KERNEL);
  31 +       if (!prop)
  32 +               return -ENOMEM;
  33 +
  34 +       prop->name = "mac-address";
  35 +       prop->length = ETH_ALEN;
  36 +       prop->value = kmemdup(addr, ETH_ALEN, GFP_KERNEL);
  37 +       if (!prop->value || of_update_property(np, prop))
  38 +               goto free;
  39 +
  40 +       return 0;
  41 +free:
  42 +       kfree(prop->value);
  43 +       kfree(prop);
  44 +       return -ENOMEM;
  45 +}
  46 +
  47  /**
  48   * of_get_mac_address()
  49   * @np:                Caller's Device Node
  50 @@ -175,6 +196,7 @@ int of_get_mac_address(struct device_node *np, u8 *addr)
  51                 addr[5] = (mac_val >> 0) & 0xff;
  52         }
  53
  54 +       of_add_mac_address(np, addr);
  55         return ret;
  56  }
  57  EXPORT_SYMBOL(of_get_mac_address);
  58 --
  59