Commit 47888597 authored by Paolo Abeni's avatar Paolo Abeni
Browse files

Merge branch 'intel-wired-lan-update-2026-04-27-ice-iavf' 



Jacob Keller says:

====================
Intel Wired LAN Update 2026-04-27 (ice, iavf)

Petr Oros from RedHat has accumulated a number of fixes for the Intel ice
and iavf drivers, bundled together in this series.

First, a series of 4 fixes to resolve issues with the iavf driver logic for
handling VLAN filters. This includes keeping VLAN filters while the
interface is brought down, waiting for confirmation on filter deletion
before deleting filters from the driver tracking structures, and handling
the VIRTCHNL_OP_ADD_VLAN for the old v1 VLAN_ADD command.

A fix for a crash in ice_reset_all_vfs(), properly checking for errors when
ice_vf_rebuild_vsi() fails.

A fix for a possible infinite recursion in ice_cfg_tx_topo() that occurs
when trying to apply invalid Tx topology configuration.

A fix to initialize the SMA pins in the DPLL subsystem properly.

A fix to change the SMA and U.FL pin state for paired pins, ensuring that
all flows changing one pin will also update its shared pin appropriately.

A preparatory patch to export __dpll_pin_change_ntf() so that drivers can
notify pin changes while already holding the dpll_lock.

A fix to ensure DPLL notifications are sent for the software-controlled
pins which wrap the physical CGU input/output pins.

A fix to add DPLL notifications for peer pins when changing the SMA or U.FL
pins, ensuring DPLL subsystem is notified about the paired connected pins.

Signed-off-by: default avatarJacob Keller <jacob.e.keller@intel.com>
====================

Link: https://patch.msgid.link/20260427-jk-iwl-net-petr-oros-fixes-v1-0-cdcb48303fd8@intel.com


Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parents 5ef34361 9e5dead1

drivers/dpll/dpll_netlink.c

+10 −0
Original line number Diff line number Diff line
@@ -900,11 +900,21 @@ int dpll_pin_delete_ntf(struct dpll_pin *pin) 
	return dpll_pin_event_send(DPLL_CMD_PIN_DELETE_NTF, pin);

}



/**

 * __dpll_pin_change_ntf - notify that the pin has been changed

 * @pin: registered pin pointer

 *

 * Context: caller must hold dpll_lock. Suitable for use inside pin

 *          callbacks which are already invoked under dpll_lock.

 * Return: 0 if succeeds, error code otherwise.

 */

int __dpll_pin_change_ntf(struct dpll_pin *pin)

{

	lockdep_assert_held(&dpll_lock);

	dpll_pin_notify(pin, DPLL_PIN_CHANGED);

	return dpll_pin_event_send(DPLL_CMD_PIN_CHANGE_NTF, pin);

}

EXPORT_SYMBOL_GPL(__dpll_pin_change_ntf);



/**

 * dpll_pin_change_ntf - notify that the pin has been changed

drivers/dpll/dpll_netlink.h

+0 −2
Original line number Diff line number Diff line
@@ -11,5 +11,3 @@ int dpll_device_delete_ntf(struct dpll_device *dpll); 
int dpll_pin_create_ntf(struct dpll_pin *pin);



int dpll_pin_delete_ntf(struct dpll_pin *pin);
 


int __dpll_pin_change_ntf(struct dpll_pin *pin);

drivers/net/ethernet/intel/iavf/iavf.h

+4 −5
Original line number Diff line number Diff line
@@ -158,11 +158,10 @@ struct iavf_vlan { 
enum iavf_vlan_state_t {

	IAVF_VLAN_INVALID,

	IAVF_VLAN_ADD,		/* filter needs to be added */

	IAVF_VLAN_IS_NEW,	/* filter is new, wait for PF answer */

	IAVF_VLAN_ACTIVE,	/* filter is accepted by PF */

	IAVF_VLAN_DISABLE,	/* filter needs to be deleted by PF, then marked INACTIVE */

	IAVF_VLAN_INACTIVE,	/* filter is inactive, we are in IFF_DOWN */

	IAVF_VLAN_REMOVE,	/* filter needs to be removed from list */

	IAVF_VLAN_ADDING,	/* ADD sent to PF, waiting for response */

	IAVF_VLAN_ACTIVE,	/* PF confirmed, filter is in HW */

	IAVF_VLAN_REMOVE,	/* filter queued for DEL from PF */

	IAVF_VLAN_REMOVING,	/* DEL sent to PF, waiting for response */

};



