i40e: Look up MAC address in Open Firmware or IDPROM
Subsystems (3)
PATCH v2 1/1 i40e: Look up MAC address in Open Firmware or IDPROM
This is the i40e equivalent of commit c762dff24c06 ("ixgbe: Look up MAC address in Open Firmware or IDPROM").
As with that fix, attempt to look up the MAC address in Open Firmware on systems that support it, and use IDPROM on SPARC if no OF address is found.
Reviewed-by Martin K. Petersen <[email protected]>
Signed-off-by Sowmini Varadhan <[email protected]>
---
v2: review comments from Andy Shevchenko
drivers/net/ethernet/intel/i40e/i40e_common.c | 32 +++++++++++++++++++++++++ 1 files changed, 32 insertions(+), 0 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_common.c +32 -0
@@ -24,6 +24,14 @@* ******************************************************************************/ +#include <linux/etherdevice.h> +#include <linux/of_net.h> +#include <linux/pci.h> +#ifdef CONFIG_SPARC +#include <asm/idprom.h> +#include <asm/prom.h> +#endif +#include "i40e.h" #include "i40e_type.h" #include "i40e_adminq.h" #include "i40e_prototype.h"
@@ -1008,6 +1016,27 @@ i40e_status i40e_aq_mac_address_write(struct i40e_hw *hw,return status; } +static int i40e_get_platform_mac_addr (struct i40e_hw *hw,u8 *mac_addr) +{ +#ifdef CONFIG_OF +struct i40e_pf *pf = hw->back; +struct device_node *dp =pci_device_to_OF_node (pf->pdev); +const unsigned char *addr; + + addr =of_get_mac_address (dp); +if (addr) { +ether_addr_copy (mac_addr, addr); +return 0 ; + } +#endif /* CONFIG_OF */ + +#ifdef CONFIG_SPARC +ether_addr_copy (mac_addr, idprom->id_ethaddr); +return 0 ; +#endif /* CONFIG_SPARC */ +return 1 ; +} +/** * i40e_get_mac_addr - get MAC address * @hw: pointer to the HW structure
@@ -1021,6 +1050,9 @@ i40e_status i40e_get_mac_addr(struct i40e_hw *hw, u8 *mac_addr)i40e_status status;u16 flags =0 ; +if (!i40e_get_platform_mac_addr (hw, mac_addr)) +return I40E_SUCCESS ; + status =i40e_aq_mac_address_read (hw, &flags, &addrs,NULL );if (flags &I40E_AQC_LAN_ADDR_VALID )
Signature · 1 line
1.7.1