Commit 6c042d75 authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: dbg: group trigger condition to helper function 



The triplet of get trigger, is trigger enabled and is trigger stopped
repeats itself.  Group them in a function to avoid code duplication.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 7339cc29

drivers/net/wireless/intel/iwlwifi/fw/dbg.h

+24 −0
Original line number Diff line number Diff line
@@ -188,6 +188,30 @@ iwl_fw_dbg_trigger_check_stop(struct iwl_fw_runtime *fwrt, 
	return iwl_fw_dbg_trigger_stop_conf_match(fwrt, trig);

}



static inline struct iwl_fw_dbg_trigger_tlv*

_iwl_fw_dbg_trigger_on(struct iwl_fw_runtime *fwrt,

		       struct wireless_dev *wdev,

		       const enum iwl_fw_dbg_trigger id)

{

	struct iwl_fw_dbg_trigger_tlv *trig;



	if (!iwl_fw_dbg_trigger_enabled(fwrt->fw, id))

		return NULL;



	trig = _iwl_fw_dbg_get_trigger(fwrt->fw, id);



	if (!iwl_fw_dbg_trigger_check_stop(fwrt, wdev, trig))

		return NULL;



	return trig;

}



#define iwl_fw_dbg_trigger_on(fwrt, wdev, id) ({		\

	BUILD_BUG_ON(!__builtin_constant_p(id));		\

	BUILD_BUG_ON((id) >= FW_DBG_TRIGGER_MAX);		\

	_iwl_fw_dbg_trigger_on((fwrt), (wdev), (id));		\

})



static inline void

