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

Commit 89ced540 authored by Emmanuel Grumbach's avatar Emmanuel Grumbach Committed by Luca Coelho
Browse files

iwlwifi: mvm: remove IWL_UCODE_TLV_API_HDC_PHASE_0 TLV flag 



All the supported firwmares support the new API.

Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
Signed-off-by: default avatarLuciano Coelho <luciano.coelho@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 79f68280

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

+0 −2
Original line number Original line Diff line number Diff line
@@ -247,7 +247,6 @@ typedef unsigned int __bitwise__ iwl_ucode_tlv_api_t; 
 * @IWL_UCODE_TLV_API_FRAGMENTED_SCAN: This ucode supports active dwell time

 * @IWL_UCODE_TLV_API_FRAGMENTED_SCAN: This ucode supports active dwell time

 *	longer than the passive one, which is essential for fragmented scan.

 *	longer than the passive one, which is essential for fragmented scan.

 * @IWL_UCODE_TLV_API_WIFI_MCC_UPDATE: ucode supports MCC updates with source.

 * @IWL_UCODE_TLV_API_WIFI_MCC_UPDATE: ucode supports MCC updates with source.

 * IWL_UCODE_TLV_API_HDC_PHASE_0: ucode supports finer configuration of LTR

 * @IWL_UCODE_TLV_API_TX_POWER_DEV: new API for tx power.

 * @IWL_UCODE_TLV_API_TX_POWER_DEV: new API for tx power.

 * @IWL_UCODE_TLV_API_WIDE_CMD_HDR: ucode supports wide command header

 * @IWL_UCODE_TLV_API_WIDE_CMD_HDR: ucode supports wide command header

 * @IWL_UCODE_TLV_API_SINGLE_SCAN_EBS: EBS is supported for single scans too.

 * @IWL_UCODE_TLV_API_SINGLE_SCAN_EBS: EBS is supported for single scans too.
@@ -264,7 +263,6 @@ enum iwl_ucode_tlv_api { 
	IWL_UCODE_TLV_API_BT_COEX_SPLIT         = (__force iwl_ucode_tlv_api_t)3,

	IWL_UCODE_TLV_API_BT_COEX_SPLIT         = (__force iwl_ucode_tlv_api_t)3,

	IWL_UCODE_TLV_API_FRAGMENTED_SCAN	= (__force iwl_ucode_tlv_api_t)8,

	IWL_UCODE_TLV_API_FRAGMENTED_SCAN	= (__force iwl_ucode_tlv_api_t)8,

	IWL_UCODE_TLV_API_WIFI_MCC_UPDATE	= (__force iwl_ucode_tlv_api_t)9,

	IWL_UCODE_TLV_API_WIFI_MCC_UPDATE	= (__force iwl_ucode_tlv_api_t)9,

	IWL_UCODE_TLV_API_HDC_PHASE_0		= (__force iwl_ucode_tlv_api_t)10,

	IWL_UCODE_TLV_API_TX_POWER_DEV		= (__force iwl_ucode_tlv_api_t)11,

	IWL_UCODE_TLV_API_TX_POWER_DEV		= (__force iwl_ucode_tlv_api_t)11,

	IWL_UCODE_TLV_API_WIDE_CMD_HDR		= (__force iwl_ucode_tlv_api_t)14,

	IWL_UCODE_TLV_API_WIDE_CMD_HDR		= (__force iwl_ucode_tlv_api_t)14,

	IWL_UCODE_TLV_API_SINGLE_SCAN_EBS	= (__force iwl_ucode_tlv_api_t)16,

	IWL_UCODE_TLV_API_SINGLE_SCAN_EBS	= (__force iwl_ucode_tlv_api_t)16,

drivers/net/wireless/iwlwifi/iwl-io.c

+1 −0
Original line number Original line Diff line number Diff line
@@ -53,6 +53,7 @@ IWL_EXPORT_SYMBOL(iwl_write32); 
u32 iwl_read32(struct iwl_trans *trans, u32 ofs)

u32 iwl_read32(struct iwl_trans *trans, u32 ofs)

{

{

	u32 val = iwl_trans_read32(trans, ofs);

	u32 val = iwl_trans_read32(trans, ofs);



	trace_iwlwifi_dev_ioread32(trans->dev, ofs, val);

	trace_iwlwifi_dev_ioread32(trans->dev, ofs, val);

	return val;

	return val;

}

}

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

+0 −16
Original line number Original line Diff line number Diff line
@@ -940,19 +940,6 @@ int iwl_mvm_start_fw_dbg_conf(struct iwl_mvm *mvm, u8 conf_id) 
	return ret;

	return ret;

}

}





static int iwl_mvm_config_ltr_v1(struct iwl_mvm *mvm)

{

	struct iwl_ltr_config_cmd_v1 cmd_v1 = {

		.flags = cpu_to_le32(LTR_CFG_FLAG_FEATURE_ENABLE),

	};



	if (!mvm->trans->ltr_enabled)

		return 0;



	return iwl_mvm_send_cmd_pdu(mvm, LTR_CONFIG, 0,

				    sizeof(cmd_v1), &cmd_v1);

}



static int iwl_mvm_config_ltr(struct iwl_mvm *mvm)

static int iwl_mvm_config_ltr(struct iwl_mvm *mvm)

{

{

	struct iwl_ltr_config_cmd cmd = {

	struct iwl_ltr_config_cmd cmd = {
@@ -962,9 +949,6 @@ static int iwl_mvm_config_ltr(struct iwl_mvm *mvm) 
	if (!mvm->trans->ltr_enabled)

	if (!mvm->trans->ltr_enabled)

		return 0;

		return 0;





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

		return iwl_mvm_config_ltr_v1(mvm);



	return iwl_mvm_send_cmd_pdu(mvm, LTR_CONFIG, 0,

	return iwl_mvm_send_cmd_pdu(mvm, LTR_CONFIG, 0,

				    sizeof(cmd), &cmd);

				    sizeof(cmd), &cmd);

}

}