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

Commit 7042678d authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: cleanup references to 8000 family in NVM code 



NVM code is tightly coupled with 8000 family, while
it really refers to extended NVM format introduced
back then. Separate it to a configuration dependent
boolean, and rename defines accordingly.

Signed-off-by: default avatarSara Sharon <sara.sharon@intel.com>
Signed-off-by: default avatarLuca Coelho <luciano.coelho@intel.com>
parent 6ffe5de3

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

+2 −1
Original line number Diff line number Diff line
@@ -165,7 +165,8 @@ static const struct iwl_tt_params iwl8000_tt_params = { 
	.default_nvm_file_B_step = DEFAULT_NVM_FILE_FAMILY_8000B,	\

	.default_nvm_file_C_step = DEFAULT_NVM_FILE_FAMILY_8000C,	\

	.thermal_params = &iwl8000_tt_params,				\

	.apmg_not_supported = true

	.apmg_not_supported = true,					\

	.ext_nvm = true



#define IWL_DEVICE_8000							\

	IWL_DEVICE_8000_COMMON,						\

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

+2 −1
Original line number Diff line number Diff line
@@ -147,7 +147,8 @@ static const struct iwl_tt_params iwl9000_tt_params = { 
	.mq_rx_supported = true,					\

	.vht_mu_mimo_supported = true,					\

	.mac_addr_from_csr = true,					\

	.rf_id = true

	.rf_id = true,							\

	.ext_nvm = true



const struct iwl_cfg iwl9160_2ac_cfg = {

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

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

+2 −1
Original line number Diff line number Diff line
@@ -123,7 +123,8 @@ static const struct iwl_ht_params iwl_a000_ht_params = { 
	.mac_addr_from_csr = true,					\

	.use_tfh = true,						\

	.rf_id = true,							\

	.gen2 = true

	.gen2 = true,							\

	.ext_nvm = true



const struct iwl_cfg iwla000_2ac_cfg_hr = {

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

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

+3 −1
Original line number Diff line number Diff line
@@ -317,6 +317,7 @@ struct iwl_pwr_tx_backoff { 
 * @integrated: discrete or integrated

 * @gen2: a000 and on transport operation

 * @cdb: CDB support

 * @ext_nvm: extended NVM format

 *

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

 * API differences in uCode shouldn't be handled here but through TLVs
@@ -365,7 +366,8 @@ struct iwl_cfg { 
	    integrated:1,

	    use_tfh:1,

	    gen2:1,

	    cdb:1;

	    cdb:1,

	    ext_nvm:1;

	u8 valid_tx_ant;

	u8 valid_rx_ant;

	u8 non_shared_ant;

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

+6 −6
Original line number Diff line number Diff line
@@ -79,12 +79,12 @@ 
#define NVM_RF_CFG_TX_ANT_MSK(x) ((x >> 8)  & 0xF) /* bits 8-11  */

#define NVM_RF_CFG_RX_ANT_MSK(x) ((x >> 12) & 0xF) /* bits 12-15 */



#define NVM_RF_CFG_FLAVOR_MSK_FAMILY_8000(x)   (x & 0xF)

#define NVM_RF_CFG_DASH_MSK_FAMILY_8000(x)   ((x >> 4) & 0xF)

#define NVM_RF_CFG_STEP_MSK_FAMILY_8000(x)   ((x >> 8) & 0xF)

#define NVM_RF_CFG_TYPE_MSK_FAMILY_8000(x)   ((x >> 12) & 0xFFF)

#define NVM_RF_CFG_TX_ANT_MSK_FAMILY_8000(x) ((x >> 24) & 0xF)

#define NVM_RF_CFG_RX_ANT_MSK_FAMILY_8000(x) ((x >> 28) & 0xF)

#define EXT_NVM_RF_CFG_FLAVOR_MSK(x)   ((x) & 0xF)

#define EXT_NVM_RF_CFG_DASH_MSK(x)   (((x) >> 4) & 0xF)

#define EXT_NVM_RF_CFG_STEP_MSK(x)   (((x) >> 8) & 0xF)

#define EXT_NVM_RF_CFG_TYPE_MSK(x)   (((x) >> 12) & 0xFFF)

#define EXT_NVM_RF_CFG_TX_ANT_MSK(x) (((x) >> 24) & 0xF)

#define EXT_NVM_RF_CFG_RX_ANT_MSK(x) (((x) >> 28) & 0xF)



/**

 * DOC: Driver system flows - drv component