struct iavf_vlan_filter {

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

+12 −40
Original line number Diff line number Diff line
@@ -757,10 +757,10 @@ iavf_vlan_filter *iavf_add_vlan(struct iavf_adapter *adapter, 
		adapter->num_vlan_filters++;

		iavf_schedule_aq_request(adapter, IAVF_FLAG_AQ_ADD_VLAN_FILTER);

	} else if (f->state == IAVF_VLAN_REMOVE) {

		/* Re-add the filter since we cannot tell whether the

		 * pending delete has already been processed by the PF.

		 * A duplicate add is harmless.

		 */

		/* DEL not yet sent to PF, cancel it */

		f->state = IAVF_VLAN_ACTIVE;

	} else if (f->state == IAVF_VLAN_REMOVING) {

		/* DEL already sent to PF, re-add after completion */

		f->state = IAVF_VLAN_ADD;

		iavf_schedule_aq_request(adapter,

					 IAVF_FLAG_AQ_ADD_VLAN_FILTER);
@@ -791,37 +791,19 @@ static void iavf_del_vlan(struct iavf_adapter *adapter, struct iavf_vlan vlan) 
			list_del(&f->list);

			kfree(f);

			adapter->num_vlan_filters--;

		} else {

		} else if (f->state != IAVF_VLAN_REMOVING) {

			f->state = IAVF_VLAN_REMOVE;

			iavf_schedule_aq_request(adapter,

						 IAVF_FLAG_AQ_DEL_VLAN_FILTER);

		}

		/* If REMOVING, DEL is already sent to PF; completion

		 * handler will free the filter when PF confirms.

		 */

	}



	spin_unlock_bh(&adapter->mac_vlan_list_lock);

}



/**

 * iavf_restore_filters

 * @adapter: board private structure

 *

 * Restore existing non MAC filters when VF netdev comes back up

 **/

static void iavf_restore_filters(struct iavf_adapter *adapter)

{

	struct iavf_vlan_filter *f;



	/* re-add all VLAN filters */

	spin_lock_bh(&adapter->mac_vlan_list_lock);



	list_for_each_entry(f, &adapter->vlan_filter_list, list) {

		if (f->state == IAVF_VLAN_INACTIVE)

			f->state = IAVF_VLAN_ADD;

	}



	spin_unlock_bh(&adapter->mac_vlan_list_lock);

	adapter->aq_required |= IAVF_FLAG_AQ_ADD_VLAN_FILTER;

}



/**

 * iavf_get_num_vlans_added - get number of VLANs added
@@ -1246,13 +1228,12 @@ static void iavf_up_complete(struct iavf_adapter *adapter) 
}



/**

 * iavf_clear_mac_vlan_filters - Remove mac and vlan filters not sent to PF

 * yet and mark other to be removed.

 * iavf_clear_mac_filters - Remove MAC filters not sent to PF yet and mark

 * others to be removed.

 * @adapter: board private structure

 **/

static void iavf_clear_mac_vlan_filters(struct iavf_adapter *adapter)

static void iavf_clear_mac_filters(struct iavf_adapter *adapter)

{

	struct iavf_vlan_filter *vlf, *vlftmp;

	struct iavf_mac_filter *f, *ftmp;



	spin_lock_bh(&adapter->mac_vlan_list_lock);
@@ -1271,11 +1252,6 @@ static void iavf_clear_mac_vlan_filters(struct iavf_adapter *adapter) 
		}

	}



	/* disable all VLAN filters */

	list_for_each_entry_safe(vlf, vlftmp, &adapter->vlan_filter_list,

				 list)

		vlf->state = IAVF_VLAN_DISABLE;



	spin_unlock_bh(&adapter->mac_vlan_list_lock);

}
@@ -1371,7 +1347,7 @@ void iavf_down(struct iavf_adapter *adapter) 
	iavf_napi_disable_all(adapter);

	iavf_irq_disable(adapter);



	iavf_clear_mac_vlan_filters(adapter);

	iavf_clear_mac_filters(adapter);

	iavf_clear_cloud_filters(adapter);

	iavf_clear_fdir_filters(adapter);

	iavf_clear_adv_rss_conf(adapter);
