i40e: Add ndo_get_phys_port_id() callback support
This patch adds a new API to get the port mac address from firmware. It also adds support to the ndo_get_phys_port_id() callback to provide port specific unique id to the netdev layer. If the adapter has a valid per-port mac address then that would be used for this purpose and is expected to be unique on a per-port basis. The information can be viewed by reading the phys_port_id attribute in sysfs for each netdev or via IF netlink interface. Change-ID: I341fa6fff9c112f1f6d987189309e730e0b50e8b Signed-off-by: Neerav Parikh <neerav.parikh@intel.com> Acked-by: Shannon Nelson <shannon.nelson@intel.com> Tested-by: Jim Young <jamesx.m.young@intel.com> Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
committed by
Jeff Kirsher
parent
a84bc2a901
commit
1f224ad2f7
@@ -279,6 +279,7 @@ struct i40e_pf {
|
|||||||
#ifdef CONFIG_I40E_VXLAN
|
#ifdef CONFIG_I40E_VXLAN
|
||||||
#define I40E_FLAG_VXLAN_FILTER_SYNC (u64)(1 << 27)
|
#define I40E_FLAG_VXLAN_FILTER_SYNC (u64)(1 << 27)
|
||||||
#endif
|
#endif
|
||||||
|
#define I40E_FLAG_PORT_ID_VALID (u64)(1 << 28)
|
||||||
#define I40E_FLAG_DCB_CAPABLE (u64)(1 << 29)
|
#define I40E_FLAG_DCB_CAPABLE (u64)(1 << 29)
|
||||||
|
|
||||||
/* tracks features that get auto disabled by errors */
|
/* tracks features that get auto disabled by errors */
|
||||||
|
@@ -654,6 +654,31 @@ i40e_status i40e_get_mac_addr(struct i40e_hw *hw, u8 *mac_addr)
|
|||||||
return status;
|
return status;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* i40e_get_port_mac_addr - get Port MAC address
|
||||||
|
* @hw: pointer to the HW structure
|
||||||
|
* @mac_addr: pointer to Port MAC address
|
||||||
|
*
|
||||||
|
* Reads the adapter's Port MAC address
|
||||||
|
**/
|
||||||
|
i40e_status i40e_get_port_mac_addr(struct i40e_hw *hw, u8 *mac_addr)
|
||||||
|
{
|
||||||
|
struct i40e_aqc_mac_address_read_data addrs;
|
||||||
|
i40e_status status;
|
||||||
|
u16 flags = 0;
|
||||||
|
|
||||||
|
status = i40e_aq_mac_address_read(hw, &flags, &addrs, NULL);
|
||||||
|
if (status)
|
||||||
|
return status;
|
||||||
|
|
||||||
|
if (flags & I40E_AQC_PORT_ADDR_VALID)
|
||||||
|
memcpy(mac_addr, &addrs.port_mac, sizeof(addrs.port_mac));
|
||||||
|
else
|
||||||
|
status = I40E_ERR_INVALID_MAC_ADDR;
|
||||||
|
|
||||||
|
return status;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* i40e_pre_tx_queue_cfg - pre tx queue configure
|
* i40e_pre_tx_queue_cfg - pre tx queue configure
|
||||||
* @hw: pointer to the HW structure
|
* @hw: pointer to the HW structure
|
||||||
|
@@ -7018,6 +7018,22 @@ static void i40e_del_vxlan_port(struct net_device *netdev,
|
|||||||
}
|
}
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
static int i40e_get_phys_port_id(struct net_device *netdev,
|
||||||
|
struct netdev_phys_port_id *ppid)
|
||||||
|
{
|
||||||
|
struct i40e_netdev_priv *np = netdev_priv(netdev);
|
||||||
|
struct i40e_pf *pf = np->vsi->back;
|
||||||
|
struct i40e_hw *hw = &pf->hw;
|
||||||
|
|
||||||
|
if (!(pf->flags & I40E_FLAG_PORT_ID_VALID))
|
||||||
|
return -EOPNOTSUPP;
|
||||||
|
|
||||||
|
ppid->id_len = min_t(int, sizeof(hw->mac.port_addr), sizeof(ppid->id));
|
||||||
|
memcpy(ppid->id, hw->mac.port_addr, ppid->id_len);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
#ifdef HAVE_FDB_OPS
|
#ifdef HAVE_FDB_OPS
|
||||||
#ifdef USE_CONST_DEV_UC_CHAR
|
#ifdef USE_CONST_DEV_UC_CHAR
|
||||||
static int i40e_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
|
static int i40e_ndo_fdb_add(struct ndmsg *ndm, struct nlattr *tb[],
|
||||||
@@ -7137,6 +7153,7 @@ static const struct net_device_ops i40e_netdev_ops = {
|
|||||||
.ndo_add_vxlan_port = i40e_add_vxlan_port,
|
.ndo_add_vxlan_port = i40e_add_vxlan_port,
|
||||||
.ndo_del_vxlan_port = i40e_del_vxlan_port,
|
.ndo_del_vxlan_port = i40e_del_vxlan_port,
|
||||||
#endif
|
#endif
|
||||||
|
.ndo_get_phys_port_id = i40e_get_phys_port_id,
|
||||||
#ifdef HAVE_FDB_OPS
|
#ifdef HAVE_FDB_OPS
|
||||||
.ndo_fdb_add = i40e_ndo_fdb_add,
|
.ndo_fdb_add = i40e_ndo_fdb_add,
|
||||||
#ifndef USE_DEFAULT_FDB_DEL_DUMP
|
#ifndef USE_DEFAULT_FDB_DEL_DUMP
|
||||||
@@ -8686,6 +8703,9 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
|
|||||||
}
|
}
|
||||||
dev_info(&pdev->dev, "MAC address: %pM\n", hw->mac.addr);
|
dev_info(&pdev->dev, "MAC address: %pM\n", hw->mac.addr);
|
||||||
ether_addr_copy(hw->mac.perm_addr, hw->mac.addr);
|
ether_addr_copy(hw->mac.perm_addr, hw->mac.addr);
|
||||||
|
i40e_get_port_mac_addr(hw, hw->mac.port_addr);
|
||||||
|
if (is_valid_ether_addr(hw->mac.port_addr))
|
||||||
|
pf->flags |= I40E_FLAG_PORT_ID_VALID;
|
||||||
|
|
||||||
pci_set_drvdata(pdev, pf);
|
pci_set_drvdata(pdev, pf);
|
||||||
pci_save_state(pdev);
|
pci_save_state(pdev);
|
||||||
|
@@ -230,8 +230,8 @@ i40e_status i40e_pf_reset(struct i40e_hw *hw);
|
|||||||
void i40e_clear_hw(struct i40e_hw *hw);
|
void i40e_clear_hw(struct i40e_hw *hw);
|
||||||
void i40e_clear_pxe_mode(struct i40e_hw *hw);
|
void i40e_clear_pxe_mode(struct i40e_hw *hw);
|
||||||
bool i40e_get_link_status(struct i40e_hw *hw);
|
bool i40e_get_link_status(struct i40e_hw *hw);
|
||||||
i40e_status i40e_get_mac_addr(struct i40e_hw *hw,
|
i40e_status i40e_get_mac_addr(struct i40e_hw *hw, u8 *mac_addr);
|
||||||
u8 *mac_addr);
|
i40e_status i40e_get_port_mac_addr(struct i40e_hw *hw, u8 *mac_addr);
|
||||||
i40e_status i40e_validate_mac_addr(u8 *mac_addr);
|
i40e_status i40e_validate_mac_addr(u8 *mac_addr);
|
||||||
void i40e_pre_tx_queue_cfg(struct i40e_hw *hw, u32 queue, bool enable);
|
void i40e_pre_tx_queue_cfg(struct i40e_hw *hw, u32 queue, bool enable);
|
||||||
/* prototype for functions used for NVM access */
|
/* prototype for functions used for NVM access */
|
||||||
|
@@ -246,6 +246,7 @@ struct i40e_mac_info {
|
|||||||
u8 addr[ETH_ALEN];
|
u8 addr[ETH_ALEN];
|
||||||
u8 perm_addr[ETH_ALEN];
|
u8 perm_addr[ETH_ALEN];
|
||||||
u8 san_addr[ETH_ALEN];
|
u8 san_addr[ETH_ALEN];
|
||||||
|
u8 port_addr[ETH_ALEN];
|
||||||
u16 max_fcoeq;
|
u16 max_fcoeq;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user