_iwl_fw_dbg_trigger_simple_stop(struct iwl_fw_runtime *fwrt,

				struct wireless_dev *wdev,

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

+3 −9
Original line number Diff line number Diff line
@@ -1487,12 +1487,11 @@ static void iwl_mvm_beacon_loss_iterator(void *_data, u8 *mac, 
	     IWL_MVM_MISSED_BEACONS_THRESHOLD)

		ieee80211_beacon_loss(vif);



	if (!iwl_fw_dbg_trigger_enabled(mvm->fw,

					FW_DBG_TRIGGER_MISSED_BEACONS))

	trigger = iwl_fw_dbg_trigger_on(&mvm->fwrt, ieee80211_vif_to_wdev(vif),

					FW_DBG_TRIGGER_MISSED_BEACONS);

	if (!trigger)

		return;



	trigger = iwl_fw_dbg_get_trigger(mvm->fw,

					 FW_DBG_TRIGGER_MISSED_BEACONS);

	bcon_trig = (void *)trigger->data;

	stop_trig_missed_bcon = le32_to_cpu(bcon_trig->stop_consec_missed_bcon);

	stop_trig_missed_bcon_since_rx =
@@ -1500,11 +1499,6 @@ static void iwl_mvm_beacon_loss_iterator(void *_data, u8 *mac, 


	/* TODO: implement start trigger */



	if (!iwl_fw_dbg_trigger_check_stop(&mvm->fwrt,

					   ieee80211_vif_to_wdev(vif),

					   trigger))

		return;



	if (rx_missed_bcon_since_rx >= stop_trig_missed_bcon_since_rx ||

	    rx_missed_bcon >= stop_trig_missed_bcon)

		iwl_fw_dbg_collect_trig(&mvm->fwrt, trigger, NULL);

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

+12 −21
Original line number Diff line number Diff line
@@ -857,16 +857,13 @@ iwl_mvm_ampdu_check_trigger(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
	struct iwl_fw_dbg_trigger_tlv *trig;

	struct iwl_fw_dbg_trigger_ba *ba_trig;



	if (!iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_BA))

	trig = iwl_fw_dbg_trigger_on(&mvm->fwrt, ieee80211_vif_to_wdev(vif),

				     FW_DBG_TRIGGER_BA);

	if (!trig)

		return;



	trig = iwl_fw_dbg_get_trigger(mvm->fw, FW_DBG_TRIGGER_BA);

	ba_trig = (void *)trig->data;



	if (!iwl_fw_dbg_trigger_check_stop(&mvm->fwrt,

					   ieee80211_vif_to_wdev(vif), trig))

		return;



	switch (action) {

	case IEEE80211_AMPDU_TX_OPERATIONAL: {

		struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);
@@ -2802,14 +2799,12 @@ iwl_mvm_tdls_check_trigger(struct iwl_mvm *mvm, 
	struct iwl_fw_dbg_trigger_tlv *trig;

	struct iwl_fw_dbg_trigger_tdls *tdls_trig;



	if (!iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_TDLS))

	trig = iwl_fw_dbg_trigger_on(&mvm->fwrt, ieee80211_vif_to_wdev(vif),

				     FW_DBG_TRIGGER_TDLS);

	if (!trig)

		return;



	trig = iwl_fw_dbg_get_trigger(mvm->fw, FW_DBG_TRIGGER_TDLS);

	tdls_trig = (void *)trig->data;

	if (!iwl_fw_dbg_trigger_check_stop(&mvm->fwrt,

					   ieee80211_vif_to_wdev(vif), trig))

		return;



	if (!(tdls_trig->action_bitmap & BIT(action)))

		return;
@@ -4491,14 +4486,12 @@ static void iwl_mvm_event_mlme_callback(struct iwl_mvm *mvm, 
	struct iwl_fw_dbg_trigger_tlv *trig;

	struct iwl_fw_dbg_trigger_mlme *trig_mlme;



	if (!iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_MLME))

	trig = iwl_fw_dbg_trigger_on(&mvm->fwrt, ieee80211_vif_to_wdev(vif),

				     FW_DBG_TRIGGER_MLME);

	if (!trig)

		return;



	trig = iwl_fw_dbg_get_trigger(mvm->fw, FW_DBG_TRIGGER_MLME);

	trig_mlme = (void *)trig->data;

	if (!iwl_fw_dbg_trigger_check_stop(&mvm->fwrt,

					   ieee80211_vif_to_wdev(vif), trig))

		return;



	if (event->u.mlme.data == ASSOC_EVENT) {

		if (event->u.mlme.status == MLME_DENIED)
@@ -4533,14 +4526,12 @@ static void iwl_mvm_event_bar_rx_callback(struct iwl_mvm *mvm, 
	struct iwl_fw_dbg_trigger_tlv *trig;

	struct iwl_fw_dbg_trigger_ba *ba_trig;



	if (!iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_BA))

	trig = iwl_fw_dbg_trigger_on(&mvm->fwrt, ieee80211_vif_to_wdev(vif),

				     FW_DBG_TRIGGER_BA);

	if (!trig)

		return;



	trig = iwl_fw_dbg_get_trigger(mvm->fw, FW_DBG_TRIGGER_BA);

	ba_trig = (void *)trig->data;

	if (!iwl_fw_dbg_trigger_check_stop(&mvm->fwrt,

					   ieee80211_vif_to_wdev(vif), trig))

		return;



	if (!(le16_to_cpu(ba_trig->rx_bar) & BIT(event->u.ba.tid)))

		return;

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

+3 −5
Original line number Diff line number Diff line
@@ -953,15 +953,13 @@ static inline void iwl_mvm_rx_check_trigger(struct iwl_mvm *mvm, 
	struct iwl_fw_dbg_trigger_cmd *cmds_trig;

	int i;



	if (!iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_FW_NOTIF))

	trig = iwl_fw_dbg_trigger_on(&mvm->fwrt, NULL,

				     FW_DBG_TRIGGER_FW_NOTIF);

	if (!trig)

		return;



	trig = iwl_fw_dbg_get_trigger(mvm->fw, FW_DBG_TRIGGER_FW_NOTIF);

	cmds_trig = (void *)trig->data;



	if (!iwl_fw_dbg_trigger_check_stop(&mvm->fwrt, NULL, trig))

		return;



	for (i = 0; i < ARRAY_SIZE(cmds_trig->cmds); i++) {

		/* don't collect on CMD 0 */

		if (!cmds_trig->cmds[i].cmd_id)

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

+11 −18
Original line number Diff line number Diff line
@@ -433,13 +433,14 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi, 
		struct iwl_mvm_sta *mvmsta = iwl_mvm_sta_from_mac80211(sta);

		struct ieee80211_vif *tx_blocked_vif =

			rcu_dereference(mvm->csa_tx_blocked_vif);

		struct iwl_fw_dbg_trigger_tlv *trig;

		struct ieee80211_vif *vif = mvmsta->vif;



		/* We have tx blocked stations (with CS bit). If we heard

		 * frames from a blocked station on a new channel we can

		 * TX to it again.

		 */

		if (unlikely(tx_blocked_vif) &&

		    mvmsta->vif == tx_blocked_vif) {

		if (unlikely(tx_blocked_vif) && vif == tx_blocked_vif) {

			struct iwl_mvm_vif *mvmvif =

				iwl_mvm_vif_from_mac80211(tx_blocked_vif);
@@ -450,23 +451,18 @@ void iwl_mvm_rx_rx_mpdu(struct iwl_mvm *mvm, struct napi_struct *napi, 


		rs_update_last_rssi(mvm, mvmsta, rx_status);



		if (iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_RSSI) &&

		    ieee80211_is_beacon(hdr->frame_control)) {

			struct iwl_fw_dbg_trigger_tlv *trig;

		trig = iwl_fw_dbg_trigger_on(&mvm->fwrt,

					     ieee80211_vif_to_wdev(vif),

					     FW_DBG_TRIGGER_RSSI);



		if (trig && ieee80211_is_beacon(hdr->frame_control)) {

			struct iwl_fw_dbg_trigger_low_rssi *rssi_trig;

			bool trig_check;

			s32 rssi;



			trig = iwl_fw_dbg_get_trigger(mvm->fw,

						      FW_DBG_TRIGGER_RSSI);

			rssi_trig = (void *)trig->data;

			rssi = le32_to_cpu(rssi_trig->rssi);



			trig_check =

				iwl_fw_dbg_trigger_check_stop(&mvm->fwrt,

							      ieee80211_vif_to_wdev(mvmsta->vif),

							      trig);

			if (trig_check && rx_status->signal < rssi)

			if (rx_status->signal < rssi)

				iwl_fw_dbg_collect_trig(&mvm->fwrt, trig,

							NULL);

		}
@@ -693,15 +689,12 @@ iwl_mvm_rx_stats_check_trigger(struct iwl_mvm *mvm, struct iwl_rx_packet *pkt) 
	struct iwl_fw_dbg_trigger_stats *trig_stats;

	u32 trig_offset, trig_thold;



	if (!iwl_fw_dbg_trigger_enabled(mvm->fw, FW_DBG_TRIGGER_STATS))

	trig = iwl_fw_dbg_trigger_on(&mvm->fwrt, NULL, FW_DBG_TRIGGER_STATS);

	if (!trig)

		return;



	trig = iwl_fw_dbg_get_trigger(mvm->fw, FW_DBG_TRIGGER_STATS);

	trig_stats = (void *)trig->data;



	if (!iwl_fw_dbg_trigger_check_stop(&mvm->fwrt, NULL, trig))

		return;



	trig_offset = le32_to_cpu(trig_stats->stop_offset);

	trig_thold = le32_to_cpu(trig_stats->stop_threshold);

CRA Git | Maintained and supported by SUSTech CRA and CCSE