KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

generic: Allow configuring an increment with mtd-mac-address

Browse source 
This is useful if the device also has an ethernet WAN interface with a
separate mac address (that is derived from the LAN mac address).

Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>

SVN-Revision: 46220
This commit is contained in:
John Crispin 2015-07-07 13:44:27 +00:00
parent fa9e259729
commit b9463ce786
3 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
target/linux/generic/patches-3.18/681-NET-add-of_get_mac_address_mtd.patch
View file

@ -23,12 +23,12 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
/** /**
* of_get_phy_mode - Get phy mode for given device_node * of_get_phy_mode - Get phy mode for given device_node
@@ -75,3 +76,39 @@ const void *of_get_mac_address(struct de @@ -75,3 +76,43 @@ const void *of_get_mac_address(struct de
return NULL; return NULL;
} }
EXPORT_SYMBOL(of_get_mac_address); EXPORT_SYMBOL(of_get_mac_address);
+ +
+int of_get_mac_address_mtd(struct device_node *np, void *mac) +int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac)
+{ +{
+ struct device_node *mtd_np = NULL; + struct device_node *mtd_np = NULL;
+ size_t retlen; + size_t retlen;
@ -37,6 +37,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ const char *part; + const char *part;
+ const __be32 *list; + const __be32 *list;
+ phandle phandle; + phandle phandle;
+ u32 mac_inc = 0;
+ +
+ list = of_get_property(np, "mtd-mac-address", &size); + list = of_get_property(np, "mtd-mac-address", &size);
+ if (!list || (size != (2 * sizeof(*list)))) + if (!list || (size != (2 * sizeof(*list))))
@ -57,9 +58,12 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ if (IS_ERR(mtd)) + if (IS_ERR(mtd))
+ return PTR_ERR(mtd); + return PTR_ERR(mtd);
+ +
+ ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, (u_char *) mac); + ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, mac);
+ put_mtd_device(mtd); + put_mtd_device(mtd);
+ +
+ if (!of_property_read_u32(np, "mtd-mac-address-increment", &mac_inc))
+ mac[5] += mac_inc;
+
+ return ret; + return ret;
+} +}
+EXPORT_SYMBOL_GPL(of_get_mac_address_mtd); +EXPORT_SYMBOL_GPL(of_get_mac_address_mtd);
@ -69,7 +73,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
#include <linux/of.h> #include <linux/of.h>
extern int of_get_phy_mode(struct device_node *np); extern int of_get_phy_mode(struct device_node *np);
extern const void *of_get_mac_address(struct device_node *np); extern const void *of_get_mac_address(struct device_node *np);
+extern int of_get_mac_address_mtd(struct device_node *np, void *mac); +extern int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac);
#else #else
static inline int of_get_phy_mode(struct device_node *np) static inline int of_get_phy_mode(struct device_node *np)
{ {

12
target/linux/generic/patches-4.0/681-NET-add-of_get_mac_address_mtd.patch
View file

@ -23,12 +23,12 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
/** /**
* of_get_phy_mode - Get phy mode for given device_node * of_get_phy_mode - Get phy mode for given device_node
@@ -75,3 +76,39 @@ const void *of_get_mac_address(struct de @@ -75,3 +76,43 @@ const void *of_get_mac_address(struct de
return NULL; return NULL;
} }
EXPORT_SYMBOL(of_get_mac_address); EXPORT_SYMBOL(of_get_mac_address);
+ +
+int of_get_mac_address_mtd(struct device_node *np, void *mac) +int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac)
+{ +{
+ struct device_node *mtd_np = NULL; + struct device_node *mtd_np = NULL;
+ size_t retlen; + size_t retlen;
@ -37,6 +37,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ const char *part; + const char *part;
+ const __be32 *list; + const __be32 *list;
+ phandle phandle; + phandle phandle;
+ u32 mac_inc = 0;
+ +
+ list = of_get_property(np, "mtd-mac-address", &size); + list = of_get_property(np, "mtd-mac-address", &size);
+ if (!list || (size != (2 * sizeof(*list)))) + if (!list || (size != (2 * sizeof(*list))))
@ -57,9 +58,12 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ if (IS_ERR(mtd)) + if (IS_ERR(mtd))
+ return PTR_ERR(mtd); + return PTR_ERR(mtd);
+ +
+ ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, (u_char *) mac); + ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, mac);
+ put_mtd_device(mtd); + put_mtd_device(mtd);
+ +
+ if (!of_property_read_u32(np, "mtd-mac-address-increment", &mac_inc))
+ mac[5] += mac_inc;
+
+ return ret; + return ret;
+} +}
+EXPORT_SYMBOL_GPL(of_get_mac_address_mtd); +EXPORT_SYMBOL_GPL(of_get_mac_address_mtd);
@ -69,7 +73,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
#include <linux/of.h> #include <linux/of.h>
extern int of_get_phy_mode(struct device_node *np); extern int of_get_phy_mode(struct device_node *np);
extern const void *of_get_mac_address(struct device_node *np); extern const void *of_get_mac_address(struct device_node *np);
+extern int of_get_mac_address_mtd(struct device_node *np, void *mac); +extern int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac);
#else #else
static inline int of_get_phy_mode(struct device_node *np) static inline int of_get_phy_mode(struct device_node *np)
{ {

12
target/linux/generic/patches-4.1/681-NET-add-of_get_mac_address_mtd.patch
View file

@ -23,12 +23,12 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
/** /**
* of_get_phy_mode - Get phy mode for given device_node * of_get_phy_mode - Get phy mode for given device_node
@@ -80,3 +81,39 @@ const void *of_get_mac_address(struct de @@ -80,3 +81,43 @@ const void *of_get_mac_address(struct de
return of_get_mac_addr(np, "address"); return of_get_mac_addr(np, "address");
} }
EXPORT_SYMBOL(of_get_mac_address); EXPORT_SYMBOL(of_get_mac_address);
+ +
+int of_get_mac_address_mtd(struct device_node *np, void *mac) +int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac)
+{ +{
+ struct device_node *mtd_np = NULL; + struct device_node *mtd_np = NULL;
+ size_t retlen; + size_t retlen;
@ -37,6 +37,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ const char *part; + const char *part;
+ const __be32 *list; + const __be32 *list;
+ phandle phandle; + phandle phandle;
+ u32 mac_inc = 0;
+ +
+ list = of_get_property(np, "mtd-mac-address", &size); + list = of_get_property(np, "mtd-mac-address", &size);
+ if (!list || (size != (2 * sizeof(*list)))) + if (!list || (size != (2 * sizeof(*list))))
@ -57,9 +58,12 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
+ if (IS_ERR(mtd)) + if (IS_ERR(mtd))
+ return PTR_ERR(mtd); + return PTR_ERR(mtd);
+ +
+ ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, (u_char *) mac); + ret = mtd_read(mtd, be32_to_cpup(list), 6, &retlen, mac);
+ put_mtd_device(mtd); + put_mtd_device(mtd);
+ +
+ if (!of_property_read_u32(np, "mtd-mac-address-increment", &mac_inc))
+ mac[5] += mac_inc;
+
+ return ret; + return ret;
+} +}
+EXPORT_SYMBOL_GPL(of_get_mac_address_mtd); +EXPORT_SYMBOL_GPL(of_get_mac_address_mtd);
@ -69,7 +73,7 @@ Signed-off-by: John Crispin <blogic@openwrt.org>
struct net_device; struct net_device;
extern int of_get_phy_mode(struct device_node *np); extern int of_get_phy_mode(struct device_node *np);
extern const void *of_get_mac_address(struct device_node *np); extern const void *of_get_mac_address(struct device_node *np);
+extern int of_get_mac_address_mtd(struct device_node *np, void *mac); +extern int of_get_mac_address_mtd(struct device_node *np, unsigned char *mac);
extern struct net_device *of_find_net_device_by_node(struct device_node *np); extern struct net_device *of_find_net_device_by_node(struct device_node *np);
#else #else
static inline int of_get_phy_mode(struct device_node *np) static inline int of_get_phy_mode(struct device_node *np)