Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

kernel: change the OF mtd mac address patch to prefer mtd-mac-address over other properties

Browse source 
Fixes MAC address on TL-WDR4900

Signed-off-by: Felix Fietkau <nbd@openwrt.org>

SVN-Revision: 48512
This commit is contained in:
Felix Fietkau 2016-01-27 21:39:16 +00:00
parent 54de773f2b
commit aff2ee7e4a
1 changed files with 23 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
target/linux/generic/patches-4.4/681-NET-add-of_get_mac_address_mtd.patch
View file

@ -24,7 +24,16 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/** /**
* of_get_phy_mode - Get phy mode for given device_node * of_get_phy_mode - Get phy mode for given device_node
@@ -47,6 +48,66 @@ static const void *of_get_mac_addr(struc @@ -38,7 +39,7 @@ int of_get_phy_mode(struct device_node *
}
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; return NULL;
} }
@ -41,6 +50,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+ phandle phandle; + phandle phandle;
+ u32 mac_inc = 0; + u32 mac_inc = 0;
+ u8 mac[ETH_ALEN]; + u8 mac[ETH_ALEN];
+ void *addr;
+ +
+ 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))))
@ -70,6 +80,12 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
+ if (!is_valid_ether_addr(mac)) + if (!is_valid_ether_addr(mac))
+ return NULL; + 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); + prop = kzalloc(sizeof(*prop), GFP_KERNEL);
+ if (!prop) + if (!prop)
+ return NULL; + return NULL;
@ -91,7 +107,7 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
/** /**
* Search the device tree for the best MAC address to use. 'mac-address' is * 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 * checked first, because that is supposed to contain to "most recent" MAC
@@ -64,6 +125,9 @@ static const void *of_get_mac_addr(struc @@ -64,11 +132,18 @@ static const void *of_get_mac_addr(struc
* addresses. Some older U-Boots only initialized 'local-mac-address'. In * 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 * this case, the real MAC is in 'local-mac-address', and 'mac-address' exists
* but is all zeros. * but is all zeros.
@ -101,15 +117,12 @@ Signed-off-by: Felix Fietkau <nbd@openwrt.org>
*/ */
const void *of_get_mac_address(struct device_node *np) const void *of_get_mac_address(struct device_node *np)
{ {
@@ -77,6 +141,10 @@ const void *of_get_mac_address(struct de const void *addr;
if (addr)
return addr;
- return of_get_mac_addr(np, "address"); + addr = of_get_mac_address_mtd(np);
+ addr = of_get_mac_addr(np, "address");
+ if (addr) + if (addr)
+ return addr; + return addr;
+ +
+ return of_get_mac_address_mtd(np); addr = of_get_mac_addr(np, "mac-address");
} if (addr)
EXPORT_SYMBOL(of_get_mac_address); return addr;