Commit d66358ca authored by Andre Guedes's avatar Andre Guedes Committed by Jeff Kirsher
Browse files

igc: Remove mac_table from igc_adapter 



In igc_adapter we keep a sort of shadow copy of RAL and RAH registers.
There is not much benefit in keeping it, at the cost of maintainability,
since adding/removing MAC address filters is not hot path, and we
already keep filters information in adapter->nfc_filter_list for cleanup
and restoration purposes.

So in order to simplify the MAC address filtering code and prepare it
for source address support, this patch removes the mac_table from
igc_adapter.

Signed-off-by: default avatarAndre Guedes <andre.guedes@intel.com>
Tested-by: default avatarAaron Brown <aaron.f.brown@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 1c3739cb

drivers/net/ethernet/intel/igc/igc.h

+0 −11
Original line number Original line Diff line number Diff line
@@ -190,8 +190,6 @@ struct igc_adapter { 
	/* lock for RX network flow classification filter */

	/* lock for RX network flow classification filter */

	spinlock_t nfc_lock;

	spinlock_t nfc_lock;





	struct igc_mac_addr *mac_table;



	u8 rss_indir_tbl[IGC_RETA_SIZE];

	u8 rss_indir_tbl[IGC_RETA_SIZE];





	unsigned long link_check_timeout;

	unsigned long link_check_timeout;
@@ -470,15 +468,6 @@ struct igc_nfc_filter { 
	u16 action;

	u16 action;

};

};





struct igc_mac_addr {

	u8 addr[ETH_ALEN];

	s8 queue;

	u8 state; /* bitmask */

};



#define IGC_MAC_STATE_DEFAULT		0x1

#define IGC_MAC_STATE_IN_USE		0x2



#define IGC_MAX_RXNFC_FILTERS		16

#define IGC_MAX_RXNFC_FILTERS		16





/* igc_desc_unused - calculate if we have unused descriptors */

/* igc_desc_unused - calculate if we have unused descriptors */

drivers/net/ethernet/intel/igc/igc_defines.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -62,6 +62,7 @@ 
 * (RAR[15]) for our directed address used by controllers with

 * (RAR[15]) for our directed address used by controllers with

 * manageability enabled, allowing us room for 15 multicast addresses.

 * manageability enabled, allowing us room for 15 multicast addresses.

 */

 */

#define IGC_RAH_RAH_MASK	0x0000FFFF

#define IGC_RAH_QSEL_MASK	0x000C0000

#define IGC_RAH_QSEL_MASK	0x000C0000

#define IGC_RAH_QSEL_SHIFT	18

#define IGC_RAH_QSEL_SHIFT	18

#define IGC_RAH_QSEL_ENABLE	BIT(28)

#define IGC_RAH_QSEL_ENABLE	BIT(28)

drivers/net/ethernet/intel/igc/igc_main.c

+20 −37
Original line number Original line Diff line number Diff line
@@ -820,17 +820,12 @@ static void igc_clear_mac_filter_hw(struct igc_adapter *adapter, int index) 
/* Set default MAC address for the PF in the first RAR entry */

/* Set default MAC address for the PF in the first RAR entry */

static void igc_set_default_mac_filter(struct igc_adapter *adapter)

static void igc_set_default_mac_filter(struct igc_adapter *adapter)

{

{

	struct igc_mac_addr *mac_table = &adapter->mac_table[0];

	struct net_device *dev = adapter->netdev;

	struct net_device *dev = adapter->netdev;

	u8 *addr = adapter->hw.mac.addr;

	u8 *addr = adapter->hw.mac.addr;





	netdev_dbg(dev, "Set default MAC address filter: address %pM", addr);

	netdev_dbg(dev, "Set default MAC address filter: address %pM", addr);





	ether_addr_copy(mac_table->addr, addr);

	igc_set_mac_filter_hw(adapter, 0, addr, -1);

	mac_table->state = IGC_MAC_STATE_DEFAULT | IGC_MAC_STATE_IN_USE;

	mac_table->queue = -1;



	igc_set_mac_filter_hw(adapter, 0, addr, mac_table->queue);

}

}





