Commit 242d9c8b authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: mvm: use FW thermal monitoring regardless of CONFIG_THERMAL 



It doesn't make sense to use the FW thermal monitoring only if we
have CONFIG_THERMAL, because then we use the default thresholds
etc. which may be different from what the firmware implements, as
we don't maintain them in the driver now. Only the CTDP code needs
to actually be under CONFIG_THERMAL.

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 2e838c6f

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

+1 −4
Original line number Diff line number Diff line
@@ -1273,7 +1273,6 @@ int iwl_mvm_up(struct iwl_mvm *mvm) 
			goto error;

	}



#ifdef CONFIG_THERMAL

	if (iwl_mvm_is_tt_in_fw(mvm)) {

		/* in order to give the responsibility of ct-kill and

		 * TX backoff to FW we need to send empty temperature reporting
@@ -1285,6 +1284,7 @@ int iwl_mvm_up(struct iwl_mvm *mvm) 
		iwl_mvm_tt_tx_backoff(mvm, 0);

	}



#ifdef CONFIG_THERMAL

	/* TODO: read the budget from BIOS / Platform NVM */



	/*
@@ -1297,9 +1297,6 @@ int iwl_mvm_up(struct iwl_mvm *mvm) 
		if (ret)

			goto error;

	}

#else

	/* Initialize tx backoffs to the minimal possible */

	iwl_mvm_tt_tx_backoff(mvm, 0);

#endif



	if (!fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_SET_LTR_GEN2))

drivers/net/wireless/intel/iwlwifi/mvm/mvm.h

+0 −4
Original line number Diff line number Diff line
@@ -1422,7 +1422,6 @@ iwl_mvm_get_agg_status(struct iwl_mvm *mvm, void *tx_resp) 


static inline bool iwl_mvm_is_tt_in_fw(struct iwl_mvm *mvm)

{

#ifdef CONFIG_THERMAL

	/* these two TLV are redundant since the responsibility to CT-kill by

	 * FW happens only after we send at least one command of

	 * temperature THs report.
@@ -1431,9 +1430,6 @@ static inline bool iwl_mvm_is_tt_in_fw(struct iwl_mvm *mvm) 
			   IWL_UCODE_TLV_CAPA_CT_KILL_BY_FW) &&

	       fw_has_capa(&mvm->fw->ucode_capa,

			   IWL_UCODE_TLV_CAPA_TEMP_THS_REPORT_SUPPORT);

#else /* CONFIG_THERMAL */

	return false;

#endif /* CONFIG_THERMAL */

}



static inline bool iwl_mvm_is_ctdp_supported(struct iwl_mvm *mvm)

CRA Git | Maintained and supported by SUSTech CRA and CCSE