Commit a354733c authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue 

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2024-10-08 (ice, i40e, igb, e1000e)

This series contains updates to ice, i40e, igb, and e1000e drivers.

For ice:

Marcin allows driver to load, into safe mode, when DDP package is
missing or corrupted and adjusts the netif_is_ice() check to
account for when the device is in safe mode. He also fixes an
out-of-bounds issue when MSI-X are increased for VFs.

Wojciech clears FDB entries on reset to match the hardware state.

For i40e:

Aleksandr adds locking around MACVLAN filters to prevent memory leaks
due to concurrency issues.

For igb:

Mohamed Khalfella adds a check to not attempt to bring up an already
running interface on non-fatal PCIe errors.

For e1000e:

Vitaly changes board type for I219 to more closely match the hardware
and stop PHY issues.

* '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/net-queue:
  e1000e: change I219 (19) devices to ADP
  igb: Do not bring the device up after non-fatal error
  i40e: Fix macvlan leak by synchronizing access to mac_filter_hash
  ice: Fix increasing MSI-X on VF
  ice: Flush FDB entries before reset
  ice: Fix netif_is_ice() in Safe Mode
  ice: Fix entering Safe Mode
====================

Link: https://patch.msgid.link/20241008230050.928245-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 5151a35c 9d9e5347

drivers/net/ethernet/intel/e1000e/hw.h

+2 −2
Original line number Diff line number Diff line
@@ -108,8 +108,8 @@ struct e1000_hw; 
#define E1000_DEV_ID_PCH_RPL_I219_V22		0x0DC8

#define E1000_DEV_ID_PCH_MTP_I219_LM18		0x550A

#define E1000_DEV_ID_PCH_MTP_I219_V18		0x550B

#define E1000_DEV_ID_PCH_MTP_I219_LM19		0x550C

#define E1000_DEV_ID_PCH_MTP_I219_V19		0x550D

#define E1000_DEV_ID_PCH_ADP_I219_LM19		0x550C

#define E1000_DEV_ID_PCH_ADP_I219_V19		0x550D

#define E1000_DEV_ID_PCH_LNP_I219_LM20		0x550E

#define E1000_DEV_ID_PCH_LNP_I219_V20		0x550F

#define E1000_DEV_ID_PCH_LNP_I219_LM21		0x5510

drivers/net/ethernet/intel/e1000e/netdev.c

+2 −2
Original line number Diff line number Diff line
@@ -7899,10 +7899,10 @@ static const struct pci_device_id e1000_pci_tbl[] = { 
	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V17), board_pch_adp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_LM22), board_pch_adp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_RPL_I219_V22), board_pch_adp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_LM19), board_pch_adp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_ADP_I219_V19), board_pch_adp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM18), board_pch_mtp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V18), board_pch_mtp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_LM19), board_pch_mtp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_MTP_I219_V19), board_pch_mtp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM20), board_pch_mtp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_V20), board_pch_mtp },

	{ PCI_VDEVICE(INTEL, E1000_DEV_ID_PCH_LNP_I219_LM21), board_pch_mtp },

drivers/net/ethernet/intel/i40e/i40e_main.c

+1 −0
Original line number Diff line number Diff line
@@ -1734,6 +1734,7 @@ struct i40e_mac_filter *i40e_add_mac_filter(struct i40e_vsi *vsi, 
	struct hlist_node *h;

	int bkt;



	lockdep_assert_held(&vsi->mac_filter_hash_lock);

	if (vsi->info.pvid)

		return i40e_add_filter(vsi, macaddr,

				       le16_to_cpu(vsi->info.pvid));

drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c

+2 −0
Original line number Diff line number Diff line
@@ -2213,8 +2213,10 @@ static int i40e_vc_get_vf_resources_msg(struct i40e_vf *vf, u8 *msg) 
		vfres->vsi_res[0].qset_handle

					  = le16_to_cpu(vsi->info.qs_handle[0]);

		if (!(vf->driver_caps & VIRTCHNL_VF_OFFLOAD_USO) && !vf->pf_set_mac) {

			spin_lock_bh(&vsi->mac_filter_hash_lock);

			i40e_del_mac_filter(vsi, vf->default_lan_addr.addr);

			eth_zero_addr(vf->default_lan_addr.addr);

			spin_unlock_bh(&vsi->mac_filter_hash_lock);

		}

		ether_addr_copy(vfres->vsi_res[0].default_mac_addr,

				vf->default_lan_addr.addr);

drivers/net/ethernet/intel/ice/ice_eswitch_br.c

+4 −1
Original line number Diff line number Diff line
@@ -582,10 +582,13 @@ ice_eswitch_br_switchdev_event(struct notifier_block *nb, 
	return NOTIFY_DONE;

}



static void ice_eswitch_br_fdb_flush(struct ice_esw_br *bridge)

void ice_eswitch_br_fdb_flush(struct ice_esw_br *bridge)

{

	struct ice_esw_br_fdb_entry *entry, *tmp;



	if (!bridge)

		return;



	list_for_each_entry_safe(entry, tmp, &bridge->fdb_list, list)

		ice_eswitch_br_fdb_entry_notify_and_cleanup(bridge, entry);

}