korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-26 12:34:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

iavf: Add usage of new virtchnl format to set default MAC

Browse Source 
Use new type field of VIRTCHNL_OP_ADD_ETH_ADDR and
VIRTCHNL_OP_DEL_ETH_ADDR requests to indicate that
VF wants to change its default MAC address.

Signed-off-by: Sylwester Dziedziuch <sylwesterx.dziedziuch@intel.com>
Signed-off-by: Jedrzej Jagielski <jedrzej.jagielski@intel.com>
Signed-off-by: Mateusz Palczewski <mateusz.palczewski@intel.com>
Tested-by: Konrad Jankowski <konrad0.jankowski@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
This commit is contained in:
Mateusz Palczewski 2022-01-19 11:15:21 +01:00 committed by Tony Nguyen
parent 87dba256c7
commit a3e839d539
2 changed files with 25 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/ethernet/intel/iavf/iavf_main.c
View File

@ -876,6 +876,7 @@ struct iavf_mac_filter *iavf_add_filter(struct iavf_adapter *adapter,
list_add_tail(&f->list, &adapter->mac_filter_list); list_add_tail(&f->list, &adapter->mac_filter_list);
f->add = true; f->add = true;
f->is_new_mac = true; f->is_new_mac = true;
f->is_primary = false;
adapter->aq_required |= IAVF_FLAG_AQ_ADD_MAC_FILTER; adapter->aq_required |= IAVF_FLAG_AQ_ADD_MAC_FILTER;
} else { } else {
f->remove = false; f->remove = false;
@ -909,16 +910,21 @@ static int iavf_set_mac(struct net_device *netdev, void *p)
f = iavf_find_filter(adapter, hw->mac.addr); f = iavf_find_filter(adapter, hw->mac.addr);
if (f) { if (f) {
f->remove = true; f->remove = true;
f->is_primary = true;
adapter->aq_required |= IAVF_FLAG_AQ_DEL_MAC_FILTER; adapter->aq_required |= IAVF_FLAG_AQ_DEL_MAC_FILTER;
} }
f = iavf_add_filter(adapter, addr->sa_data); f = iavf_add_filter(adapter, addr->sa_data);
if (f) {
f->is_primary = true;
ether_addr_copy(hw->mac.addr, addr->sa_data);
}
spin_unlock_bh(&adapter->mac_vlan_list_lock); spin_unlock_bh(&adapter->mac_vlan_list_lock);
if (f) { /* schedule the watchdog task to immediately process the request */
ether_addr_copy(hw->mac.addr, addr->sa_data); if (f)
} queue_work(iavf_wq, &adapter->watchdog_task.work);
return (f == NULL) ? -ENOMEM : 0; return (f == NULL) ? -ENOMEM : 0;
} }

16
drivers/net/ethernet/intel/iavf/iavf_virtchnl.c
View File

@ -453,6 +453,20 @@ void iavf_map_queues(struct iavf_adapter *adapter)
kfree(vimi); kfree(vimi);
} }
/**
* iavf_set_mac_addr_type - Set the correct request type from the filter type
* @virtchnl_ether_addr: pointer to requested list element
* @filter: pointer to requested filter
**/
static void
iavf_set_mac_addr_type(struct virtchnl_ether_addr *virtchnl_ether_addr,
const struct iavf_mac_filter *filter)
{
virtchnl_ether_addr->type = filter->is_primary ?
VIRTCHNL_ETHER_ADDR_PRIMARY :
VIRTCHNL_ETHER_ADDR_EXTRA;
}
/** /**
* iavf_add_ether_addrs * iavf_add_ether_addrs
* @adapter: adapter structure * @adapter: adapter structure
@ -508,6 +522,7 @@ void iavf_add_ether_addrs(struct iavf_adapter *adapter)
list_for_each_entry(f, &adapter->mac_filter_list, list) { list_for_each_entry(f, &adapter->mac_filter_list, list) {
if (f->add) { if (f->add) {
ether_addr_copy(veal->list[i].addr, f->macaddr); ether_addr_copy(veal->list[i].addr, f->macaddr);
iavf_set_mac_addr_type(&veal->list[i], f);
i++; i++;
f->add = false; f->add = false;
if (i == count) if (i == count)
@ -577,6 +592,7 @@ void iavf_del_ether_addrs(struct iavf_adapter *adapter)
list_for_each_entry_safe(f, ftmp, &adapter->mac_filter_list, list) { list_for_each_entry_safe(f, ftmp, &adapter->mac_filter_list, list) {
if (f->remove) { if (f->remove) {
ether_addr_copy(veal->list[i].addr, f->macaddr); ether_addr_copy(veal->list[i].addr, f->macaddr);
iavf_set_mac_addr_type(&veal->list[i], f);
i++; i++;
list_del(&f->list); list_del(&f->list);
kfree(f); kfree(f);