forked from mirrors/linux
		
	net: Add eth_platform_get_mac_address() helper.
A repeating pattern in drivers has become to use OF node information and, if not found, platform specific host information to extract the ethernet address for a given device. Currently this is done with a call to of_get_mac_address() and then some ifdef'd stuff for SPARC. Consolidate this into a portable routine, and provide the arch_get_platform_mac_address() weak function hook for all architectures to implement if they want. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
		
							parent
							
								
									cdba756f58
								
							
						
					
					
						commit
						c7f5d10549
					
				
					 3 changed files with 41 additions and 0 deletions
				
			
		| 
						 | 
					@ -9,6 +9,7 @@
 | 
				
			||||||
#include <linux/types.h>
 | 
					#include <linux/types.h>
 | 
				
			||||||
#include <linux/init.h>
 | 
					#include <linux/init.h>
 | 
				
			||||||
#include <linux/export.h>
 | 
					#include <linux/export.h>
 | 
				
			||||||
 | 
					#include <linux/etherdevice.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#include <asm/oplib.h>
 | 
					#include <asm/oplib.h>
 | 
				
			||||||
#include <asm/idprom.h>
 | 
					#include <asm/idprom.h>
 | 
				
			||||||
| 
						 | 
					@ -60,6 +61,12 @@ static void __init display_system_type(unsigned char machtype)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
#endif
 | 
					#endif
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					unsigned char *arch_get_platform_mac_address(void)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						return idprom->id_ethaddr;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
/* Calculate the IDPROM checksum (xor of the data bytes). */
 | 
					/* Calculate the IDPROM checksum (xor of the data bytes). */
 | 
				
			||||||
static unsigned char __init calc_idprom_cksum(struct idprom *idprom)
 | 
					static unsigned char __init calc_idprom_cksum(struct idprom *idprom)
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -29,6 +29,9 @@
 | 
				
			||||||
#include <asm/bitsperlong.h>
 | 
					#include <asm/bitsperlong.h>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
#ifdef __KERNEL__
 | 
					#ifdef __KERNEL__
 | 
				
			||||||
 | 
					struct device;
 | 
				
			||||||
 | 
					int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr);
 | 
				
			||||||
 | 
					unsigned char *arch_get_platform_get_mac_address(void);
 | 
				
			||||||
u32 eth_get_headlen(void *data, unsigned int max_len);
 | 
					u32 eth_get_headlen(void *data, unsigned int max_len);
 | 
				
			||||||
__be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev);
 | 
					__be16 eth_type_trans(struct sk_buff *skb, struct net_device *dev);
 | 
				
			||||||
extern const struct header_ops eth_header_ops;
 | 
					extern const struct header_ops eth_header_ops;
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -52,6 +52,8 @@
 | 
				
			||||||
#include <linux/errno.h>
 | 
					#include <linux/errno.h>
 | 
				
			||||||
#include <linux/init.h>
 | 
					#include <linux/init.h>
 | 
				
			||||||
#include <linux/if_ether.h>
 | 
					#include <linux/if_ether.h>
 | 
				
			||||||
 | 
					#include <linux/of_net.h>
 | 
				
			||||||
 | 
					#include <linux/pci.h>
 | 
				
			||||||
#include <net/dst.h>
 | 
					#include <net/dst.h>
 | 
				
			||||||
#include <net/arp.h>
 | 
					#include <net/arp.h>
 | 
				
			||||||
#include <net/sock.h>
 | 
					#include <net/sock.h>
 | 
				
			||||||
| 
						 | 
					@ -485,3 +487,32 @@ static int __init eth_offload_init(void)
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
fs_initcall(eth_offload_init);
 | 
					fs_initcall(eth_offload_init);
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					unsigned char * __weak arch_get_platform_mac_address(void)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						return NULL;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					int eth_platform_get_mac_address(struct device *dev, u8 *mac_addr)
 | 
				
			||||||
 | 
					{
 | 
				
			||||||
 | 
						const unsigned char *addr;
 | 
				
			||||||
 | 
						struct device_node *dp;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if (dev_is_pci(dev))
 | 
				
			||||||
 | 
							dp = pci_device_to_OF_node(to_pci_dev(dev));
 | 
				
			||||||
 | 
						else
 | 
				
			||||||
 | 
							dp = dev->of_node;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						addr = NULL;
 | 
				
			||||||
 | 
						if (dp)
 | 
				
			||||||
 | 
							addr = of_get_mac_address(dp);
 | 
				
			||||||
 | 
						if (!addr)
 | 
				
			||||||
 | 
							addr = arch_get_platform_mac_address();
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						if (!addr)
 | 
				
			||||||
 | 
							return -ENODEV;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
						ether_addr_copy(mac_addr, addr);
 | 
				
			||||||
 | 
						return 0;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					EXPORT_SYMBOL(eth_platform_get_mac_address);
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in a new issue