Commit ae2b21b0 authored by Eran Harary's avatar Eran Harary Committed by Emmanuel Grumbach
Browse files

iwlwifi: mvm: support NVM sections for family 8000 



The identification of the hardware section in the NVM
of new devices has been changed, hence the need to add it
to iwl_cfg and adapt the code that uses this value
accordingly.

Signed-off-by: default avatarEran Harary <eran.harary@intel.com>
Reviewed-by: default avatarJohannes Berg <johannes.berg@intel.com>
Signed-off-by: default avatarEmmanuel Grumbach <emmanuel.grumbach@intel.com>
parent 503ab8c5

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

+4 −1
Original line number Diff line number Diff line
@@ -95,6 +95,8 @@ 
#define IWL7265_FW_PRE "iwlwifi-7265-"

#define IWL7265_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode"



#define NVM_HW_SECTION_NUM_FAMILY_7000		0



static const struct iwl_base_params iwl7000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,
@@ -120,7 +122,8 @@ static const struct iwl_ht_params iwl7000_ht_params = { 
	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.base_params = &iwl7000_base_params,			\

	.led_mode = IWL_LED_RF_STATE

	.led_mode = IWL_LED_RF_STATE,				\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_7000





const struct iwl_cfg iwl7260_2ac_cfg = {

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

+4 −1
Original line number Diff line number Diff line
@@ -82,6 +82,8 @@ 
#define IWL8000_FW_PRE "iwlwifi-8000-"

#define IWL8000_MODULE_FIRMWARE(api) IWL8000_FW_PRE __stringify(api) ".ucode"



#define NVM_HW_SECTION_NUM_FAMILY_8000		10



static const struct iwl_base_params iwl8000_base_params = {

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.num_of_queues = IWLAGN_NUM_QUEUES,
@@ -106,7 +108,8 @@ static const struct iwl_ht_params iwl8000_ht_params = { 
	.max_inst_size = IWL60_RTC_INST_SIZE,			\

	.max_data_size = IWL60_RTC_DATA_SIZE,			\

	.base_params = &iwl8000_base_params,			\

	.led_mode = IWL_LED_RF_STATE

	.led_mode = IWL_LED_RF_STATE,				\

	.nvm_hw_section_num = NVM_HW_SECTION_NUM_FAMILY_8000



const struct iwl_cfg iwl8260_2ac_cfg = {

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

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

+2 −0
Original line number Diff line number Diff line
@@ -218,6 +218,7 @@ struct iwl_eeprom_params { 
 * @high_temp: Is this NIC is designated to be in high temperature.

 * @host_interrupt_operation_mode: device needs host interrupt operation

 *	mode set

 * @nvm_hw_section_num: the ID of the HW NVM section

 *

 * We enable the driver to be backward compatible wrt. hardware features.

 * API differences in uCode shouldn't be handled here but through TLVs
@@ -248,6 +249,7 @@ struct iwl_cfg { 
	const bool internal_wimax_coex;

	const bool host_interrupt_operation_mode;

	bool high_temp;

	u8   nvm_hw_section_num;

};



/*

drivers/net/wireless/iwlwifi/mvm/fw-api.h

+4 −8
Original line number Diff line number Diff line
@@ -304,6 +304,7 @@ struct iwl_phy_cfg_cmd { 
#define PHY_CFG_RX_CHAIN_B	BIT(13)

#define PHY_CFG_RX_CHAIN_C	BIT(14)



#define NVM_MAX_NUM_SECTIONS	11



/* Target of the NVM_ACCESS_CMD */

enum {
@@ -314,14 +315,9 @@ enum { 


/* Section types for NVM_ACCESS_CMD */

enum {

	NVM_SECTION_TYPE_HW = 0,

	NVM_SECTION_TYPE_SW,

	NVM_SECTION_TYPE_PAPD,

	NVM_SECTION_TYPE_BT,

	NVM_SECTION_TYPE_CALIBRATION,

	NVM_SECTION_TYPE_PRODUCTION,

	NVM_SECTION_TYPE_POST_FCS_CALIB,

	NVM_NUM_OF_SECTIONS,

	NVM_SECTION_TYPE_SW = 1,

	NVM_SECTION_TYPE_CALIBRATION = 4,

	NVM_SECTION_TYPE_PRODUCTION = 5,

};



/**

drivers/net/wireless/iwlwifi/mvm/mvm.h

+1 −1
Original line number Diff line number Diff line
@@ -470,7 +470,7 @@ struct iwl_mvm { 


	struct iwl_nvm_data *nvm_data;

	/* NVM sections */

	struct iwl_nvm_section nvm_sections[NVM_NUM_OF_SECTIONS];

	struct iwl_nvm_section nvm_sections[NVM_MAX_NUM_SECTIONS];



	/* EEPROM MAC addresses */

	struct mac_address addresses[IWL_MVM_MAX_ADDRESSES];

CRA Git | Maintained and supported by SUSTech CRA and CCSE