iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

igc: Remove IGC_MAC_STATE_QUEUE_STEERING

Browse Source 
The IGC_MAC_STATE_QUEUE_STEERING bit in mac_table[i].state is
utilized to indicate that frames matching the filter are assigned to
mac_table[i].queue. This bit is not strictly necessary since we can
convey the same information as follows: queue == -1 means queue
assignment is disabled, otherwise it is enabled.

In addition to make the code simpler, this change fixes some awkward
situations where we pass a complete misleading 'queue' value such as in
igc_uc_sync().

So this patch removes IGC_MAC_STATE_QUEUE_STEERING and also takes the
opportunity to improve the igc_add_mac_filter documentation.

Signed-off-by: Andre Guedes <andre.guedes@intel.com>
Tested-by: Aaron Brown <aaron.f.brown@intel.com>
Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
This commit is contained in:
Andre Guedes 2020-04-01 14:43:58 -07:00 committed by Jeff Kirsher
parent c6aae5917b
commit e9736fa407
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/net/ethernet/intel/igc/igc.h
View File

@ -466,14 +466,13 @@ struct igc_nfc_filter {
struct igc_mac_addr { struct igc_mac_addr {
u8 addr[ETH_ALEN]; u8 addr[ETH_ALEN];
u8 queue; s8 queue;
u8 state; /* bitmask */ u8 state; /* bitmask */
}; };
#define IGC_MAC_STATE_DEFAULT 0x1 #define IGC_MAC_STATE_DEFAULT 0x1
#define IGC_MAC_STATE_IN_USE 0x2 #define IGC_MAC_STATE_IN_USE 0x2
#define IGC_MAC_STATE_SRC_ADDR 0x4 #define IGC_MAC_STATE_SRC_ADDR 0x4
#define IGC_MAC_STATE_QUEUE_STEERING 0x8
#define IGC_MAX_RXNFC_FILTERS 16 #define IGC_MAX_RXNFC_FILTERS 16

32
drivers/net/ethernet/intel/igc/igc_main.c
View File

@ -820,8 +820,9 @@ static void igc_set_default_mac_filter(struct igc_adapter *adapter)
ether_addr_copy(mac_table->addr, adapter->hw.mac.addr); ether_addr_copy(mac_table->addr, adapter->hw.mac.addr);
mac_table->state = IGC_MAC_STATE_DEFAULT | IGC_MAC_STATE_IN_USE; mac_table->state = IGC_MAC_STATE_DEFAULT | IGC_MAC_STATE_IN_USE;
mac_table->queue = -1;
igc_set_mac_filter_hw(adapter, 0, mac_table->addr, -1); igc_set_mac_filter_hw(adapter, 0, mac_table->addr, mac_table->queue);
} }
/** /**
@ -2196,13 +2197,20 @@ static bool igc_mac_entry_can_be_used(const struct igc_mac_addr *entry,
return true; return true;
} }
/* Add a MAC filter for 'addr' directing matching traffic to 'queue', /**
* 'flags' is used to indicate what kind of match is made, match is by * igc_add_mac_filter() - Add MAC address filter
* default for the destination address, if matching by source address * @adapter: Pointer to adapter where the filter should be added
* is desired the flag IGC_MAC_STATE_SRC_ADDR can be used. * @addr: MAC address
* @queue: If non-negative, queue assignment feature is enabled and frames
* matching the filter are enqueued onto 'queue'. Otherwise, queue
* assignment is disabled.
* @flags: Set IGC_MAC_STATE_SRC_ADDR bit to indicate @address is a source
* address
*
* Return: 0 in case of success, negative errno code otherwise.
*/ */
static int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr, static int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr,
const u8 queue, const u8 flags) const s8 queue, const u8 flags)
{ {
struct igc_hw *hw = &adapter->hw; struct igc_hw *hw = &adapter->hw;
int rar_entries = hw->mac.rar_entry_count; int rar_entries = hw->mac.rar_entry_count;
@ -2266,11 +2274,11 @@ static int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr,
if (adapter->mac_table[i].state & IGC_MAC_STATE_DEFAULT) { if (adapter->mac_table[i].state & IGC_MAC_STATE_DEFAULT) {
adapter->mac_table[i].state = adapter->mac_table[i].state =
IGC_MAC_STATE_DEFAULT | IGC_MAC_STATE_IN_USE; IGC_MAC_STATE_DEFAULT | IGC_MAC_STATE_IN_USE;
adapter->mac_table[i].queue = 0; adapter->mac_table[i].queue = -1;
igc_set_mac_filter_hw(adapter, 0, addr, -1); igc_set_mac_filter_hw(adapter, 0, addr, -1);
} else { } else {
adapter->mac_table[i].state = 0; adapter->mac_table[i].state = 0;
adapter->mac_table[i].queue = 0; adapter->mac_table[i].queue = -1;
memset(adapter->mac_table[i].addr, 0, ETH_ALEN); memset(adapter->mac_table[i].addr, 0, ETH_ALEN);
igc_clear_mac_filter_hw(adapter, i); igc_clear_mac_filter_hw(adapter, i);
} }
@ -2285,7 +2293,7 @@ static int igc_uc_sync(struct net_device *netdev, const unsigned char *addr)
{ {
struct igc_adapter *adapter = netdev_priv(netdev); struct igc_adapter *adapter = netdev_priv(netdev);
return igc_add_mac_filter(adapter, addr, adapter->num_rx_queues, 0); return igc_add_mac_filter(adapter, addr, -1, 0);
} }
static int igc_uc_unsync(struct net_device *netdev, const unsigned char *addr) static int igc_uc_unsync(struct net_device *netdev, const unsigned char *addr)
@ -3728,15 +3736,13 @@ igc_features_check(struct sk_buff *skb, struct net_device *dev,
int igc_add_mac_steering_filter(struct igc_adapter *adapter, int igc_add_mac_steering_filter(struct igc_adapter *adapter,
const u8 *addr, u8 queue, u8 flags) const u8 *addr, u8 queue, u8 flags)
{ {
return igc_add_mac_filter(adapter, addr, queue, return igc_add_mac_filter(adapter, addr, queue, flags);
IGC_MAC_STATE_QUEUE_STEERING | flags);
} }
int igc_del_mac_steering_filter(struct igc_adapter *adapter, int igc_del_mac_steering_filter(struct igc_adapter *adapter,
const u8 *addr, u8 queue, u8 flags) const u8 *addr, u8 queue, u8 flags)
{ {
return igc_del_mac_filter(adapter, addr, return igc_del_mac_filter(adapter, addr, flags);
IGC_MAC_STATE_QUEUE_STEERING | flags);
} }
static void igc_tsync_interrupt(struct igc_adapter *adapter) static void igc_tsync_interrupt(struct igc_adapter *adapter)