Convert ixgbe/i40e to use eth_platform_get_mac_address
Subsystems (2)
cover Convert ixgbe/i40e to use eth_platform_get_mac_address
Commit c7f5d105495a ("net: Add eth_platform_get_mac_address() helper.") provides a consolidation path for platforms like SPARC to implement arch specific code to extract the MAC address from Open Firmware, IDPROM etc.
This patchset converts ixgbe and i40e to use eth_platform_get_mac_address()
Sowmini Varadhan (2):
ixgbe: use eth_platform_get_mac_address()
i40e: use eth_platform_get_mac_address()
drivers/net/ethernet/intel/i40e/i40e_main.c | 19 +------------- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 35 +----------------------- 2 files changed, 3 insertions(+), 51 deletions(-)
PATCH 1/2 ixgbe: use eth_platform_get_mac_address()
This commit converts commit c762dff24c06 ("ixgbe: Look up MAC address in Open Firmware or IDPROM") to use eth_platform_get_mac_address() added by commit c7f5d105495a ("net: Add eth_platform_get_mac_address() helper.")
--- drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 35 +----------------------- 1 files changed, 2 insertions(+), 33 deletions(-)
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c +2 -33
@@ -52,15 +52,6 @@#include <scsi/fc/fc_fcoe.h> #include <net/vxlan.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"
@@ -8801,29 +8792,6 @@ int ixgbe_wol_supported(struct ixgbe_adapter *adapter, u16 device_id, }/** -* 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 * @ent: entry in ixgbe_pci_tbl
@@ -9104,7 +9072,8 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent) goto err_sw_init; } -ixgbe_get_platform_mac_addr (adapter); +eth_platform_get_mac_address (&adapter->pdev->dev, + adapter->hw.mac.perm_addr);memcpy (netdev->dev_addr, hw->mac.perm_addr, netdev->addr_len);
Signature · 1 line
1.7.1
Schmitt
PATCH 1/2 ixgbe: use eth_platform_get_mac_address()
Quoted 13 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Sowmini Varadhan
Sent: Tuesday, January 12, 2016 7:32 PM
To: Kirsher, Jeffrey T; Brandeburg, Jesse; Nelson, Shannon; Wyborny, Carolyn; Skidmore, Donald C; Allan, Bruce W; Ronciak, John; Williams, Mitch A; intel- wired-lan at lists.osuosl.org
Cc: sowmini.varadhan at oracle.com; davem at davemloft.net
Subject: [Intel-wired-lan] [PATCH 1/2] ixgbe: useeth_platform_get_mac_address()
Quoted 6 lines
This commit converts commit
c762dff24c06("ixgbe: Look up MAC address in Open Firmware or IDPROM") to useeth_platform_get_mac_address()added by commitc7f5d105495a("net: Addeth_platform_get_mac_address()helper.")Signed-off-by Sowmini Varadhan <[email protected]>
I don't have any SPARC systems to test this on.
I've tested to check that this patch doesn't seem to break anything on X86_64 systems.
PATCH 2/2 i40e: use eth_platform_get_mac_address()
In reply to Sowmini VaradhanThis commit converts commit b499ffb0a22c ("i40e: Look up MAC address in Open Firmware or IDPROM") to use eth_platform_get_mac_address() added by commit c7f5d105495a ("net: Add eth_platform_get_mac_address() helper.")
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 19 +------------------ 1 files changed, 1 insertions(+), 18 deletions(-)
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -18
@@ -28,11 +28,6 @@#include <linux/of_net.h> #include <linux/pci.h> -#ifdef CONFIG_SPARC -#include <asm/idprom.h> -#include <asm/prom.h> -#endif -/* Local includes */ #include "i40e.h" #include "i40e_diag.h"
@@ -10543,21 +10538,9 @@ static void i40e_print_features(struct i40e_pf *pf)**/ static void i40e_get_platform_mac_addr (struct pci_dev *pdev,struct i40e_pf *pf) { -struct device_node *dp =pci_device_to_OF_node (pdev); -const unsigned char *addr; -u8 *mac_addr = pf->hw.mac.addr; - pf->flags &= ~I40E_FLAG_PF_MAC ; - addr =of_get_mac_address (dp); -if (addr) { -ether_addr_copy (mac_addr, addr); +if (!eth_platform_get_mac_address (&pdev->dev, pf->hw.mac.addr)) pf->flags |=I40E_FLAG_PF_MAC ; -#ifdef CONFIG_SPARC - }else { -ether_addr_copy (mac_addr, idprom->id_ethaddr); - pf->flags |=I40E_FLAG_PF_MAC ; -#endif /* CONFIG_SPARC */ - } }/**
Signature · 1 line
1.7.1
Nelson
PATCH 2/2 i40e: use eth_platform_get_mac_address()
Quoted 11 lines
From: Sowmini Varadhan [mailto:sowmini.varadhan at oracle.com]
This commit converts commit
b499ffb0a22c("i40e: Look up MAC address in Open Firmware or IDPROM") to useeth_platform_get_mac_address()added by commitc7f5d105495a("net: Addeth_platform_get_mac_address()helper.")Signed-off-by Sowmini Varadhan <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_main.c | 19 +------------------ 1 files changed, 1 insertions(+), 18 deletions(-)
Much nicer - thanks Dave and Sowmini!
sln
Bowers
PATCH 2/2 i40e: use eth_platform_get_mac_address()
In reply to Sowmini VaradhanQuoted 20 lines
-----Original Message-----
From: Intel-wired-lan [mailto:intel-wired-lan-bounces at lists.osuosl.org] On Behalf Of Sowmini Varadhan
Sent: Tuesday, January 12, 2016 7:33 PM
To: Kirsher, Jeffrey T <[email protected]>; Brandeburg, Jesse <[email protected]>; Nelson, Shannon <[email protected]>; Wyborny, Carolyn <[email protected]>; Skidmore, Donald C <[email protected]>; Allan, Bruce W <[email protected]>; Ronciak, John <[email protected]>; Williams, Mitch A <[email protected]>; intel-wired-lan at lists.osuosl.org
Cc: sowmini.varadhan at oracle.com; davem at davemloft.net
Subject: [Intel-wired-lan] [PATCH 2/2] i40e: useeth_platform_get_mac_address()This commit converts commit
b499ffb0a22c("i40e: Look up MAC address in Open Firmware or IDPROM") to useeth_platform_get_mac_address()added by commitc7f5d105495a("net: Addeth_platform_get_mac_address()helper.")
Quoted 4 lines
Signed-off-by Sowmini Varadhan <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_main.c | 19 +------------------ 1 files changed, 1 insertions(+), 18 deletions(-)
Patch code changes correctly applied, MAC address lookup works correctly