Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5c89e7bc authored by Chaya Rachel Ivgi's avatar Chaya Rachel Ivgi Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: add registration to cooling device 



Register cooling device in order to have the Thermal
Manager handle the device's power budget according to the sent
notifications.
The interface adds a new thermal cooling device to
/sys/class/thermal/ folder.

Signed-off-by: default avatarChaya Rachel Ivgi <chaya.rachel.ivgi@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent c221daf2

drivers/net/wireless/intel/iwlwifi/iwl-fw-file.h

+2 −0
Original line number Diff line number Diff line
@@ -321,6 +321,7 @@ typedef unsigned int __bitwise__ iwl_ucode_tlv_capa_t; 
 * @IWL_UCODE_TLV_CAPA_CT_KILL_BY_FW: firmware responsible for CT-kill

 * @IWL_UCODE_TLV_CAPA_TEMP_THS_REPORT_SUPPORT: supports temperature

 *	thresholds reporting

 * @IWL_UCODE_TLV_CAPA_CTDP_SUPPORT: supports cTDP command

 *

 * @NUM_IWL_UCODE_TLV_CAPA: number of bits used

 */
@@ -356,6 +357,7 @@ enum iwl_ucode_tlv_capa { 
	IWL_UCODE_TLV_CAPA_LAR_SUPPORT_V2		= (__force iwl_ucode_tlv_capa_t)73,

	IWL_UCODE_TLV_CAPA_CT_KILL_BY_FW		= (__force iwl_ucode_tlv_capa_t)74,

	IWL_UCODE_TLV_CAPA_TEMP_THS_REPORT_SUPPORT	= (__force iwl_ucode_tlv_capa_t)75,

	IWL_UCODE_TLV_CAPA_CTDP_SUPPORT			= (__force iwl_ucode_tlv_capa_t)76,



	NUM_IWL_UCODE_TLV_CAPA

#ifdef __CHECKER__

drivers/net/wireless/intel/iwlwifi/mvm/fw-api.h

+26 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ enum { 
 */

enum iwl_phy_ops_subcmd_ids {

	CMD_DTS_MEASUREMENT_TRIGGER_WIDE = 0x0,

	CTDP_CONFIG_CMD = 0x03,

	TEMP_REPORTING_THRESHOLDS_CMD = 0x04,

	CT_KILL_NOTIFICATION = 0xFE,

	DTS_MEASUREMENT_NOTIF_WIDE = 0xFF,
@@ -1711,6 +1712,31 @@ struct ct_kill_notif { 
	__le16 reserved;

} __packed; /* GRP_PHY_CT_KILL_NTF */



/**

* enum ctdp_cmd_operation - CTDP command operations

* @CTDP_CMD_OPERATION_START: update the current budget

* @CTDP_CMD_OPERATION_STOP: stop ctdp

* @CTDP_CMD_OPERATION_REPORT: get the avgerage budget

*/

enum iwl_mvm_ctdp_cmd_operation {

	CTDP_CMD_OPERATION_START	= 0x1,

	CTDP_CMD_OPERATION_STOP		= 0x2,

	CTDP_CMD_OPERATION_REPORT	= 0x4,

};/* CTDP_CMD_OPERATION_TYPE_E */



/**

 * struct iwl_mvm_ctdp_cmd - track and manage the FW power consumption budget

 *

 * @operation: see &enum iwl_mvm_ctdp_cmd_operation

 * @budget: the budget in milliwatt

 * @window_size: defined in API but not used

 */

struct iwl_mvm_ctdp_cmd {

	__le32 operation;

	__le32 budget;

	__le32 window_size;

} __packed;



#define IWL_MAX_DTS_TRIPS	8



/**

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

+5 −0
Original line number Diff line number Diff line
@@ -963,6 +963,11 @@ int iwl_mvm_up(struct iwl_mvm *mvm) 
		/* Initialize tx backoffs to the minimal possible */

		iwl_mvm_tt_tx_backoff(mvm, 0);

	}



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

	if (iwl_mvm_is_ctdp_supported(mvm) && mvm->cooling_dev.cur_state > 0)

		ret = iwl_mvm_ctdp_command(mvm, CTDP_CMD_OPERATION_START,

					   mvm->cooling_dev.cur_state);

#else

	/* Initialize tx backoffs to the minimal possible */

	iwl_mvm_tt_tx_backoff(mvm, 0);

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

+19 −0
Original line number Diff line number Diff line
@@ -535,6 +535,16 @@ struct iwl_mvm_thermal_device { 
	u8 fw_trips_index[IWL_MAX_DTS_TRIPS];

	struct thermal_zone_device *tzone;

};



/*

 * iwl_mvm_cooling_device

 * @cur_state: current state in milliwatts

 * @cdev: struct thermal cooling device

 */

struct iwl_mvm_cooling_device {

	u32 cur_state;

	struct thermal_cooling_device *cdev;

};

#endif



#define IWL_MVM_NUM_LAST_FRAMES_UCODE_RATES 8
@@ -819,6 +829,7 @@ struct iwl_mvm { 
	struct iwl_mvm_tt_mgmt thermal_throttle;

#ifdef CONFIG_THERMAL

	struct iwl_mvm_thermal_device tz_device;

	struct iwl_mvm_cooling_device cooling_dev;

#endif



	s32 temperature;	/* Celsius */
@@ -1068,6 +1079,12 @@ static inline bool iwl_mvm_is_tt_in_fw(struct iwl_mvm *mvm) 
#endif /* CONFIG_THERMAL */

}



static inline bool iwl_mvm_is_ctdp_supported(struct iwl_mvm *mvm)

{

	return fw_has_capa(&mvm->fw->ucode_capa,

			   IWL_UCODE_TLV_CAPA_CTDP_SUPPORT);

}



extern const u8 iwl_mvm_ac_to_tx_fifo[];



struct iwl_rate_info {
@@ -1544,6 +1561,8 @@ void iwl_mvm_set_hw_ctkill_state(struct iwl_mvm *mvm, bool state); 
int iwl_mvm_get_temp(struct iwl_mvm *mvm, s32 *temp);

void iwl_mvm_ct_kill_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb);

int iwl_mvm_send_temp_report_ths_cmd(struct iwl_mvm *mvm);

int iwl_mvm_cooling_device_register(struct iwl_mvm *mvm);

int iwl_mvm_ctdp_command(struct iwl_mvm *mvm, u32 op, u32 budget);



/* Location Aware Regulatory */

struct iwl_mcc_update_resp *

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

+1 −0
Original line number Diff line number Diff line
@@ -389,6 +389,7 @@ static const struct iwl_hcmd_names iwl_mvm_legacy_names[] = { 
 */

static const struct iwl_hcmd_names iwl_mvm_phy_names[] = {

	HCMD_NAME(CMD_DTS_MEASUREMENT_TRIGGER_WIDE),

	HCMD_NAME(CTDP_CONFIG_CMD),

	HCMD_NAME(TEMP_REPORTING_THRESHOLDS_CMD),

	HCMD_NAME(CT_KILL_NOTIFICATION),

	HCMD_NAME(DTS_MEASUREMENT_NOTIF_WIDE),