Commit a32a8494 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Johannes Berg
Browse files

wifi: iwlwifi: mvm: fold the ref++ into iwl_mvm_phy_ctxt_add 



When we want to add a phy_ctxt, we need to increase the ref.
Note that all the WARN_ONs are already in place:
* We check that we don't add a context with ref != 0
* We check that we don't modify a context with ref = 0

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarGregory Greenman <gregory.greenman@intel.com>
Link: https://lore.kernel.org/r/20231011130030.c19c07746b26.I5b0cbe0760811631a320218a10b88870b5bf0897@changeid


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent f3276ff0

drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c

+0 −2
Original line number Diff line number Diff line
@@ -4716,7 +4716,6 @@ int iwl_mvm_roc_common(struct ieee80211_hw *hw, struct ieee80211_vif *vif, 
			goto out_unlock;

		}



		iwl_mvm_phy_ctxt_ref(mvm, mvmvif->deflink.phy_ctxt);

		goto link_and_start_p2p_roc;

	}
@@ -4812,7 +4811,6 @@ static int __iwl_mvm_add_chanctx(struct iwl_mvm *mvm, 
		goto out;

	}



	iwl_mvm_phy_ctxt_ref(mvm, phy_ctxt);

	*phy_ctxt_id = phy_ctxt->id;

out:

	return ret;

drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c

+17 −3
Original line number Diff line number Diff line
@@ -265,6 +265,8 @@ int iwl_mvm_phy_ctxt_add(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt, 
			 struct cfg80211_chan_def *chandef,

			 u8 chains_static, u8 chains_dynamic)

{

	int ret;



	WARN_ON(!test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status) &&

		ctxt->ref);

	lockdep_assert_held(&mvm->mutex);
@@ -273,9 +275,16 @@ int iwl_mvm_phy_ctxt_add(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt, 
	ctxt->width = chandef->width;

	ctxt->center_freq1 = chandef->center_freq1;



	return iwl_mvm_phy_ctxt_apply(mvm, ctxt, chandef,

	ret = iwl_mvm_phy_ctxt_apply(mvm, ctxt, chandef,

				     chains_static, chains_dynamic,

				     FW_CTXT_ACTION_ADD);



	if (ret)

		return ret;



	ctxt->ref++;



	return 0;

}



/*
@@ -285,6 +294,11 @@ int iwl_mvm_phy_ctxt_add(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt, 
void iwl_mvm_phy_ctxt_ref(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt)

{

	lockdep_assert_held(&mvm->mutex);



	/* If we were taking the first ref, we should have

	 * called iwl_mvm_phy_ctxt_add.

	 */

	WARN_ON(!ctxt->ref);

	ctxt->ref++;

}