@@ -1388,8 +1364,6 @@ void iavf_down(struct iavf_adapter *adapter) 
		 */

		if (!list_empty(&adapter->mac_filter_list))

			adapter->aq_required |= IAVF_FLAG_AQ_DEL_MAC_FILTER;

		if (!list_empty(&adapter->vlan_filter_list))

			adapter->aq_required |= IAVF_FLAG_AQ_DEL_VLAN_FILTER;

		if (!list_empty(&adapter->cloud_filter_list))

			adapter->aq_required |= IAVF_FLAG_AQ_DEL_CLOUD_FILTER;

		if (!list_empty(&adapter->fdir_list_head))
@@ -4494,8 +4468,6 @@ static int iavf_open(struct net_device *netdev) 
	iavf_add_filter(adapter, adapter->hw.mac.addr);

	spin_unlock_bh(&adapter->mac_vlan_list_lock);



	/* Restore filters that were removed with IFF_DOWN */

	iavf_restore_filters(adapter);

	iavf_restore_fdir_filters(adapter);



	iavf_configure(adapter);

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

+36 −40
Original line number Diff line number Diff line
@@ -746,7 +746,7 @@ static void iavf_vlan_add_reject(struct iavf_adapter *adapter) 


	spin_lock_bh(&adapter->mac_vlan_list_lock);

	list_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) {

		if (f->state == IAVF_VLAN_IS_NEW) {

		if (f->state == IAVF_VLAN_ADDING) {

			list_del(&f->list);

			kfree(f);

			adapter->num_vlan_filters--;
@@ -812,7 +812,7 @@ void iavf_add_vlans(struct iavf_adapter *adapter) 
			if (f->state == IAVF_VLAN_ADD) {

				vvfl->vlan_id[i] = f->vlan.vid;

				i++;

				f->state = IAVF_VLAN_IS_NEW;

				f->state = IAVF_VLAN_ADDING;

				if (i == count)

					break;

			}
@@ -874,7 +874,7 @@ void iavf_add_vlans(struct iavf_adapter *adapter) 
				vlan->tpid = f->vlan.tpid;



				i++;

				f->state = IAVF_VLAN_IS_NEW;

				f->state = IAVF_VLAN_ADDING;

			}

		}
@@ -911,22 +911,12 @@ void iavf_del_vlans(struct iavf_adapter *adapter) 
	spin_lock_bh(&adapter->mac_vlan_list_lock);



	list_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) {

		/* since VLAN capabilities are not allowed, we dont want to send

		 * a VLAN delete request because it will most likely fail and

		 * create unnecessary errors/noise, so just free the VLAN

		 * filters marked for removal to enable bailing out before

		 * sending a virtchnl message

		 */

		if (f->state == IAVF_VLAN_REMOVE &&

		    !VLAN_FILTERING_ALLOWED(adapter)) {

			list_del(&f->list);

			kfree(f);

			adapter->num_vlan_filters--;

		} else if (f->state == IAVF_VLAN_DISABLE &&

		    !VLAN_FILTERING_ALLOWED(adapter)) {

			f->state = IAVF_VLAN_INACTIVE;

		} else if (f->state == IAVF_VLAN_REMOVE ||

			   f->state == IAVF_VLAN_DISABLE) {

		} else if (f->state == IAVF_VLAN_REMOVE) {

			count++;

		}

	}
