aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Bauer <mail@david-bauer.net>2021-07-29 00:29:53 +0200
committerDavid Bauer <mail@david-bauer.net>2021-07-29 00:30:05 +0200
commitcd39aba402ea7e7a11e173b0b5aa96e42bf1f2ac (patch)
tree0d2179f86b5202c69d63ac96d4dd3e661e68c3ce
parent57ece63cd8cfb6de0668bffccf5e6cef766d3056 (diff)
downloadupstream-cd39aba402ea7e7a11e173b0b5aa96e42bf1f2ac.tar.gz
upstream-cd39aba402ea7e7a11e173b0b5aa96e42bf1f2ac.tar.bz2
upstream-cd39aba402ea7e7a11e173b0b5aa96e42bf1f2ac.zip
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 <mail@david-bauer.net>
-rw-r--r--target/linux/generic/pending-5.10/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch33
-rw-r--r--target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch6
-rw-r--r--target/linux/generic/pending-5.10/683-of_net-add-mac-address-to-of-tree.patch44
-rw-r--r--target/linux/generic/pending-5.4/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch33
-rw-r--r--target/linux/generic/pending-5.4/682-of_net-add-mac-address-increment-support.patch6
-rw-r--r--target/linux/generic/pending-5.4/683-of_net-add-mac-address-to-of-tree.patch44
6 files changed, 112 insertions, 54 deletions
diff --git a/target/linux/generic/pending-5.10/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch b/target/linux/generic/pending-5.10/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch
index 9e16564953..7d2267eb29 100644
--- a/target/linux/generic/pending-5.10/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch
+++ b/target/linux/generic/pending-5.10/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch
@@ -34,13 +34,14 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
{
struct property *pp = of_find_property(np, name, NULL);
-@@ -78,6 +79,70 @@ static const void *of_get_mac_addr_nvmem
+@@ -78,6 +79,55 @@ static const void *of_get_mac_addr_nvmem
return mac;
}
+static const void *of_get_mac_address_mtd(struct device_node *np)
+{
+#ifdef CONFIG_MTD
++ struct platform_device *pdev = of_find_device_by_node(np);
+ struct device_node *mtd_np = NULL;
+ struct property *prop;
+ size_t retlen;
@@ -77,46 +78,30 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+ if (!is_valid_ether_addr(mac))
+ return NULL;
+
-+ addr = of_get_mac_addr(np, "mac-address");
-+ if (addr) {
-+ memcpy(addr, mac, ETH_ALEN);
-+ return addr;
-+ }
-+
-+ prop = kzalloc(sizeof(*prop), GFP_KERNEL);
-+ if (!prop)
-+ return NULL;
-+
-+ prop->name = "mac-address";
-+ prop->length = ETH_ALEN;
-+ prop->value = kmemdup(mac, ETH_ALEN, GFP_KERNEL);
-+ if (!prop->value || of_add_property(np, prop))
-+ goto free;
++ addr = devm_kmemdup(&pdev->dev, mac, ETH_ALEN, GFP_KERNEL);
++ if (!addr)
++ return ERR_PTR(-ENOMEM);
+
-+ return prop->value;
-+free:
-+ kfree(prop->value);
-+ kfree(prop);
++ return addr;
+#endif
-+ return NULL;
+}
+
+
/**
* Search the device tree for the best MAC address to use. 'mac-address' is
* checked first, because that is supposed to contain to "most recent" MAC
-@@ -98,6 +163,10 @@ static const void *of_get_mac_addr_nvmem
+@@ -98,6 +148,10 @@ static const void *of_get_mac_addr_nvmem
* this case, the real MAC is in 'local-mac-address', and 'mac-address' exists
* but is all zeros.
*
+ *
+ * If a mtd-mac-address property exists, try to fetch the MAC address from the
-+ * specified mtd device, and store it as a 'mac-address' property
++ * specified mtd device.
+ *
* Return: Will be a valid pointer on success and ERR_PTR in case of error.
*/
const void *of_get_mac_address(struct device_node *np)
-@@ -116,6 +185,10 @@ const void *of_get_mac_address(struct de
+@@ -116,6 +170,10 @@ const void *of_get_mac_address(struct de
if (addr)
return addr;
diff --git a/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch b/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch
index 0776d7bccc..9032b9186c 100644
--- a/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch
+++ b/target/linux/generic/pending-5.10/682-of_net-add-mac-address-increment-support.patch
@@ -64,10 +64,10 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+static void *of_get_mac_address_mtd(struct device_node *np)
{
#ifdef CONFIG_MTD
- struct device_node *mtd_np = NULL;
-@@ -167,28 +172,54 @@ free:
+ struct platform_device *pdev = of_find_device_by_node(np);
+@@ -152,28 +157,54 @@ static const void *of_get_mac_address_mt
* If a mtd-mac-address property exists, try to fetch the MAC address from the
- * specified mtd device, and store it as a 'mac-address' property
+ * specified mtd device.
*
+ * DT can tell the system to increment the mac-address after is extracted by
+ * using:
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);
diff --git a/target/linux/generic/pending-5.4/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch b/target/linux/generic/pending-5.4/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch
index 01f940dec7..b6ac24abcd 100644
--- a/target/linux/generic/pending-5.4/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch
+++ b/target/linux/generic/pending-5.4/681-NET-add-mtd-mac-address-support-to-of_get_mac_addres.patch
@@ -34,13 +34,14 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
{
struct property *pp = of_find_property(np, name, NULL);
-@@ -72,6 +73,70 @@ static const void *of_get_mac_addr_nvmem
+@@ -72,6 +73,55 @@ static const void *of_get_mac_addr_nvmem
return mac;
}
+static const void *of_get_mac_address_mtd(struct device_node *np)
+{
+#ifdef CONFIG_MTD
++ struct platform_device *pdev = of_find_device_by_node(np);
+ struct device_node *mtd_np = NULL;
+ struct property *prop;
+ size_t retlen;
@@ -77,46 +78,30 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+ if (!is_valid_ether_addr(mac))
+ return NULL;
+
-+ addr = of_get_mac_addr(np, "mac-address");
-+ if (addr) {
-+ memcpy(addr, mac, ETH_ALEN);
-+ return addr;
-+ }
-+
-+ prop = kzalloc(sizeof(*prop), GFP_KERNEL);
-+ if (!prop)
-+ return NULL;
-+
-+ prop->name = "mac-address";
-+ prop->length = ETH_ALEN;
-+ prop->value = kmemdup(mac, ETH_ALEN, GFP_KERNEL);
-+ if (!prop->value || of_add_property(np, prop))
-+ goto free;
++ addr = devm_kmemdup(&pdev->dev, mac, ETH_ALEN, GFP_KERNEL);
++ if (!addr)
++ return ERR_PTR(-ENOMEM);
+
-+ return prop->value;
-+free:
-+ kfree(prop->value);
-+ kfree(prop);
++ return addr;
+#endif
-+ return NULL;
+}
+
+
/**
* Search the device tree for the best MAC address to use. 'mac-address' is
* checked first, because that is supposed to contain to "most recent" MAC
-@@ -92,6 +157,10 @@ static const void *of_get_mac_addr_nvmem
+@@ -92,6 +142,10 @@ static const void *of_get_mac_addr_nvmem
* this case, the real MAC is in 'local-mac-address', and 'mac-address' exists
* but is all zeros.
*
+ *
+ * If a mtd-mac-address property exists, try to fetch the MAC address from the
-+ * specified mtd device, and store it as a 'mac-address' property
++ * specified mtd device.
+ *
* Return: Will be a valid pointer on success and ERR_PTR in case of error.
*/
const void *of_get_mac_address(struct device_node *np)
-@@ -110,6 +179,10 @@ const void *of_get_mac_address(struct de
+@@ -110,6 +164,10 @@ const void *of_get_mac_address(struct de
if (addr)
return addr;
diff --git a/target/linux/generic/pending-5.4/682-of_net-add-mac-address-increment-support.patch b/target/linux/generic/pending-5.4/682-of_net-add-mac-address-increment-support.patch
index 81f946ff7f..120ef52ff8 100644
--- a/target/linux/generic/pending-5.4/682-of_net-add-mac-address-increment-support.patch
+++ b/target/linux/generic/pending-5.4/682-of_net-add-mac-address-increment-support.patch
@@ -64,10 +64,10 @@ Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
+static void *of_get_mac_address_mtd(struct device_node *np)
{
#ifdef CONFIG_MTD
- struct device_node *mtd_np = NULL;
-@@ -161,28 +166,54 @@ free:
+ struct platform_device *pdev = of_find_device_by_node(np);
+@@ -146,28 +151,54 @@ static const void *of_get_mac_address_mt
* If a mtd-mac-address property exists, try to fetch the MAC address from the
- * specified mtd device, and store it as a 'mac-address' property
+ * specified mtd device.
*
+ * DT can tell the system to increment the mac-address after is extracted by
+ * using:
diff --git a/target/linux/generic/pending-5.4/683-of_net-add-mac-address-to-of-tree.patch b/target/linux/generic/pending-5.4/683-of_net-add-mac-address-to-of-tree.patch
new file mode 100644
index 0000000000..706a864070
--- /dev/null
+++ b/target/linux/generic/pending-5.4/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
+@@ -125,6 +125,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
+@@ -198,6 +225,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);