Commit 6209dd77 authored by David S. Miller's avatar David S. Miller
Browse files

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



Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2021-12-15

This series contains updates to igb, igbvf, igc and ixgbe drivers.

Karen moves checks for invalid VF MAC filters to occur earlier for
igb.

Letu Ren fixes a double free issue in igbvf probe.

Sasha fixes incorrect min value being used when calculating for max for
igc.

Robert Schlabbach adds documentation on enabling NBASE-T support for
ixgbe.

Cyril Novikov adds missing initialization of MDIO bus speed for ixgbe.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents ef8a0f6e bf0a3750

Documentation/networking/device_drivers/ethernet/intel/ixgbe.rst

+16 −0
Original line number Diff line number Diff line
@@ -440,6 +440,22 @@ NOTE: For 82599-based network connections, if you are enabling jumbo frames in 
a virtual function (VF), jumbo frames must first be enabled in the physical

function (PF). The VF MTU setting cannot be larger than the PF MTU.



NBASE-T Support

---------------

The ixgbe driver supports NBASE-T on some devices. However, the advertisement

of NBASE-T speeds is suppressed by default, to accommodate broken network

switches which cannot cope with advertised NBASE-T speeds. Use the ethtool

command to enable advertising NBASE-T speeds on devices which support it::



  ethtool -s eth? advertise 0x1800000001028



On Linux systems with INTERFACES(5), this can be specified as a pre-up command

in /etc/network/interfaces so that the interface is always brought up with

NBASE-T support, e.g.::



  iface eth? inet dhcp

       pre-up ethtool -s eth? advertise 0x1800000001028 || true



Generic Receive Offload, aka GRO

--------------------------------

The driver supports the in-kernel software implementation of GRO. GRO has

drivers/net/ethernet/intel/igb/igb_main.c

+14 −14
Original line number Diff line number Diff line
@@ -7648,19 +7648,6 @@ static int igb_set_vf_mac_filter(struct igb_adapter *adapter, const int vf, 
	struct vf_mac_filter *entry = NULL;

	int ret = 0;



	switch (info) {

	case E1000_VF_MAC_FILTER_CLR:

		/* remove all unicast MAC filters related to the current VF */

		list_for_each(pos, &adapter->vf_macs.l) {

			entry = list_entry(pos, struct vf_mac_filter, l);

			if (entry->vf == vf) {

				entry->vf = -1;

				entry->free = true;

				igb_del_mac_filter(adapter, entry->vf_mac, vf);

			}

		}

		break;

	case E1000_VF_MAC_FILTER_ADD:

	if ((vf_data->flags & IGB_VF_FLAG_PF_SET_MAC) &&

	    !vf_data->trusted) {

		dev_warn(&pdev->dev,
@@ -7675,6 +7662,19 @@ static int igb_set_vf_mac_filter(struct igb_adapter *adapter, const int vf, 
		return -EINVAL;

	}



	switch (info) {

	case E1000_VF_MAC_FILTER_CLR:

		/* remove all unicast MAC filters related to the current VF */

		list_for_each(pos, &adapter->vf_macs.l) {

			entry = list_entry(pos, struct vf_mac_filter, l);

			if (entry->vf == vf) {

				entry->vf = -1;

				entry->free = true;

				igb_del_mac_filter(adapter, entry->vf_mac, vf);

			}

		}

		break;

	case E1000_VF_MAC_FILTER_ADD:

		/* try to find empty slot in the list */

		list_for_each(pos, &adapter->vf_macs.l) {

			entry = list_entry(pos, struct vf_mac_filter, l);

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

+1 −0
Original line number Diff line number Diff line
@@ -2859,6 +2859,7 @@ static int igbvf_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	return 0;



err_hw_init:

	netif_napi_del(&adapter->rx_ring->napi);

	kfree(adapter->tx_ring);

	kfree(adapter->rx_ring);

err_sw_init:

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

+1 −1
Original line number Diff line number Diff line
@@ -636,7 +636,7 @@ s32 igc_set_ltr_i225(struct igc_hw *hw, bool link) 
		ltrv = rd32(IGC_LTRMAXV);

		if (ltr_max != (ltrv & IGC_LTRMAXV_LTRV_MASK)) {

			ltrv = IGC_LTRMAXV_LSNP_REQ | ltr_max |

			       (scale_min << IGC_LTRMAXV_SCALE_SHIFT);

			       (scale_max << IGC_LTRMAXV_SCALE_SHIFT);

			wr32(IGC_LTRMAXV, ltrv);

		}

	}

drivers/net/ethernet/intel/ixgbe/ixgbe_main.c

+4 −0
Original line number Diff line number Diff line
@@ -5531,6 +5531,10 @@ static int ixgbe_non_sfp_link_config(struct ixgbe_hw *hw) 
	if (!speed && hw->mac.ops.get_link_capabilities) {

		ret = hw->mac.ops.get_link_capabilities(hw, &speed,

							&autoneg);

		/* remove NBASE-T speeds from default autonegotiation

		 * to accommodate broken network switches in the field

		 * which cannot cope with advertised NBASE-T speeds

		 */

		speed &= ~(IXGBE_LINK_SPEED_5GB_FULL |

			   IXGBE_LINK_SPEED_2_5GB_FULL);

	}