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

Commit c762dff2 authored by Martin K Petersen's avatar Martin K Petersen Committed by Jeff Kirsher
Browse files

ixgbe: Look up MAC address in Open Firmware or IDPROM 



Attempt to look up the MAC address in Open Firmware on systems that
support it. On SPARC resort to using the IDPROM if no OF address is
found.

Signed-off-by: default avatarMartin K Petersen <martin.petersen@oracle.com>
Tested-by: default avatarPhil Schmitt <phillip.j.schmitt@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent ad435ec6

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+35 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ 
#include <linux/slab.h>

#include <net/checksum.h>

#include <net/ip6_checksum.h>

#include <linux/etherdevice.h>

#include <linux/ethtool.h>

#include <linux/if.h>

#include <linux/if_vlan.h>
@@ -50,6 +51,15 @@ 
#include <linux/prefetch.h>

#include <scsi/fc/fc_fcoe.h>



#ifdef CONFIG_OF

#include <linux/of_net.h>

#endif



#ifdef CONFIG_SPARC

#include <asm/idprom.h>

#include <asm/prom.h>

#endif



#include "ixgbe.h"

#include "ixgbe_common.h"

#include "ixgbe_dcb_82599.h"
@@ -8020,6 +8030,29 @@ int ixgbe_wol_supported(struct ixgbe_adapter *adapter, u16 device_id, 
	return is_wol_supported;

}



/**

 * ixgbe_get_platform_mac_addr - Look up MAC address in Open Firmware / IDPROM

 * @adapter: Pointer to adapter struct

 */

static void ixgbe_get_platform_mac_addr(struct ixgbe_adapter *adapter)

{

#ifdef CONFIG_OF

	struct device_node *dp = pci_device_to_OF_node(adapter->pdev);

	struct ixgbe_hw *hw = &adapter->hw;

	const unsigned char *addr;



	addr = of_get_mac_address(dp);

	if (addr) {

		ether_addr_copy(hw->mac.perm_addr, addr);

		return;

	}

#endif /* CONFIG_OF */



#ifdef CONFIG_SPARC

	ether_addr_copy(hw->mac.perm_addr, idprom->id_ethaddr);

#endif /* CONFIG_SPARC */

}



/**

 * ixgbe_probe - Device Initialization Routine

 * @pdev: PCI device information struct
@@ -8289,6 +8322,8 @@ skip_sriov: 
		goto err_sw_init;

	}



	ixgbe_get_platform_mac_addr(adapter);



	memcpy(netdev->dev_addr, hw->mac.perm_addr, netdev->addr_len);



	if (!is_valid_ether_addr(netdev->dev_addr)) {