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

iwlwifi: remove dead code for internal devices only 



We had a bunch of code that was relevant for internal
devices only. Those devices are now being depreceated.
Kill all the now unneeded code.

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

drivers/net/wireless/intel/iwlwifi/cfg/8000.c

+0 −51
Original line number Original line Diff line number Diff line
@@ -100,14 +100,6 @@ 
#define NVM_HW_SECTION_NUM_FAMILY_8000		10

#define NVM_HW_SECTION_NUM_FAMILY_8000		10

#define DEFAULT_NVM_FILE_FAMILY_8000C		"nvmData-8000C"

#define DEFAULT_NVM_FILE_FAMILY_8000C		"nvmData-8000C"





/* Max SDIO RX/TX aggregation sizes of the ADDBA request/response */

#define MAX_RX_AGG_SIZE_8260_SDIO	21

#define MAX_TX_AGG_SIZE_8260_SDIO	40



/* Max A-MPDU exponent for HT and VHT */

#define MAX_HT_AMPDU_EXPONENT_8260_SDIO	IEEE80211_HT_MAX_AMPDU_32K

#define MAX_VHT_AMPDU_EXPONENT_8260_SDIO	IEEE80211_VHT_MAX_AMPDU_32K



static const struct iwl_base_params iwl8000_base_params = {

static const struct iwl_base_params iwl8000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_8000,

	.eeprom_size = OTP_LOW_IMAGE_SIZE_FAMILY_8000,

	.num_of_queues = 31,

	.num_of_queues = 31,
@@ -234,48 +226,5 @@ const struct iwl_cfg iwl4165_2ac_cfg = { 
	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

	.max_ht_ampdu_exponent = IEEE80211_HT_MAX_AMPDU_64K,

};

};





const struct iwl_cfg iwl8260_2ac_sdio_cfg = {

	.name = "Intel(R) Dual Band Wireless-AC 8260",

	.fw_name_pre = IWL8000_FW_PRE,

	IWL_DEVICE_8260,

	.ht_params = &iwl8000_ht_params,

	.nvm_ver = IWL8000_NVM_VERSION,

	.nvm_calib_ver = IWL8000_TX_POWER_VERSION,

	.max_rx_agg_size = MAX_RX_AGG_SIZE_8260_SDIO,

	.max_tx_agg_size = MAX_TX_AGG_SIZE_8260_SDIO,

	.disable_dummy_notification = true,

	.max_ht_ampdu_exponent  = MAX_HT_AMPDU_EXPONENT_8260_SDIO,

	.max_vht_ampdu_exponent = MAX_VHT_AMPDU_EXPONENT_8260_SDIO,

};



const struct iwl_cfg iwl8265_2ac_sdio_cfg = {

	.name = "Intel(R) Dual Band Wireless-AC 8265",

	.fw_name_pre = IWL8265_FW_PRE,

	IWL_DEVICE_8265,

	.ht_params = &iwl8000_ht_params,

	.nvm_ver = IWL8000_NVM_VERSION,

	.nvm_calib_ver = IWL8000_TX_POWER_VERSION,

	.max_rx_agg_size = MAX_RX_AGG_SIZE_8260_SDIO,

	.max_tx_agg_size = MAX_TX_AGG_SIZE_8260_SDIO,

	.disable_dummy_notification = true,

	.max_ht_ampdu_exponent  = MAX_HT_AMPDU_EXPONENT_8260_SDIO,

	.max_vht_ampdu_exponent = MAX_VHT_AMPDU_EXPONENT_8260_SDIO,

};