@@ -958,18 +948,10 @@ void iavf_del_vlans(struct iavf_adapter *adapter) 


		vvfl->vsi_id = adapter->vsi_res->vsi_id;

		vvfl->num_elements = count;

		list_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) {

			if (f->state == IAVF_VLAN_DISABLE) {

				vvfl->vlan_id[i] = f->vlan.vid;

				f->state = IAVF_VLAN_INACTIVE;

				i++;

				if (i == count)

					break;

			} else if (f->state == IAVF_VLAN_REMOVE) {

		list_for_each_entry(f, &adapter->vlan_filter_list, list) {

			if (f->state == IAVF_VLAN_REMOVE) {

				vvfl->vlan_id[i] = f->vlan.vid;

				list_del(&f->list);

				kfree(f);

				adapter->num_vlan_filters--;

				f->state = IAVF_VLAN_REMOVING;

				i++;

				if (i == count)

					break;
@@ -1006,9 +988,8 @@ void iavf_del_vlans(struct iavf_adapter *adapter) 


		vvfl_v2->vport_id = adapter->vsi_res->vsi_id;

		vvfl_v2->num_elements = count;

		list_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list, list) {

			if (f->state == IAVF_VLAN_DISABLE ||

			    f->state == IAVF_VLAN_REMOVE) {

		list_for_each_entry(f, &adapter->vlan_filter_list, list) {

			if (f->state == IAVF_VLAN_REMOVE) {

				struct virtchnl_vlan_supported_caps *filtering_support =

					&adapter->vlan_v2_caps.filtering.filtering_support;

				struct virtchnl_vlan *vlan;
@@ -1022,13 +1003,7 @@ void iavf_del_vlans(struct iavf_adapter *adapter) 
				vlan->tci = f->vlan.vid;

				vlan->tpid = f->vlan.tpid;



				if (f->state == IAVF_VLAN_DISABLE) {

					f->state = IAVF_VLAN_INACTIVE;

				} else {

					list_del(&f->list);

					kfree(f);

					adapter->num_vlan_filters--;

				}

				f->state = IAVF_VLAN_REMOVING;

				i++;

				if (i == count)

					break;
@@ -2391,10 +2366,6 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter, 
			ether_addr_copy(adapter->hw.mac.addr, netdev->dev_addr);

			wake_up(&adapter->vc_waitqueue);

			break;

		case VIRTCHNL_OP_DEL_VLAN:

			dev_err(&adapter->pdev->dev, "Failed to delete VLAN filter, error %s\n",

				iavf_stat_str(&adapter->hw, v_retval));

			break;

		case VIRTCHNL_OP_DEL_ETH_ADDR:

			dev_err(&adapter->pdev->dev, "Failed to delete MAC filter, error %s\n",

				iavf_stat_str(&adapter->hw, v_retval));
@@ -2905,17 +2876,42 @@ void iavf_virtchnl_completion(struct iavf_adapter *adapter, 
		spin_unlock_bh(&adapter->adv_rss_lock);

		}

		break;

	case VIRTCHNL_OP_ADD_VLAN:

	case VIRTCHNL_OP_ADD_VLAN_V2: {

		struct iavf_vlan_filter *f;



		if (v_retval)

			break;



		spin_lock_bh(&adapter->mac_vlan_list_lock);

		list_for_each_entry(f, &adapter->vlan_filter_list, list) {

			if (f->state == IAVF_VLAN_IS_NEW)

			if (f->state == IAVF_VLAN_ADDING)

				f->state = IAVF_VLAN_ACTIVE;

		}

		spin_unlock_bh(&adapter->mac_vlan_list_lock);

		}

		break;

	case VIRTCHNL_OP_DEL_VLAN:

	case VIRTCHNL_OP_DEL_VLAN_V2: {

		struct iavf_vlan_filter *f, *ftmp;



		spin_lock_bh(&adapter->mac_vlan_list_lock);

		list_for_each_entry_safe(f, ftmp, &adapter->vlan_filter_list,

					 list) {

			if (f->state == IAVF_VLAN_REMOVING) {

				if (v_retval) {

					/* PF rejected DEL, keep filter */

					f->state = IAVF_VLAN_ACTIVE;

				} else {

					list_del(&f->list);

					kfree(f);

					adapter->num_vlan_filters--;

				}

			}

		}

		spin_unlock_bh(&adapter->mac_vlan_list_lock);

		}

		break;

	case VIRTCHNL_OP_ENABLE_VLAN_STRIPPING:

		/* PF enabled vlan strip on this VF.

		 * Update netdev->features if needed to be in sync with ethtool.