Commit 971cbe50 authored by Johannes Berg's avatar Johannes Berg Committed by Luca Coelho
Browse files

iwlwifi: make iwl_fw_lookup_cmd_ver() take a cmd_id 



Instead of taking the group/command separately, make the function
take a combined command ID. In many cases, this allows us to pass
an existing command ID (e.g. cmd.id), or introduce a new variable
for it, so that we don't use the command ID twice.

This way, we can also use LONG_GROUP implicitly, so we don't need
to spell that out for many commands.

Apart from mvm.h, fw/img.{c,h} changes and some copyright and
indentation updates, this was done with spatch:

    @@
    identifier cmd;
    expression fw, G, C, def;
    @@
     struct iwl_host_cmd cmd = {
      .id = WIDE_ID(G, C),
    ...
     };
    ...
    -iwl_fw_lookup_cmd_ver(fw, G, C, def)
    +iwl_fw_lookup_cmd_ver(fw, cmd.id, def)

    @@
    identifier cmd;
    expression fw, C, def;
    @@
     struct iwl_host_cmd cmd = {
      .id = C,
    ...
     };
    ...
    -iwl_fw_lookup_cmd_ver(fw, \(IWL_ALWAYS_LONG_GROUP\|LONG_GROUP\), C, def)
    +iwl_fw_lookup_cmd_ver(fw, cmd.id, def)

    @@
    identifier func;
    expression fw, G, C, mvm, flags, cmd, size, def;
    type rettype;
    @@
    rettype func(...)
    {
    +u32 cmd_id = WIDE_ID(G, C);
    ...
    -iwl_fw_lookup_cmd_ver(fw, G, C, def)
    +iwl_fw_lookup_cmd_ver(fw, cmd_id, def)
    ...
    -iwl_mvm_send_cmd_pdu(mvm, WIDE_ID(G, C), flags, cmd, size)
    +iwl_mvm_send_cmd_pdu(mvm, cmd_id, flags, cmd, size)
    ...
    }

    @@
    identifier func;
    expression fw, G, C, mvm, flags, cmd, size, def;
    type rettype;
    @@
    rettype func(...)
    {
    +u32 cmd_id = C;
    ...
    -iwl_fw_lookup_cmd_ver(fw, \(IWL_ALWAYS_LONG_GROUP\|LONG_GROUP\), C, def)
    +iwl_fw_lookup_cmd_ver(fw, cmd_id, def)
    ...
    -iwl_mvm_send_cmd_pdu(mvm, C, flags, cmd, size)
    +iwl_mvm_send_cmd_pdu(mvm, cmd_id, flags, cmd, size)
    ...
    }

    @@
    expression fw, C, def;
    @@
    -iwl_fw_lookup_cmd_ver(fw, \(IWL_ALWAYS_LONG_GROUP\|LONG_GROUP\), C, def)
    +iwl_fw_lookup_cmd_ver(fw, C, def)

    @@
    expression fw, C, G, def;
    @@
    -iwl_fw_lookup_cmd_ver(fw, G, C, def)
    +iwl_fw_lookup_cmd_ver(fw, WIDE_ID(G, C), def)

Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
Link: https://lore.kernel.org/r/iwlwifi.20220128153014.c4ac213cef5c.I6fd9a4fcbcf16ef3a3ae20a2b08ee54ebe06f96f@changeid


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

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

+5 −2
Original line number Diff line number Diff line
@@ -2,13 +2,16 @@ 
/*

 * Copyright(c) 2019 - 2021 Intel Corporation

 */



#include <fw/api/commands.h>

#include "img.h"



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

u8 iwl_fw_lookup_cmd_ver(const struct iwl_fw *fw, u32 cmd_id, u8 def)

{

	const struct iwl_fw_cmd_version *entry;

	unsigned int i;

	/* prior to LONG_GROUP, we never used this CMD version API */

	u8 grp = iwl_cmd_groupid(cmd_id) ?: LONG_GROUP;

	u8 cmd = iwl_cmd_opcode(cmd_id);



	if (!fw->ucode_capa.cmd_versions ||

	    !fw->ucode_capa.n_cmd_versions)

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

+1 −1
Original line number Diff line number Diff line
@@ -275,7 +275,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 def);