const struct iwl_cfg iwl4165_2ac_sdio_cfg = {

	.name = "Intel(R) Dual Band Wireless-AC 4165",

	.fw_name_pre = IWL8000_FW_PRE,

	IWL_DEVICE_8000,

	.ht_params = &iwl8000_ht_params,

	.nvm_ver = IWL8000_NVM_VERSION,

	.nvm_calib_ver = IWL8000_TX_POWER_VERSION,

	.max_rx_agg_size = MAX_RX_AGG_SIZE_8260_SDIO,

	.max_tx_agg_size = MAX_TX_AGG_SIZE_8260_SDIO,

	.bt_shared_single_ant = true,

	.disable_dummy_notification = true,

	.max_ht_ampdu_exponent  = MAX_HT_AMPDU_EXPONENT_8260_SDIO,

	.max_vht_ampdu_exponent = MAX_VHT_AMPDU_EXPONENT_8260_SDIO,

};



MODULE_FIRMWARE(IWL8000_MODULE_FIRMWARE(IWL8000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL8000_MODULE_FIRMWARE(IWL8000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL8265_MODULE_FIRMWARE(IWL8265_UCODE_API_MAX));
 
MODULE_FIRMWARE(IWL8265_MODULE_FIRMWARE(IWL8265_UCODE_API_MAX));

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -136,7 +136,7 @@ enum iwl_ucode_tlv_type { 
	IWL_UCODE_TLV_N_SCAN_CHANNELS		= 31,

	IWL_UCODE_TLV_N_SCAN_CHANNELS		= 31,

	IWL_UCODE_TLV_PAGING		= 32,

	IWL_UCODE_TLV_PAGING		= 32,

	IWL_UCODE_TLV_SEC_RT_USNIFFER	= 34,

	IWL_UCODE_TLV_SEC_RT_USNIFFER	= 34,

	IWL_UCODE_TLV_SDIO_ADMA_ADDR	= 35,

	/* 35 is unused */

	IWL_UCODE_TLV_FW_VERSION	= 36,

	IWL_UCODE_TLV_FW_VERSION	= 36,

	IWL_UCODE_TLV_FW_DBG_DEST	= 38,

	IWL_UCODE_TLV_FW_DBG_DEST	= 38,

	IWL_UCODE_TLV_FW_DBG_CONF	= 39,

	IWL_UCODE_TLV_FW_DBG_CONF	= 39,

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

+0 −8
Original line number Original line Diff line number Diff line
@@ -138,11 +138,6 @@ struct fw_img { 
	u32 paging_mem_size;

	u32 paging_mem_size;

};

};





struct iwl_sf_region {

	u32 addr;

	u32 size;

};



/*

/*

 * Block paging calculations

 * Block paging calculations

 */

 */
@@ -257,7 +252,6 @@ enum iwl_fw_type { 
 * @type: firmware type (&enum iwl_fw_type)

 * @type: firmware type (&enum iwl_fw_type)

 * @cipher_scheme: optional external cipher scheme.

 * @cipher_scheme: optional external cipher scheme.

 * @human_readable: human readable version

 * @human_readable: human readable version

 * @sdio_adma_addr: the default address to set for the ADMA in SDIO mode until

 *	we get the ALIVE from the uCode

 *	we get the ALIVE from the uCode

 * @dbg_dest_tlv: points to the destination TLV for debug

 * @dbg_dest_tlv: points to the destination TLV for debug

 * @dbg_conf_tlv: array of pointers to configuration TLVs for debug

 * @dbg_conf_tlv: array of pointers to configuration TLVs for debug
@@ -290,8 +284,6 @@ struct iwl_fw { 
	struct iwl_fw_cipher_scheme cs[IWL_UCODE_MAX_CS];

	struct iwl_fw_cipher_scheme cs[IWL_UCODE_MAX_CS];

	u8 human_readable[FW_VER_HUMAN_READABLE_SZ];

	u8 human_readable[FW_VER_HUMAN_READABLE_SZ];





	u32 sdio_adma_addr;



	struct iwl_fw_dbg_dest_tlv *dbg_dest_tlv;

	struct iwl_fw_dbg_dest_tlv *dbg_dest_tlv;

	struct iwl_fw_dbg_conf_tlv *dbg_conf_tlv[FW_DBG_CONF_MAX];

	struct iwl_fw_dbg_conf_tlv *dbg_conf_tlv[FW_DBG_CONF_MAX];

	size_t dbg_conf_tlv_len[FW_DBG_CONF_MAX];

	size_t dbg_conf_tlv_len[FW_DBG_CONF_MAX];

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+0 −3
Original line number Original line Diff line number Diff line
@@ -467,9 +467,6 @@ extern const struct iwl_cfg iwl8260_2ac_cfg; 
extern const struct iwl_cfg iwl8265_2ac_cfg;

extern const struct iwl_cfg iwl8265_2ac_cfg;

extern const struct iwl_cfg iwl8275_2ac_cfg;

extern const struct iwl_cfg iwl8275_2ac_cfg;

extern const struct iwl_cfg iwl4165_2ac_cfg;

extern const struct iwl_cfg iwl4165_2ac_cfg;

extern const struct iwl_cfg iwl8260_2ac_sdio_cfg;

extern const struct iwl_cfg iwl8265_2ac_sdio_cfg;

extern const struct iwl_cfg iwl4165_2ac_sdio_cfg;

extern const struct iwl_cfg iwl9160_2ac_cfg;

extern const struct iwl_cfg iwl9160_2ac_cfg;

extern const struct iwl_cfg iwl9260_2ac_cfg;

extern const struct iwl_cfg iwl9260_2ac_cfg;

extern const struct iwl_cfg iwl9270_2ac_cfg;

extern const struct iwl_cfg iwl9270_2ac_cfg;

drivers/net/wireless/intel/iwlwifi/iwl-csr.h

+0 −2
Original line number Original line Diff line number Diff line
@@ -218,7 +218,6 @@ 
#define CSR_INT_BIT_FH_TX        (1 << 27) /* Tx DMA FH_INT[1:0] */

#define CSR_INT_BIT_FH_TX        (1 << 27) /* Tx DMA FH_INT[1:0] */

#define CSR_INT_BIT_SCD          (1 << 26) /* TXQ pointer advanced */

#define CSR_INT_BIT_SCD          (1 << 26) /* TXQ pointer advanced */

#define CSR_INT_BIT_SW_ERR       (1 << 25) /* uCode error */

#define CSR_INT_BIT_SW_ERR       (1 << 25) /* uCode error */

#define CSR_INT_BIT_PAGING       (1 << 24) /* SDIO PAGING */

#define CSR_INT_BIT_RF_KILL      (1 << 7)  /* HW RFKILL switch GP_CNTRL[27] toggled */

#define CSR_INT_BIT_RF_KILL      (1 << 7)  /* HW RFKILL switch GP_CNTRL[27] toggled */

#define CSR_INT_BIT_CT_KILL      (1 << 6)  /* Critical temp (chip too hot) rfkill */

#define CSR_INT_BIT_CT_KILL      (1 << 6)  /* Critical temp (chip too hot) rfkill */

#define CSR_INT_BIT_SW_RX        (1 << 3)  /* Rx, command responses */

#define CSR_INT_BIT_SW_RX        (1 << 3)  /* Rx, command responses */
@@ -229,7 +228,6 @@ 
				 CSR_INT_BIT_HW_ERR  | \

				 CSR_INT_BIT_HW_ERR  | \

				 CSR_INT_BIT_FH_TX   | \

				 CSR_INT_BIT_FH_TX   | \

				 CSR_INT_BIT_SW_ERR  | \

				 CSR_INT_BIT_SW_ERR  | \

				 CSR_INT_BIT_PAGING  | \

				 CSR_INT_BIT_RF_KILL | \

				 CSR_INT_BIT_RF_KILL | \

				 CSR_INT_BIT_SW_RX   | \

				 CSR_INT_BIT_SW_RX   | \

				 CSR_INT_BIT_WAKEUP  | \

				 CSR_INT_BIT_WAKEUP  | \