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

Commit 97f95c93 authored by Sara Sharon's avatar Sara Sharon Committed by Emmanuel Grumbach
Browse files

iwlwifi: remove support for fw older than -16.ucode 



API version lower than 16 is not supported anymore - don't
load older ucode.
Remove code handling older versions.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent a0b09f13

drivers/net/wireless/intel/iwlwifi/iwl-7000.c

+6 −6
Original line number Diff line number Diff line
@@ -77,15 +77,15 @@ 
#define IWL3168_UCODE_API_MAX	21



/* Oldest version we won't warn about */

#define IWL7260_UCODE_API_OK	13

#define IWL7265_UCODE_API_OK	13

#define IWL7265D_UCODE_API_OK	13

#define IWL7260_UCODE_API_OK	16

#define IWL7265_UCODE_API_OK	16

#define IWL7265D_UCODE_API_OK	16

#define IWL3168_UCODE_API_OK	20



/* Lowest firmware API version supported */

#define IWL7260_UCODE_API_MIN	13

#define IWL7265_UCODE_API_MIN	13

#define IWL7265D_UCODE_API_MIN	13

#define IWL7260_UCODE_API_MIN	16

#define IWL7265_UCODE_API_MIN	16

#define IWL7265D_UCODE_API_MIN	16

#define IWL3168_UCODE_API_MIN	20



/* NVM versions */

drivers/net/wireless/intel/iwlwifi/iwl-8000.c

+2 −2
Original line number Diff line number Diff line
@@ -74,11 +74,11 @@ 
#define IWL8265_UCODE_API_MAX	21



/* Oldest version we won't warn about */

#define IWL8000_UCODE_API_OK	13

#define IWL8000_UCODE_API_OK	16

#define IWL8265_UCODE_API_OK	20



/* Lowest firmware API version supported */

#define IWL8000_UCODE_API_MIN	13

#define IWL8000_UCODE_API_MIN	16

#define IWL8265_UCODE_API_MIN	20



/* NVM versions */

drivers/net/wireless/intel/iwlwifi/iwl-9000.c

+2 −2
Original line number Diff line number Diff line
@@ -58,10 +58,10 @@ 
#define IWL9000_UCODE_API_MAX	21



/* Oldest version we won't warn about */

#define IWL9000_UCODE_API_OK	13

#define IWL9000_UCODE_API_OK	16



/* Lowest firmware API version supported */

#define IWL9000_UCODE_API_MIN	13

#define IWL9000_UCODE_API_MIN	16



/* NVM versions */

#define IWL9000_NVM_VERSION		0x0a1d

drivers/net/wireless/intel/iwlwifi/iwl-drv.c

+1 −4
Original line number Diff line number Diff line
@@ -1255,10 +1255,7 @@ static void iwl_req_fw_callback(const struct firmware *ucode_raw, void *context) 
	if (err)

		goto try_again;



	if (fw_has_api(&drv->fw.ucode_capa, IWL_UCODE_TLV_API_NEW_VERSION))

	api_ver = drv->fw.ucode_ver;

	else

		api_ver = IWL_UCODE_API(drv->fw.ucode_ver);



	/*

	 * api_ver should match the api version forming part of the

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

+0 −4
Original line number Diff line number Diff line
@@ -245,13 +245,11 @@ typedef unsigned int __bitwise__ iwl_ucode_tlv_api_t; 


/**

 * enum iwl_ucode_tlv_api - ucode api

 * @IWL_UCODE_TLV_API_BT_COEX_SPLIT: new API for BT Coex

 * @IWL_UCODE_TLV_API_FRAGMENTED_SCAN: This ucode supports active dwell time

 *	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_WIDE_CMD_HDR: ucode supports wide command header

 * @IWL_UCODE_TLV_API_LQ_SS_PARAMS: Configure STBC/BFER via LQ CMD ss_params

 * @IWL_UCODE_TLV_API_NEW_VERSION: new versioning format

 * @IWL_UCODE_TLV_API_EXT_SCAN_PRIORITY: scan APIs use 8-level priority

 *	instead of 3.

 * @IWL_UCODE_TLV_API_TX_POWER_CHAIN: TX power API has larger command size
@@ -260,12 +258,10 @@ typedef unsigned int __bitwise__ iwl_ucode_tlv_api_t; 
 * @NUM_IWL_UCODE_TLV_API: number of bits used

 */

enum iwl_ucode_tlv_api {

	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_WIFI_MCC_UPDATE	= (__force iwl_ucode_tlv_api_t)9,

	IWL_UCODE_TLV_API_WIDE_CMD_HDR		= (__force iwl_ucode_tlv_api_t)14,

	IWL_UCODE_TLV_API_LQ_SS_PARAMS		= (__force iwl_ucode_tlv_api_t)18,

	IWL_UCODE_TLV_API_NEW_VERSION		= (__force iwl_ucode_tlv_api_t)20,

	IWL_UCODE_TLV_API_EXT_SCAN_PRIORITY	= (__force iwl_ucode_tlv_api_t)24,

	IWL_UCODE_TLV_API_TX_POWER_CHAIN	= (__force iwl_ucode_tlv_api_t)27,