kernel: add workaround to rebuild vdso-o32.so.dbg

[openwrt/openwrt.git] / target / linux / generic / patches-4.4 / 681-NET-add-of_get_mac_address_mtd.patch

diff --git a/target/linux/generic/patches-4.4/681-NET-add-of_get_mac_address_mtd.patch b/target/linux/generic/patches-4.4/681-NET-add-of_get_mac_address_mtd.patch
index 688cf6e44a6f38eb69bf6905748b6b592c611ad9..5b1a9ceaebda59979d5d852f773fe26926993a04 100644 (file)
--- a/target/linux/generic/patches-4.4/681-NET-add-of_get_mac_address_mtd.patch
+++ b/target/linux/generic/patches-4.4/681-NET-add-of_get_mac_address_mtd.patch
@@ -1,6 +1,6 @@
 From: John Crispin <blogic@openwrt.org>
 Date: Sun, 27 Jul 2014 09:40:01 +0100
-Subject: NET: add of_get_mac_address_mtd()
+Subject: NET: add mtd-mac-address support to of_get_mac_address()
 
 Many embedded devices have information such as mac addresses stored inside mtd
 devices. This patch allows us to add a property inside a node describing a
@@ -8,6 +8,7 @@ network interface. The new property points at a mtd partition with an offset
 where the mac address can be found.
 
 Signed-off-by: John Crispin <blogic@openwrt.org>
+Signed-off-by: Felix Fietkau <nbd@openwrt.org>
 ---
  drivers/of/of_net.c    |   37 +++++++++++++++++++++++++++++++++++++
  include/linux/of_net.h |    1 +
@@ -23,15 +24,24 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
  
  /**
   * of_get_phy_mode - Get phy mode for given device_node
-@@ -80,3 +81,45 @@ const void *of_get_mac_address(struct de
-       return of_get_mac_addr(np, "address");
+@@ -38,7 +39,7 @@ int of_get_phy_mode(struct device_node *
  }
- EXPORT_SYMBOL(of_get_mac_address);
-+
-+#ifdef CONFIG_MTD
-+int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac)
+ EXPORT_SYMBOL_GPL(of_get_phy_mode);
+ 
+-static const void *of_get_mac_addr(struct device_node *np, const char *name)
++static void *of_get_mac_addr(struct device_node *np, const char *name)
+ {
+       struct property *pp = of_find_property(np, name, NULL);
+ 
+@@ -47,6 +48,73 @@ static const void *of_get_mac_addr(struc
+       return NULL;
+ }
+ 
++static const void *of_get_mac_address_mtd(struct device_node *np)
 +{
++#ifdef CONFIG_MTD
 +      struct device_node *mtd_np = NULL;
++      struct property *prop;
 +      size_t retlen;
 +      int size, ret;
 +      struct mtd_info *mtd;
@@ -39,17 +49,19 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +      const __be32 *list;
 +      phandle phandle;
 +      u32 mac_inc = 0;
++      u8 mac[ETH_ALEN];
++      void *addr;
 +
 +      list = of_get_property(np, "mtd-mac-address", &size);
 +      if (!list || (size != (2 * sizeof(*list))))
-+              return -ENOENT;
++              return NULL;
 +
 +      phandle = be32_to_cpup(list++);
 +      if (phandle)
 +              mtd_np = of_find_node_by_phandle(phandle);
 +
 +      if (!mtd_np)
-+              return -ENOENT;
++              return NULL;
 +
 +      part = of_get_property(mtd_np, "label", NULL);
 +      if (!part)
@@ -57,7 +69,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +
 +      mtd = get_mtd_device_nm(part);
 +      if (IS_ERR(mtd))
-+              return PTR_ERR(mtd);
++              return NULL;
 +
 +      ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, mac);
 +      put_mtd_device(mtd);
@@ -65,24 +77,52 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
 +      if (!of_property_read_u32(np, "mtd-mac-address-increment", &mac_inc))
 +              mac[5] += mac_inc;
 +
-+      return ret;
-+}
-+EXPORT_SYMBOL_GPL(of_get_mac_address_mtd);
++      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;
++
++      return prop->value;
++free:
++      kfree(prop->value);
++      kfree(prop);
 +#endif
---- a/include/linux/of_net.h
-+++ b/include/linux/of_net.h
-@@ -13,6 +13,14 @@
- struct net_device;
- extern int of_get_phy_mode(struct device_node *np);
- extern const void *of_get_mac_address(struct device_node *np);
-+#ifdef CONFIG_MTD
-+extern int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac);
-+#else
-+static inline int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac)
-+{
-+      return -ENOENT;
++      return NULL;
 +}
-+#endif
- extern struct net_device *of_find_net_device_by_node(struct device_node *np);
- #else
- static inline int of_get_phy_mode(struct device_node *np)
++
+ /**
+  * 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
+@@ -64,11 +132,18 @@ static const void *of_get_mac_addr(struc
+  * addresses.  Some older U-Boots only initialized 'local-mac-address'.  In
+  * 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
+ */
+ const void *of_get_mac_address(struct device_node *np)
+ {
+       const void *addr;
+ 
++      addr = of_get_mac_address_mtd(np);
++      if (addr)
++              return addr;
++
+       addr = of_get_mac_addr(np, "mac-address");
+       if (addr)
+               return addr;