u8 iwl_fw_lookup_cmd_ver(const struct iwl_fw *fw, u32 cmd_id, 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

+1 −2
Original line number Diff line number Diff line
@@ -87,8 +87,7 @@ int iwl_set_soc_latency(struct iwl_fw_runtime *fwrt) 
		cmd.flags |= le32_encode_bits(fwrt->trans->trans_cfg->ltr_delay,

					      SOC_FLAGS_LTR_APPLY_DELAY_MASK);



	if (iwl_fw_lookup_cmd_ver(fwrt->fw, IWL_ALWAYS_LONG_GROUP,

				  SCAN_REQ_UMAC,

	if (iwl_fw_lookup_cmd_ver(fwrt->fw, 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

+6 −13
Original line number Diff line number Diff line
@@ -453,8 +453,7 @@ static int iwl_mvm_wowlan_config_rsc_tsc(struct iwl_mvm *mvm, 
					 struct ieee80211_vif *vif)

{

	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);

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

					WOWLAN_TSC_RSC_PARAM,

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

					IWL_FW_CMD_VER_UNKNOWN);

	int ret;
@@ -672,8 +671,7 @@ static int iwl_mvm_send_patterns(struct iwl_mvm *mvm, 
		.dataflags[0] = IWL_HCMD_DFL_NOCOPY,

	};

	int i, err;

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

					WOWLAN_PATTERNS,

	int ver = iwl_fw_lookup_cmd_ver(mvm->fw, cmd.id,

					IWL_FW_CMD_VER_UNKNOWN);



	if (!wowlan->n_patterns)
@@ -921,8 +919,7 @@ iwl_mvm_get_wowlan_config(struct iwl_mvm *mvm, 
	wowlan_config_cmd->flags = ENABLE_L3_FILTERING |

		ENABLE_NBNS_FILTERING | ENABLE_DHCP_FILTERING;



	if (iwl_fw_lookup_cmd_ver(mvm->fw, LONG_GROUP,

				  WOWLAN_CONFIGURATION, 0) < 6) {

	if (iwl_fw_lookup_cmd_ver(mvm->fw, WOWLAN_CONFIGURATION, 0) < 6) {

		/* Query the last used seqno and set it */

		int ret = iwl_mvm_get_last_nonqos_seq(mvm, vif);
@@ -1017,8 +1014,7 @@ static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm, 


	if (!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,

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

						IWL_FW_CMD_VER_UNKNOWN);

		struct wowlan_key_tkip_data tkip_data = {};

		int size;
@@ -1058,7 +1054,6 @@ static int iwl_mvm_wowlan_config_key_params(struct iwl_mvm *mvm, 
		};



		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 != 4 &&
@@ -2074,8 +2069,7 @@ iwl_mvm_send_wowlan_get_status(struct iwl_mvm *mvm, u8 sta_id) 
	};

	int ret, len;

	u8 notif_ver;

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

					   WOWLAN_GET_STATUSES,

	u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw, cmd.id,

					   IWL_FW_CMD_VER_UNKNOWN);



	if (cmd_ver == IWL_FW_CMD_VER_UNKNOWN)
@@ -2182,8 +2176,7 @@ iwl_mvm_send_wowlan_get_status(struct iwl_mvm *mvm, u8 sta_id) 
static struct iwl_wowlan_status_data *

iwl_mvm_get_wakeup_status(struct iwl_mvm *mvm, u8 sta_id)

{

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

					   OFFLOADS_QUERY_CMD,

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

					   IWL_FW_CMD_VER_UNKNOWN);

	__le32 station_id = cpu_to_le32(sta_id);

	u32 cmd_size = cmd_ver != IWL_FW_CMD_VER_UNKNOWN ? sizeof(station_id) : 0;

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

+4 −4
Original line number Diff line number Diff line
@@ -346,8 +346,8 @@ iwl_mvm_ftm_target_chandef_v2(struct iwl_mvm *mvm, 
		*format_bw |= IWL_LOCATION_BW_80MHZ << LOCATION_BW_POS;

		break;

	case NL80211_CHAN_WIDTH_160:

		cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw, LOCATION_GROUP,

						TOF_RANGE_REQ_CMD,

		cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw,

						WIDE_ID(LOCATION_GROUP, TOF_RANGE_REQ_CMD),

						IWL_FW_CMD_VER_UNKNOWN);



		if (cmd_ver >= 13) {
@@ -877,8 +877,8 @@ int iwl_mvm_ftm_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
		return -EBUSY;



	if (new_api) {

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

						   TOF_RANGE_REQ_CMD,

		u8 cmd_ver = iwl_fw_lookup_cmd_ver(mvm->fw,

						   WIDE_ID(LOCATION_GROUP, TOF_RANGE_REQ_CMD),

						   IWL_FW_CMD_VER_UNKNOWN);



		switch (cmd_ver) {