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

Commit 0a3b7119 authored by Chaya Rachel Ivgi's avatar Chaya Rachel Ivgi Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: add CT-KILL notification 



Up to today the driver was notified of the temperature from the FW
and decided whether to enter CT-kill or not.
From now on, the FW will decide when to enter CT-kill and will notify
the driver.
Add support for this notification.

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 51bcc738

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

+5 −0
Original line number Diff line number Diff line
@@ -318,6 +318,9 @@ typedef unsigned int __bitwise__ iwl_ucode_tlv_capa_t; 
 * @IWL_UCODE_TLV_CAPA_BEACON_STORING: firmware will store the latest beacon

 *	from AP and will send it upon d0i3 exit.

 * @IWL_UCODE_TLV_CAPA_LAR_SUPPORT_V2: support LAR API V2

 * @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

 *

 * @NUM_IWL_UCODE_TLV_CAPA: number of bits used

 */
@@ -351,6 +354,8 @@ enum iwl_ucode_tlv_capa { 
	IWL_UCODE_TLV_CAPA_BEACON_ANT_SELECTION		= (__force iwl_ucode_tlv_capa_t)71,

	IWL_UCODE_TLV_CAPA_BEACON_STORING		= (__force iwl_ucode_tlv_capa_t)72,

	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,



	NUM_IWL_UCODE_TLV_CAPA

#ifdef __CHECKER__

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

+12 −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,

	CT_KILL_NOTIFICATION = 0xFE,

	DTS_MEASUREMENT_NOTIF_WIDE = 0xFF,

};
@@ -1685,6 +1686,17 @@ struct iwl_dts_measurement_notif { 
	__le32 voltage;

} __packed; /* TEMPERATURE_MEASUREMENT_TRIGGER_NTFY_S */



/**

 * struct ct_kill_notif - CT-kill entry notification

 *

 * @temperature: the current temperature in celsius

 * @reserved: reserved

 */

struct ct_kill_notif {

	__le16 temperature;

	__le16 reserved;

} __packed; /* GRP_PHY_CT_KILL_NTF */



/***********************************

 * TDLS API

 ***********************************/

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

+15 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016        Intel Deutschland GmbH

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -33,6 +34,7 @@ 
 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH

 * Copyright(c) 2016        Intel Deutschland GmbH

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -1028,6 +1030,18 @@ static inline bool iwl_mvm_has_new_rx_api(struct iwl_mvm *mvm) 
			   IWL_UCODE_TLV_CAPA_MULTI_QUEUE_RX_SUPPORT);

}



static inline bool iwl_mvm_is_tt_in_fw(struct iwl_mvm *mvm)

{

	/* 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.

	 */

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

			   IWL_UCODE_TLV_CAPA_CT_KILL_BY_FW) &&

	       fw_has_capa(&mvm->fw->ucode_capa,

			   IWL_UCODE_TLV_CAPA_TEMP_THS_REPORT_SUPPORT);

}



extern const u8 iwl_mvm_ac_to_tx_fifo[];



struct iwl_rate_info {
@@ -1502,6 +1516,7 @@ void iwl_mvm_tt_initialize(struct iwl_mvm *mvm, u32 min_backoff); 
void iwl_mvm_tt_exit(struct iwl_mvm *mvm);

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);



/* Location Aware Regulatory */

struct iwl_mcc_update_resp *

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

+3 −0
Original line number Diff line number Diff line
@@ -263,6 +263,8 @@ static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = { 
	RX_HANDLER(DTS_MEASUREMENT_NOTIFICATION, iwl_mvm_temp_notif, true),

	RX_HANDLER_GRP(PHY_OPS_GROUP, DTS_MEASUREMENT_NOTIF_WIDE,

		       iwl_mvm_temp_notif, true),

	RX_HANDLER_GRP(PHY_OPS_GROUP, CT_KILL_NOTIFICATION,

		       iwl_mvm_ct_kill_notif, false),



	RX_HANDLER(TDLS_CHANNEL_SWITCH_NOTIFICATION, iwl_mvm_rx_tdls_notif,

		   true),
@@ -387,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(CT_KILL_NOTIFICATION),

	HCMD_NAME(DTS_MEASUREMENT_NOTIF_WIDE),

};

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

+26 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
 *

 * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright(c) 2015 - 2016 Intel Deutschland GmbH

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -33,7 +34,7 @@ 
 *

 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH

 * Copyright(c) 2015 Intel Deutschland GmbH

 * Copyright(c) 2015 - 2016 Intel Deutschland GmbH

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -171,6 +172,24 @@ void iwl_mvm_temp_notif(struct iwl_mvm *mvm, struct iwl_rx_cmd_buffer *rxb) 
	iwl_mvm_tt_temp_changed(mvm, temp);

}



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

{

	struct iwl_rx_packet *pkt = rxb_addr(rxb);

	struct ct_kill_notif *notif;

	int len = iwl_rx_packet_payload_len(pkt);



	if (WARN_ON_ONCE(len != sizeof(*notif))) {

		IWL_ERR(mvm, "Invalid CT_KILL_NOTIFICATION\n");

		return;

	}



	notif = (struct ct_kill_notif *)pkt->data;

	IWL_DEBUG_TEMP(mvm, "CT Kill notification temperature = %d\n",

		       notif->temperature);



	iwl_mvm_enter_ctkill(mvm);

}



static int iwl_mvm_get_temp_cmd(struct iwl_mvm *mvm)

{

	struct iwl_dts_measurement_cmd cmd = {
@@ -236,6 +255,12 @@ static void check_exit_ctkill(struct work_struct *work) 
	tt = container_of(work, struct iwl_mvm_tt_mgmt, ct_kill_exit.work);

	mvm = container_of(tt, struct iwl_mvm, thermal_throttle);



	if (iwl_mvm_is_tt_in_fw(mvm)) {

		iwl_mvm_exit_ctkill(mvm);



		return;

	}



	duration = tt->params.ct_kill_duration;



	mutex_lock(&mvm->mutex);