Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4b6ba8aa authored by David Daney's avatar David Daney Committed by Grant Likely
Browse files

of/net: Move of_get_mac_address() to a common source file. 



There are two identical implementations of of_get_mac_address(), one
each in arch/powerpc/kernel/prom_parse.c and
arch/microblaze/kernel/prom_parse.c.  Move this function to a new
common file of_net.{c,h} and adjust all the callers to include the new
header.

Signed-off-by: default avatarDavid Daney <ddaney@caviumnetworks.com>
[grant.likely@secretlab.ca: protect header with #ifdef]
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 3985c7ce

arch/microblaze/include/asm/prom.h

+0 −3
Original line number Diff line number Diff line
@@ -64,9 +64,6 @@ 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_irq_map_pci - Resolve the interrupt for a PCI device

 * @pdev:	the device whose interrupt is to be resolved

arch/microblaze/kernel/prom_parse.c

+0 −38
Original line number Diff line number Diff line
@@ -110,41 +110,3 @@ void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop, 
	cells = prop ? *(u32 *)prop : of_n_size_cells(dn);

	*size = of_read_number(dma_window, cells);

}
 


/**

 * 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;



	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);

arch/powerpc/include/asm/prom.h

+0 −3
Original line number Diff line number Diff line
@@ -63,9 +63,6 @@ struct device_node *of_get_cpu_node(int cpu, unsigned int *thread); 
/* cache lookup */

struct device_node *of_find_next_cache_node(struct device_node *np);



/* Get the MAC address */

extern const void *of_get_mac_address(struct device_node *np);



#ifdef CONFIG_NUMA

extern int of_node_to_nid(struct device_node *device);

#else

arch/powerpc/kernel/prom_parse.c

+0 −38
Original line number Diff line number Diff line
@@ -117,41 +117,3 @@ void of_parse_dma_window(struct device_node *dn, const void *dma_window_prop, 
	cells = prop ? *(u32 *)prop : of_n_size_cells(dn);

	*size = of_read_number(dma_window, cells);

}
 


/**

 * 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;



	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);

arch/powerpc/sysdev/mv64x60_dev.c

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <linux/mv643xx.h>

#include <linux/platform_device.h>

#include <linux/of_platform.h>

#include <linux/of_net.h>

#include <linux/dma-mapping.h>



#include <asm/prom.h>