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

Merge branch 'intel-wired-lan-driver-updates-2024-06-03' 

Jacob Keller says:

====================
Intel Wired LAN Driver Updates 2024-06-03

This series includes miscellaneous improvements for the ice as well as a
cleanup to the Makefiles for all Intel net drivers.

Andy fixes all of the Intel net driver Makefiles to use the documented
'*-y' syntax for specifying object files to link into kernel driver
modules, rather than the '*-objs' syntax which works but is documented as
reserved for user-space host programs.

Jacob has a cleanup to refactor rounding logic in the ice driver into a
common roundup_u64 helper function.

Michal Schmidt replaces irq_set_affinity_hint() to use
irq_update_affinity_hint() which behaves better with user-applied affinity
settings.

v2: https://lore.kernel.org/r/20240605-next-2024-06-03-intel-next-batch-v2-0-39c23963fa78@intel.com
v1: https://lore.kernel.org/r/20240603-next-2024-06-03-intel-next-batch-v1-0-e0523b28f325@intel.com
====================

Link: https://lore.kernel.org/r/20240607-next-2024-06-03-intel-next-batch-v3-0-d1470cee3347@intel.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 2ebb87f4 dee55767

drivers/net/ethernet/intel/e1000/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -7,4 +7,4 @@ 


obj-$(CONFIG_E1000) += e1000.o



e1000-objs := e1000_main.o e1000_hw.o e1000_ethtool.o e1000_param.o
 
e1000-y := e1000_main.o e1000_hw.o e1000_ethtool.o e1000_param.o

drivers/net/ethernet/intel/e1000e/Makefile

+3 −4
Original line number Diff line number Diff line
@@ -10,7 +10,6 @@ subdir-ccflags-y += -I$(src) 


obj-$(CONFIG_E1000E) += e1000e.o



e1000e-objs := 82571.o ich8lan.o 80003es2lan.o \

e1000e-y := 82571.o ich8lan.o 80003es2lan.o \

	    mac.o manage.o nvm.o phy.o \

	    param.o ethtool.o netdev.o ptp.o

drivers/net/ethernet/intel/i40e/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ subdir-ccflags-y += -I$(src) 


obj-$(CONFIG_I40E) += i40e.o



i40e-objs := i40e_main.o \

i40e-y := i40e_main.o \

	i40e_ethtool.o	\

	i40e_adminq.o	\

	i40e_common.o	\

drivers/net/ethernet/intel/iavf/Makefile

+2 −3
Original line number Diff line number Diff line
@@ -11,6 +11,5 @@ subdir-ccflags-y += -I$(src) 


obj-$(CONFIG_IAVF) += iavf.o



iavf-objs := iavf_main.o iavf_ethtool.o iavf_virtchnl.o iavf_fdir.o \

	     iavf_adv_rss.o \

	     iavf_txrx.o iavf_common.o iavf_adminq.o
 
iavf-y := iavf_main.o iavf_ethtool.o iavf_virtchnl.o iavf_fdir.o \

	  iavf_adv_rss.o iavf_txrx.o iavf_common.o iavf_adminq.o

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

+2 −2
Original line number Diff line number Diff line
@@ -2580,8 +2580,8 @@ void ice_vsi_free_irq(struct ice_vsi *vsi) 
		if (!IS_ENABLED(CONFIG_RFS_ACCEL))

			irq_set_affinity_notifier(irq_num, NULL);



		/* clear the affinity_mask in the IRQ descriptor */

		irq_set_affinity_hint(irq_num, NULL);

		/* clear the affinity_hint in the IRQ descriptor */

		irq_update_affinity_hint(irq_num, NULL);

		synchronize_irq(irq_num);

		devm_free_irq(ice_pf_to_dev(pf), irq_num, vsi->q_vectors[i]);

	}