Commit e80bfd11 authored by Mordechay Goodstein's avatar Mordechay Goodstein Committed by Luca Coelho
Browse files

iwlwifi: fw: add default value for iwl_fw_lookup_cmd_ver 



For new APIs this avoids checking every return if it's
IWL_FW_CMD_VER_UNKNOWN (99) or it's lower than the new API value

Done with spatch:
-iwl_fw_lookup_cmd_ver(E1, E2, E3)
+iwl_fw_lookup_cmd_ver(E1, E2, E3, IWL_FW_CMD_VER_UNKNOWN)

Signed-off-by: default avatarMordechay Goodstein <mordechay.goodstein@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20200928121852.70bec6eb8008.I6ea78553801d33f7ed10fcd2e4be4ba781fe469a@changeid


Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 4795983b

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

+7 −4
Original line number Diff line number Diff line
@@ -57,22 +57,25 @@ 


#include "img.h"



u8 iwl_fw_lookup_cmd_ver(const struct iwl_fw *fw, u8 grp, u8 cmd)

u8 iwl_fw_lookup_cmd_ver(const struct iwl_fw *fw, u8 grp, u8 cmd, u8 def)

{

	const struct iwl_fw_cmd_version *entry;

	unsigned int i;



	if (!fw->ucode_capa.cmd_versions ||

	    !fw->ucode_capa.n_cmd_versions)

		return IWL_FW_CMD_VER_UNKNOWN;

		return def;



	entry = fw->ucode_capa.cmd_versions;

	for (i = 0; i < fw->ucode_capa.n_cmd_versions; i++, entry++) {

		if (entry->group == grp && entry->cmd == cmd)

		if (entry->group == grp && entry->cmd == cmd) {

			if (entry->cmd_ver == IWL_FW_CMD_VER_UNKNOWN)

				return def;

			return entry->cmd_ver;

		}

	}



	return IWL_FW_CMD_VER_UNKNOWN;

	return def;

}

EXPORT_SYMBOL_GPL(iwl_fw_lookup_cmd_ver);

drivers/net/wireless/intel/iwlwifi/fw/img.h

+1 −1
Original line number Diff line number Diff line
@@ -312,7 +312,7 @@ iwl_get_ucode_image(const struct iwl_fw *fw, enum iwl_ucode_type ucode_type) 
	return &fw->img[ucode_type];

}



u8 iwl_fw_lookup_cmd_ver(const struct iwl_fw *fw, u8 grp, u8 cmd);

u8 iwl_fw_lookup_cmd_ver(const struct iwl_fw *fw, u8 grp, u8 cmd, u8 def);



u8 iwl_fw_lookup_notif_ver(const struct iwl_fw *fw, u8 grp, u8 cmd, u8 def);

const char *iwl_fw_lookup_assert_desc(u32 num);

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

+2 −1
Original line number Diff line number Diff line
@@ -134,7 +134,8 @@ int iwl_set_soc_latency(struct iwl_fw_runtime *fwrt) 
					      SOC_FLAGS_LTR_APPLY_DELAY_MASK);



	if (iwl_fw_lookup_cmd_ver(fwrt->fw, IWL_ALWAYS_LONG_GROUP,

				  SCAN_REQ_UMAC) >= 2 &&

				  SCAN_REQ_UMAC,

				  IWL_FW_CMD_VER_UNKNOWN) >= 2 &&

	    fwrt->trans->trans_cfg->low_latency_xtal)

		cmd.flags |= cpu_to_le32(SOC_CONFIG_CMD_FLAGS_LOW_LATENCY);

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

+8 −4
Original line number Diff line number Diff line
@@ -781,7 +781,8 @@ static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm, 


	if (key_data.use_rsc_tsc) {

		int ver = iwl_fw_lookup_cmd_ver(mvm->fw, LONG_GROUP,

						WOWLAN_TSC_RSC_PARAM);

						WOWLAN_TSC_RSC_PARAM,

						IWL_FW_CMD_VER_UNKNOWN);

		int size;



		if (ver == 4) {
@@ -810,7 +811,8 @@ static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm, 
	    !fw_has_api(&mvm->fw->ucode_capa,

			IWL_UCODE_TLV_API_TKIP_MIC_KEYS)) {

		int ver = iwl_fw_lookup_cmd_ver(mvm->fw, LONG_GROUP,

						WOWLAN_TKIP_PARAM);

						WOWLAN_TKIP_PARAM,

						IWL_FW_CMD_VER_UNKNOWN);

		int size;



		if (ver == 2) {
@@ -836,8 +838,10 @@ static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm, 


	/* configure rekey data only if offloaded rekey is supported (d3) */

	if (mvmvif->rekey_data.valid) {

		cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw, IWL_ALWAYS_LONG_GROUP,

						WOWLAN_KEK_KCK_MATERIAL);

		cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw,

						IWL_ALWAYS_LONG_GROUP,

						WOWLAN_KEK_KCK_MATERIAL,

						IWL_FW_CMD_VER_UNKNOWN);

		if (WARN_ON(cmd_ver != 2 && cmd_ver != 3 &&

			    cmd_ver != IWL_FW_CMD_VER_UNKNOWN))

			return -EINVAL;

drivers/net/wireless/intel/iwlwifi/mvm/ftm-initiator.c

+2 −1
Original line number Diff line number Diff line
@@ -577,7 +577,8 @@ int iwl_mvm_ftm_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 


	if (new_api) {

		u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw, LOCATION_GROUP,

						   TOF_RANGE_REQ_CMD);

						   TOF_RANGE_REQ_CMD,

						   IWL_FW_CMD_VER_UNKNOWN);



		switch (cmd_ver) {

		case 9:

CRA Git | Maintained and supported by SUSTech CRA and CCSE