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

Merge branch 'intel-wired-lan-driver-updates-2024-02-28-ixgbe-igc-igb-e1000e-e100' 

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2024-02-28 (ixgbe, igc, igb, e1000e, e100)

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

Jon Maxwell makes module parameter values readable in sysfs for ixgbe,
igb, and e100.

Ernesto Castellotti adds support for 1000BASE-BX on ixgbe.

Arnd Bergmann fixes build failure due to dependency issues for igc.

Vitaly refactors error check to be more concise and prevent future
issues on e1000e.

v1: https://lore.kernel.org/netdev/20240229004135.741586-1-anthony.l.nguyen@intel.com/
====================

Link: https://lore.kernel.org/r/20240301184806.2634508-1-anthony.l.nguyen@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 345a6e26 662200e3

drivers/net/ethernet/intel/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -372,6 +372,7 @@ config IGC 
config IGC_LEDS

	def_bool LEDS_TRIGGER_NETDEV

	depends on IGC && LEDS_CLASS

	depends on LEDS_CLASS=y || IGC=m

	help

	  Optional support for controlling the NIC LED's with the netdev

	  LED trigger.

drivers/net/ethernet/intel/e100.c

+2 −2
Original line number Diff line number Diff line
@@ -171,8 +171,8 @@ static int debug = 3; 
static int eeprom_bad_csum_allow = 0;

static int use_io = 0;

module_param(debug, int, 0);

module_param(eeprom_bad_csum_allow, int, 0);

module_param(use_io, int, 0);

module_param(eeprom_bad_csum_allow, int, 0444);

module_param(use_io, int, 0444);

MODULE_PARM_DESC(debug, "Debug level (0=none,...,16=all)");

MODULE_PARM_DESC(eeprom_bad_csum_allow, "Allow bad eeprom checksums");

MODULE_PARM_DESC(use_io, "Force use of i/o access mode");

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

+4 −4
Original line number Diff line number Diff line
@@ -6688,15 +6688,15 @@ static int __e1000_shutdown(struct pci_dev *pdev, bool runtime) 
	if (adapter->hw.phy.type == e1000_phy_igp_3) {

		e1000e_igp3_phy_powerdown_workaround_ich8lan(&adapter->hw);

	} else if (hw->mac.type >= e1000_pch_lpt) {

		if (wufc && !(wufc & (E1000_WUFC_EX | E1000_WUFC_MC | E1000_WUFC_BC)))

		if (wufc && !(wufc & (E1000_WUFC_EX | E1000_WUFC_MC | E1000_WUFC_BC))) {

			/* ULP does not support wake from unicast, multicast

			 * or broadcast.

			 */

			retval = e1000_enable_ulp_lpt_lp(hw, !runtime);



			if (retval)

				return retval;

		}

	}



	/* Ensure that the appropriate bits are set in LPI_CTRL

	 * for EEE in Sx

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

+1 −1
Original line number Diff line number Diff line
@@ -202,7 +202,7 @@ static struct notifier_block dca_notifier = { 
#endif

#ifdef CONFIG_PCI_IOV

static unsigned int max_vfs;

module_param(max_vfs, uint, 0);

module_param(max_vfs, uint, 0444);

MODULE_PARM_DESC(max_vfs, "Maximum number of virtual functions to allocate per physical function");

#endif /* CONFIG_PCI_IOV */

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

+3 −1
Original line number Diff line number Diff line
@@ -334,7 +334,9 @@ static int ixgbe_get_link_capabilities_82599(struct ixgbe_hw *hw, 
	    hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core0 ||

	    hw->phy.sfp_type == ixgbe_sfp_type_1g_lx_core1 ||

	    hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core0 ||

	    hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1) {

	    hw->phy.sfp_type == ixgbe_sfp_type_1g_sx_core1 ||

	    hw->phy.sfp_type == ixgbe_sfp_type_1g_bx_core0 ||

	    hw->phy.sfp_type == ixgbe_sfp_type_1g_bx_core1) {

		*speed = IXGBE_LINK_SPEED_1GB_FULL;

		*autoneg = true;

		return 0;