* [PATCH v3] powerpc: add of_get_mac_address() and update fsl_soc.c to use it
@ 2007-02-14 17:54 Timur Tabi
2007-02-16 0:33 ` Paul Mackerras
0 siblings, 1 reply; 3+ messages in thread
From: Timur Tabi @ 2007-02-14 17:54 UTC (permalink / raw)
To: paulus, linuxppc-dev, galak, benh; +Cc: Timur Tabi
Add function of_get_mac_address(), which obtains the best MAC address to use
from the device tree by checking various properties in order. The order is:
'mac-address', then 'local-mac-address', then 'address'. It skips properties
that contain invalid MAC addresses, which were probably not initialized
by U-Boot.
Update gfar_of_init() and fs_enet_of_init() in fsl_soc.c to call
of_get_mac_address().
Signed-off-by: Timur Tabi <timur@freescale.com>
---
After this patch is applied, the next step is to update the various
OF-enabled Ethernet drivers to use of_get_mac_address().
arch/powerpc/kernel/prom.c | 40 ++++++++++++++++++++++++++++++++++++++++
arch/powerpc/sysdev/fsl_soc.c | 19 +++++++------------
include/asm-powerpc/prom.h | 2 ++
3 files changed, 49 insertions(+), 12 deletions(-)
diff --git a/arch/powerpc/kernel/prom.c b/arch/powerpc/kernel/prom.c
index 3e86e6e..b36dacc 100644
--- a/arch/powerpc/kernel/prom.c
+++ b/arch/powerpc/kernel/prom.c
@@ -31,6 +31,7 @@
#include <linux/kexec.h>
#include <linux/debugfs.h>
#include <linux/irq.h>
+#include <linux/etherdevice.h>
#include <asm/prom.h>
#include <asm/rtas.h>
@@ -1612,6 +1613,45 @@ const void *get_property(const struct device_node *np, const char *name,
}
EXPORT_SYMBOL(get_property);
+/**
+ * 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
+ * address. If that isn't set, then 'local-mac-address' is checked next,
+ * because that is the default address. If that isn't set, then the obsolete
+ * 'address' is checked, just in case we're using an old device tree.
+ *
+ * Note that the 'address' property is supposed to contain a virtual address of
+ * the register set, but some DTS files have redefined that property to be the
+ * MAC address.
+ *
+ * All-zero MAC addresses are rejected, because those could be properties that
+ * exist in the device tree, but were not set by U-Boot. For example, the
+ * DTS could define 'mac-address' and 'local-mac-address', with zero MAC
+ * 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.
+*/
+const void *of_get_mac_address(struct device_node *np)
+{
+ struct property *pp;
+ const char *mac_addr;
+
+ pp = of_find_property(np, "mac-address", NULL);
+ if (pp && (pp->length == 6) && is_valid_ether_addr(pp->value))
+ return pp->value;
+
+ pp = of_find_property(np, "local-mac-address", NULL);
+ if (pp && (pp->length == 6) && is_valid_ether_addr(pp->value))
+ return pp->value;
+
+ pp = of_find_property(np, "address", NULL);
+ if (pp && (pp->length == 6) && is_valid_ether_addr(pp->value))
+ return pp->value;
+
+ return NULL;
+}
+EXPORT_SYMBOL(of_get_mac_address);
+
/*
* Add a property to a node
*/
diff --git a/arch/powerpc/sysdev/fsl_soc.c b/arch/powerpc/sysdev/fsl_soc.c
index 34161bc..d20f029 100644
--- a/arch/powerpc/sysdev/fsl_soc.c
+++ b/arch/powerpc/sysdev/fsl_soc.c
@@ -233,14 +233,7 @@ static int __init gfar_of_init(void)
goto err;
}
- mac_addr = get_property(np, "local-mac-address", NULL);
- if (mac_addr == NULL)
- mac_addr = get_property(np, "mac-address", NULL);
- if (mac_addr == NULL) {
- /* Obsolete */
- mac_addr = get_property(np, "address", NULL);
- }
-
+ mac_addr = of_get_mac_address(np);
if (mac_addr)
memcpy(gfar_data.mac_addr, mac_addr, 6);
@@ -646,8 +639,9 @@ static int __init fs_enet_of_init(void)
goto unreg;
}
- mac_addr = get_property(np, "mac-address", NULL);
- memcpy(fs_enet_data.macaddr, mac_addr, 6);
+ mac_addr = of_get_mac_address(np);
+ if (mac_addr)
+ memcpy(fs_enet_data.macaddr, mac_addr, 6);
ph = get_property(np, "phy-handle", NULL);
phy = of_find_node_by_phandle(*ph);
@@ -931,8 +925,9 @@ static int __init fs_enet_of_init(void)
goto err;
r[0].name = enet_regs;
- mac_addr = (void *)get_property(np, "mac-address", NULL);
- memcpy(fs_enet_data.macaddr, mac_addr, 6);
+ mac_addr = of_get_mac_address(np);
+ if (mac_addr)
+ memcpy(fs_enet_data.macaddr, mac_addr, 6);
ph = (phandle *) get_property(np, "phy-handle", NULL);
if (ph != NULL)
diff --git a/include/asm-powerpc/prom.h b/include/asm-powerpc/prom.h
index 0afee17..020ed01 100644
--- a/include/asm-powerpc/prom.h
+++ b/include/asm-powerpc/prom.h
@@ -255,6 +255,8 @@ extern void kdump_move_device_tree(void);
/* CPU OF node matching */
struct device_node *of_get_cpu_node(int cpu, unsigned int *thread);
+/* Get the MAC address */
+extern const void *of_get_mac_address(struct device_node *np);
/*
* OF interrupt mapping
--
1.5.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH v3] powerpc: add of_get_mac_address() and update fsl_soc.c to use it
2007-02-14 17:54 [PATCH v3] powerpc: add of_get_mac_address() and update fsl_soc.c to use it Timur Tabi
@ 2007-02-16 0:33 ` Paul Mackerras
2007-02-16 14:41 ` Timur Tabi
0 siblings, 1 reply; 3+ messages in thread
From: Paul Mackerras @ 2007-02-16 0:33 UTC (permalink / raw)
To: Timur Tabi; +Cc: linuxppc-dev
Timur Tabi writes:
> Add function of_get_mac_address(), which obtains the best MAC address to use
> from the device tree by checking various properties in order. The order is:
> 'mac-address', then 'local-mac-address', then 'address'. It skips properties
> that contain invalid MAC addresses, which were probably not initialized
> by U-Boot.
Looks OK except that of_get_mac_address should go in prom_parse.c, not
prom.c.
Paul.
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH v3] powerpc: add of_get_mac_address() and update fsl_soc.c to use it
2007-02-16 0:33 ` Paul Mackerras
@ 2007-02-16 14:41 ` Timur Tabi
0 siblings, 0 replies; 3+ messages in thread
From: Timur Tabi @ 2007-02-16 14:41 UTC (permalink / raw)
To: Paul Mackerras; +Cc: linuxppc-dev
Paul Mackerras wrote:
> Timur Tabi writes:
>
>> Add function of_get_mac_address(), which obtains the best MAC address to use
>> from the device tree by checking various properties in order. The order is:
>> 'mac-address', then 'local-mac-address', then 'address'. It skips properties
>> that contain invalid MAC addresses, which were probably not initialized
>> by U-Boot.
>
> Looks OK except that of_get_mac_address should go in prom_parse.c, not
> prom.c.
Ok, I'll submit another patch in a few hours. I presume the prototype
should stay in include/asm-powerpc/prom.h?
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2007-02-16 14:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2007-02-14 17:54 [PATCH v3] powerpc: add of_get_mac_address() and update fsl_soc.c to use it Timur Tabi
2007-02-16 0:33 ` Paul Mackerras
2007-02-16 14:41 ` Timur Tabi
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.