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

Commit 7869318e authored by Chaya Rachel Ivgi's avatar Chaya Rachel Ivgi Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: add support for negative temperatures 



The driver should support also negative temperatures.
So there is a need to separate between the return value and
temperature in order to be able to distinguish between
a negative temperature and error value.

Signed-off-by: default avatarChaya Rachel Ivgi <chaya.rachel.ivgi@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 27e070d3

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

+5 −4
Original line number Diff line number Diff line
@@ -261,17 +261,18 @@ static ssize_t iwl_dbgfs_nic_temp_read(struct file *file, 
{

	struct iwl_mvm *mvm = file->private_data;

	char buf[16];

	int pos, temp;

	int pos, ret;

	s32 temp;



	if (!mvm->ucode_loaded)

		return -EIO;



	mutex_lock(&mvm->mutex);

	temp = iwl_mvm_get_temp(mvm);

	ret = iwl_mvm_get_temp(mvm, &temp);

	mutex_unlock(&mvm->mutex);



	if (temp < 0)

		return temp;

	if (ret)

		return -EIO;



	pos = scnprintf(buf , sizeof(buf), "%d\n", temp);

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

+1 −1
Original line number Diff line number Diff line
@@ -1489,7 +1489,7 @@ void iwl_mvm_tt_handler(struct iwl_mvm *mvm); 
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);

int iwl_mvm_get_temp(struct iwl_mvm *mvm, s32 *temp);



/* Location Aware Regulatory */

struct iwl_mcc_update_resp *

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

+8 −9
Original line number Diff line number Diff line
@@ -194,12 +194,12 @@ static int iwl_mvm_get_temp_cmd(struct iwl_mvm *mvm) 
	return iwl_mvm_send_cmd_pdu(mvm, cmdid, 0, sizeof(extcmd), &extcmd);

}



int iwl_mvm_get_temp(struct iwl_mvm *mvm)

int iwl_mvm_get_temp(struct iwl_mvm *mvm, s32 *temp)

{

	struct iwl_notification_wait wait_temp_notif;

	static u16 temp_notif[] = { WIDE_ID(PHY_OPS_GROUP,

					    DTS_MEASUREMENT_NOTIF_WIDE) };

	int ret, temp;

	int ret;



	if (!fw_has_api(&mvm->fw->ucode_capa, IWL_UCODE_TLV_API_WIDE_CMD_HDR))

		temp_notif[0] = DTS_MEASUREMENT_NOTIFICATION;
@@ -208,7 +208,7 @@ int iwl_mvm_get_temp(struct iwl_mvm *mvm) 


	iwl_init_notification_wait(&mvm->notif_wait, &wait_temp_notif,

				   temp_notif, ARRAY_SIZE(temp_notif),

				   iwl_mvm_temp_notif_wait, &temp);

				   iwl_mvm_temp_notif_wait, temp);



	ret = iwl_mvm_get_temp_cmd(mvm);

	if (ret) {
@@ -219,12 +219,10 @@ int iwl_mvm_get_temp(struct iwl_mvm *mvm) 


	ret = iwl_wait_notification(&mvm->notif_wait, &wait_temp_notif,

				    IWL_MVM_TEMP_NOTIF_WAIT_TIMEOUT);

	if (ret) {

	if (ret)

		IWL_ERR(mvm, "Getting the temperature timed out\n");

		return ret;

	}



	return temp;

	return ret;

}



static void check_exit_ctkill(struct work_struct *work)
@@ -233,6 +231,7 @@ static void check_exit_ctkill(struct work_struct *work) 
	struct iwl_mvm *mvm;

	u32 duration;

	s32 temp;

	int ret;



	tt = container_of(work, struct iwl_mvm_tt_mgmt, ct_kill_exit.work);

	mvm = container_of(tt, struct iwl_mvm, thermal_throttle);
@@ -250,13 +249,13 @@ static void check_exit_ctkill(struct work_struct *work) 
		goto reschedule;

	}



	temp = iwl_mvm_get_temp(mvm);

	ret = iwl_mvm_get_temp(mvm, &temp);



	iwl_mvm_unref(mvm, IWL_MVM_REF_CHECK_CTKILL);



	__iwl_mvm_mac_stop(mvm);



	if (temp < 0)

	if (ret)

		goto reschedule;



	IWL_DEBUG_TEMP(mvm, "NIC temperature: %d\n", temp);