/**

/**
@@ -2186,16 +2181,21 @@ static void igc_nfc_filter_restore(struct igc_adapter *adapter) 




static int igc_find_mac_filter(struct igc_adapter *adapter, const u8 *addr)

static int igc_find_mac_filter(struct igc_adapter *adapter, const u8 *addr)

{

{

	int max_entries = adapter->hw.mac.rar_entry_count;

	struct igc_hw *hw = &adapter->hw;

	struct igc_mac_addr *entry;

	int max_entries = hw->mac.rar_entry_count;

	u32 ral, rah;

	int i;

	int i;





	for (i = 0; i < max_entries; i++) {

	for (i = 0; i < max_entries; i++) {

		entry = &adapter->mac_table[i];

		ral = rd32(IGC_RAL(i));

		rah = rd32(IGC_RAH(i));





		if (!(entry->state & IGC_MAC_STATE_IN_USE))

		if (!(rah & IGC_RAH_AV))

			continue;

			continue;

		if (!ether_addr_equal(addr, entry->addr))

		if ((rah & IGC_RAH_RAH_MASK) !=

		    le16_to_cpup((__le16 *)(addr + 4)))

			continue;

		if (ral != le32_to_cpup((__le32 *)(addr)))

			continue;

			continue;





		return i;

		return i;
@@ -2206,14 +2206,15 @@ static int igc_find_mac_filter(struct igc_adapter *adapter, const u8 *addr) 




static int igc_get_avail_mac_filter_slot(struct igc_adapter *adapter)

static int igc_get_avail_mac_filter_slot(struct igc_adapter *adapter)

{

{

	int max_entries = adapter->hw.mac.rar_entry_count;

	struct igc_hw *hw = &adapter->hw;

	struct igc_mac_addr *entry;

	int max_entries = hw->mac.rar_entry_count;

	u32 rah;

	int i;

	int i;





	for (i = 0; i < max_entries; i++) {

	for (i = 0; i < max_entries; i++) {

		entry = &adapter->mac_table[i];

		rah = rd32(IGC_RAH(i));





		if (!(entry->state & IGC_MAC_STATE_IN_USE))

		if (!(rah & IGC_RAH_AV))

			return i;

			return i;

	}

	}
@@ -2241,7 +2242,7 @@ int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr, 




	index = igc_find_mac_filter(adapter, addr);

	index = igc_find_mac_filter(adapter, addr);

	if (index >= 0)

	if (index >= 0)

		goto update_queue_assignment;

		goto update_filter;





	index = igc_get_avail_mac_filter_slot(adapter);

	index = igc_get_avail_mac_filter_slot(adapter);

	if (index < 0)

	if (index < 0)
@@ -2250,11 +2251,7 @@ int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr, 
	netdev_dbg(dev, "Add MAC address filter: index %d address %pM queue %d",

	netdev_dbg(dev, "Add MAC address filter: index %d address %pM queue %d",

		   index, addr, queue);

		   index, addr, queue);





	ether_addr_copy(adapter->mac_table[index].addr, addr);

update_filter:

	adapter->mac_table[index].state |= IGC_MAC_STATE_IN_USE;

update_queue_assignment:

	adapter->mac_table[index].queue = queue;



	igc_set_mac_filter_hw(adapter, index, addr, queue);

	igc_set_mac_filter_hw(adapter, index, addr, queue);

	return 0;

	return 0;

}

}
@@ -2269,7 +2266,6 @@ int igc_add_mac_filter(struct igc_adapter *adapter, const u8 *addr, 
int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr)

int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr)

{

{

	struct net_device *dev = adapter->netdev;

	struct net_device *dev = adapter->netdev;

	struct igc_mac_addr *entry;

	int index;

	int index;





	if (!is_valid_ether_addr(addr))

	if (!is_valid_ether_addr(addr))
@@ -2279,24 +2275,18 @@ int igc_del_mac_filter(struct igc_adapter *adapter, const u8 *addr) 
	if (index < 0)

	if (index < 0)

		return -ENOENT;

		return -ENOENT;





	entry = &adapter->mac_table[index];

	if (index == 0) {



	if (entry->state & IGC_MAC_STATE_DEFAULT) {

		/* If this is the default filter, we don't actually delete it.

		/* If this is the default filter, we don't actually delete it.

		 * We just reset to its default value i.e. disable queue

		 * We just reset to its default value i.e. disable queue

		 * assignment.

		 * assignment.

		 */

		 */

		netdev_dbg(dev, "Disable default MAC filter queue assignment");

		netdev_dbg(dev, "Disable default MAC filter queue assignment");





		entry->queue = -1;

		igc_set_mac_filter_hw(adapter, 0, addr, -1);

		igc_set_mac_filter_hw(adapter, 0, addr, entry->queue);

	} else {

	} else {

		netdev_dbg(dev, "Delete MAC address filter: index %d address %pM",

		netdev_dbg(dev, "Delete MAC address filter: index %d address %pM",

			   index, addr);

			   index, addr);





		entry->state = 0;

		entry->queue = -1;

		memset(entry->addr, 0, ETH_ALEN);

		igc_clear_mac_filter_hw(adapter, index);

		igc_clear_mac_filter_hw(adapter, index);

	}

	}
@@ -3404,8 +3394,6 @@ static int igc_sw_init(struct igc_adapter *adapter) 
	struct pci_dev *pdev = adapter->pdev;

	struct pci_dev *pdev = adapter->pdev;

	struct igc_hw *hw = &adapter->hw;

	struct igc_hw *hw = &adapter->hw;





	int size = sizeof(struct igc_mac_addr) * hw->mac.rar_entry_count;



	pci_read_config_word(pdev, PCI_COMMAND, &hw->bus.pci_cmd_word);

	pci_read_config_word(pdev, PCI_COMMAND, &hw->bus.pci_cmd_word);





	/* set default ring sizes */

	/* set default ring sizes */
@@ -3429,10 +3417,6 @@ static int igc_sw_init(struct igc_adapter *adapter) 
	/* Assume MSI-X interrupts, will be checked during IRQ allocation */

	/* Assume MSI-X interrupts, will be checked during IRQ allocation */

	adapter->flags |= IGC_FLAG_HAS_MSIX;

	adapter->flags |= IGC_FLAG_HAS_MSIX;





	adapter->mac_table = kzalloc(size, GFP_ATOMIC);

	if (!adapter->mac_table)

		return -ENOMEM;



	igc_init_queue_configuration(adapter);

	igc_init_queue_configuration(adapter);





	/* This call may decrease the number of queues */

	/* This call may decrease the number of queues */
@@ -5135,7 +5119,6 @@ static void igc_remove(struct pci_dev *pdev) 
	pci_iounmap(pdev, adapter->io_addr);

	pci_iounmap(pdev, adapter->io_addr);

	pci_release_mem_regions(pdev);

	pci_release_mem_regions(pdev);





	kfree(adapter->mac_table);

	free_netdev(netdev);

	free_netdev(netdev);





	pci_disable_pcie_error_reporting(pdev);

	pci_disable_pcie_error_reporting(pdev);