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

iwlwifi: move API version lookup to common code 



The API version lookup is parsed from a TLV and should be in shared code
make make it reusable across all opmodes.

Also change the function names from mvm to fw, since this is not
mvm-specific anymore.

Additionally, since this function is not just a single line of code, it
shouldn't be inline.  Convert them to actual functions.

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.20200421133326.cf94672dfcdb.I5ede9cc25ee8de7b8d2b5c574f917a18971da734@changeid
parent c2cf318d

drivers/net/wireless/intel/iwlwifi/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -13,7 +13,8 @@ iwlwifi-$(CONFIG_IWLDVM) += cfg/1000.o cfg/2000.o cfg/5000.o cfg/6000.o 
iwlwifi-$(CONFIG_IWLMVM) += cfg/7000.o cfg/8000.o cfg/9000.o cfg/22000.o

iwlwifi-objs		+= iwl-dbg-tlv.o

iwlwifi-objs		+= iwl-trans.o

iwlwifi-objs		+= fw/notif-wait.o



iwlwifi-objs		+= fw/img.o fw/notif-wait.o

iwlwifi-objs		+= fw/dbg.o

iwlwifi-$(CONFIG_IWLMVM) += fw/paging.o fw/smem.o fw/init.o

iwlwifi-$(CONFIG_ACPI) += fw/acpi.o

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

0 → 100644
+99 −0
Original line number Diff line number Diff line 
/******************************************************************************

 *

 * This file is provided under a dual BSD/GPLv2 license.  When using or

 * redistributing this file, you may do so under either license.

 *

 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2019 Intel Corporation

 *

 * 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

 * published by the Free Software Foundation.

 *

 * This program is distributed in the hope that it will be useful, but

 * WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * General Public License for more details.

 *

 * The full GNU General Public License is included in this distribution

 * in the file called COPYING.

 *

 * Contact Information:

 *  Intel Linux Wireless <linuxwifi@intel.com>

 * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497

 *

 * BSD LICENSE

 *

 * Copyright(c) 2019 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 *  * Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer.

 *  * Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *  * Neither the name Intel Corporation nor the names of its

 *    contributors may be used to endorse or promote products derived

 *    from this software without specific prior written permission.

 *

 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS

 * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT

 * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR

 * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT

 * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT

 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,

 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY

 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT

 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE

 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

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



#include "img.h"



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

{

	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;



	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)

			return entry->cmd_ver;

	}



	return IWL_FW_CMD_VER_UNKNOWN;

}

EXPORT_SYMBOL_GPL(iwl_fw_lookup_cmd_ver);



u8 iwl_fw_lookup_notif_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 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->notif_ver == IWL_FW_CMD_VER_UNKNOWN)

				return def;

			return entry->notif_ver;

		}

	}



	return def;

}

EXPORT_SYMBOL_GPL(iwl_fw_lookup_notif_ver);

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

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

}



static inline u8 iwl_mvm_lookup_cmd_ver(const struct iwl_fw *fw, u8 grp, u8 cmd)

{

	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;



	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)

			return entry->cmd_ver;

	}



	return IWL_FW_CMD_VER_UNKNOWN;

}

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



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

#endif  /* __iwl_fw_img_h__ */

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

+2 −2
Original line number Diff line number Diff line
@@ -508,7 +508,7 @@ int iwl_mvm_ftm_start(struct iwl_mvm *mvm, struct ieee80211_vif *vif, 
		return -EBUSY;



	if (new_api) {

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

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

						   TOF_RANGE_REQ_CMD);



		if (cmd_ver == 8)

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

+2 −2
Original line number Diff line number Diff line
@@ -136,7 +136,7 @@ iwl_mvm_ftm_responder_cmd(struct iwl_mvm *mvm, 
				    IWL_TOF_RESPONDER_CMD_VALID_STA_ID),

		.sta_id = mvmvif->bcast_sta.sta_id,

	};

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

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

					   TOF_RESPONDER_CONFIG_CMD);

	int err;

CRA Git | Maintained and supported by SUSTech CRA and CCSE