Commit 61dbc61a authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge branch 'intel-wired-lan-driver-updates-2025-11-25-ice-idpf-iavf-ixgbe-ixgbevf-e1000e' 

Tony Nguyen says:

====================
Intel Wired LAN Driver Updates 2025-11-25 (ice, idpf, iavf, ixgbe, ixgbevf, e1000e)

Natalia cleans up ixgbevf_q_vector struct removing an unused field.

Emil converts vport state tracking from enum to bitmap and removes
unneeded states for idpf.

Tony removes an unneeded check from e1000e.

Alok Tiwari removes an unnecessary second call to
ixgbe_non_sfp_link_config() and adjusts the checked member, in idpf, to
reflect the member that is later used. He also fixes various typos and
messages for better clarity misc Intel drivers.
====================

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


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 4636b4e7 57bb13d7

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

+1 −5
Original line number Diff line number Diff line
@@ -551,9 +551,9 @@ static int e1000_set_eeprom(struct net_device *netdev, 
{

	struct e1000_adapter *adapter = netdev_priv(netdev);

	struct e1000_hw *hw = &adapter->hw;

	size_t total_len, max_len;

	u16 *eeprom_buff;

	int ret_val = 0;

	size_t max_len;

	int first_word;

	int last_word;

	void *ptr;
@@ -571,10 +571,6 @@ static int e1000_set_eeprom(struct net_device *netdev, 


	max_len = hw->nvm.word_size * 2;



	if (check_add_overflow(eeprom->offset, eeprom->len, &total_len) ||

	    total_len > max_len)

		return -EFBIG;



	first_word = eeprom->offset >> 1;

	last_word = (eeprom->offset + eeprom->len - 1) >> 1;

	eeprom_buff = kmalloc(max_len, GFP_KERNEL);

drivers/net/ethernet/intel/iavf/iavf_virtchnl.c

+8 −4
Original line number Diff line number Diff line
@@ -793,7 +793,8 @@ void iavf_add_vlans(struct iavf_adapter *adapter) 


		len = virtchnl_struct_size(vvfl, vlan_id, count);

		if (len > IAVF_MAX_AQ_BUF_SIZE) {

			dev_warn(&adapter->pdev->dev, "Too many add VLAN changes in one request\n");

			dev_info(&adapter->pdev->dev,

				 "virtchnl: Too many VLAN add (v1) requests; splitting into multiple messages to PF\n");

			while (len > IAVF_MAX_AQ_BUF_SIZE)

				len = virtchnl_struct_size(vvfl, vlan_id,

							   --count);
@@ -838,7 +839,8 @@ void iavf_add_vlans(struct iavf_adapter *adapter) 


		len = virtchnl_struct_size(vvfl_v2, filters, count);

		if (len > IAVF_MAX_AQ_BUF_SIZE) {

			dev_warn(&adapter->pdev->dev, "Too many add VLAN changes in one request\n");

			dev_info(&adapter->pdev->dev,

				 "virtchnl: Too many VLAN add (v2) requests; splitting into multiple messages to PF\n");

			while (len > IAVF_MAX_AQ_BUF_SIZE)

				len = virtchnl_struct_size(vvfl_v2, filters,

							   --count);
@@ -941,7 +943,8 @@ void iavf_del_vlans(struct iavf_adapter *adapter) 


		len = virtchnl_struct_size(vvfl, vlan_id, count);

		if (len > IAVF_MAX_AQ_BUF_SIZE) {

			dev_warn(&adapter->pdev->dev, "Too many delete VLAN changes in one request\n");

			dev_info(&adapter->pdev->dev,

				 "virtchnl: Too many VLAN delete (v1) requests; splitting into multiple messages to PF\n");

			while (len > IAVF_MAX_AQ_BUF_SIZE)

				len = virtchnl_struct_size(vvfl, vlan_id,

							   --count);
@@ -987,7 +990,8 @@ void iavf_del_vlans(struct iavf_adapter *adapter) 


		len = virtchnl_struct_size(vvfl_v2, filters, count);

		if (len > IAVF_MAX_AQ_BUF_SIZE) {

			dev_warn(&adapter->pdev->dev, "Too many add VLAN changes in one request\n");

			dev_info(&adapter->pdev->dev,

				 "virtchnl: Too many VLAN delete (v2) requests; splitting into multiple messages to PF\n");

			while (len > IAVF_MAX_AQ_BUF_SIZE)

				len = virtchnl_struct_size(vvfl_v2, filters,

							   --count);

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

+1 −1
Original line number Diff line number Diff line
@@ -1121,7 +1121,7 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input, 
 * ice_fdir_has_frag - does flow type have 2 ptypes

 * @flow: flow ptype

 *

 * returns true is there is a fragment packet for this ptype

 * Return: true if there is a fragment packet for this ptype

 */

bool ice_fdir_has_frag(enum ice_fltr_ptype flow)

{

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

+1 −1
Original line number Diff line number Diff line
@@ -534,7 +534,7 @@ ice_erase_nvm_module(struct ice_pf *pf, u16 module, const char *component, 
	}



	if (completion_retval) {

		dev_err(dev, "Firmware failed to erase %s (module 0x02%x), aq_err %s\n",

		dev_err(dev, "Firmware failed to erase %s (module 0x%02x), aq_err %s\n",

			component, module,

			libie_aq_str((enum libie_aq_err)completion_retval));

		NL_SET_ERR_MSG_MOD(extack, "Firmware failed to erase flash");

drivers/net/ethernet/intel/idpf/idpf.h

+5 −7
Original line number Diff line number Diff line
@@ -131,14 +131,12 @@ enum idpf_cap_field { 


/**

 * enum idpf_vport_state - Current vport state

 * @__IDPF_VPORT_DOWN: Vport is down

 * @__IDPF_VPORT_UP: Vport is up

 * @__IDPF_VPORT_STATE_LAST: Must be last, number of states

 * @IDPF_VPORT_UP: Vport is up

 * @IDPF_VPORT_STATE_NBITS: Must be last, number of states

 */

enum idpf_vport_state {

	__IDPF_VPORT_DOWN,

	__IDPF_VPORT_UP,

	__IDPF_VPORT_STATE_LAST,

	IDPF_VPORT_UP,

	IDPF_VPORT_STATE_NBITS

};



/**
@@ -162,7 +160,7 @@ struct idpf_netdev_priv { 
	u16 vport_idx;

	u16 max_tx_hdr_size;

	u16 tx_max_bufs;

	enum idpf_vport_state state;

	DECLARE_BITMAP(state, IDPF_VPORT_STATE_NBITS);

	struct rtnl_link_stats64 netstats;

	spinlock_t stats_lock;

};