Commit 6e584873 authored by Sara Sharon's avatar Sara Sharon Committed by Luca Coelho
Browse files

iwlwifi: add 9000 and A000 device families 



Add two new device families to differentiate them from 8000.

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

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

+1 −1
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ static const struct iwl_tt_params iwl9000_tt_params = { 
#define IWL_DEVICE_9000							\

	.ucode_api_max = IWL9000_UCODE_API_MAX,				\

	.ucode_api_min = IWL9000_UCODE_API_MIN,				\

	.device_family = IWL_DEVICE_FAMILY_8000,			\

	.device_family = IWL_DEVICE_FAMILY_9000,			\

	.max_inst_size = IWL60_RTC_INST_SIZE,				\

	.max_data_size = IWL60_RTC_DATA_SIZE,				\

	.base_params = &iwl9000_base_params,				\

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

+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ static const struct iwl_ht_params iwl_a000_ht_params = { 
#define IWL_DEVICE_A000							\

	.ucode_api_max = IWL_A000_UCODE_API_MAX,			\

	.ucode_api_min = IWL_A000_UCODE_API_MIN,			\

	.device_family = IWL_DEVICE_FAMILY_8000,			\

	.device_family = IWL_DEVICE_FAMILY_A000,			\

	.max_inst_size = IWL60_RTC_INST_SIZE,				\

	.max_data_size = IWL60_RTC_DATA_SIZE,				\

	.base_params = &iwl_a000_base_params,				\

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

+2 −0
Original line number Diff line number Diff line
@@ -88,6 +88,8 @@ enum iwl_device_family { 
	IWL_DEVICE_FAMILY_6150,

	IWL_DEVICE_FAMILY_7000,

	IWL_DEVICE_FAMILY_8000,

	IWL_DEVICE_FAMILY_9000,

	IWL_DEVICE_FAMILY_A000,

};



/*

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

+1 −1
Original line number Diff line number Diff line
@@ -215,7 +215,7 @@ static int iwl_request_firmware(struct iwl_drv *drv, bool first) 
	char tag[8];

	const char *fw_pre_name;



	if (drv->trans->cfg->device_family == IWL_DEVICE_FAMILY_8000 &&

	if (drv->trans->cfg->device_family == IWL_DEVICE_FAMILY_9000 &&

	    CSR_HW_REV_STEP(drv->trans->hw_rev) == SILICON_B_STEP)

		fw_pre_name = cfg->fw_name_pre_next_step;

	else if (drv->trans->cfg->integrated &&

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

+2 −2
Original line number Diff line number Diff line
@@ -241,12 +241,12 @@ IWL_EXPORT_SYMBOL(iwl_clear_bits_prph); 


void iwl_force_nmi(struct iwl_trans *trans)

{

	if (trans->cfg->device_family != IWL_DEVICE_FAMILY_8000) {

	if (trans->cfg->device_family < IWL_DEVICE_FAMILY_8000) {

		iwl_write_prph(trans, DEVICE_SET_NMI_REG,

			       DEVICE_SET_NMI_VAL_DRV);

		iwl_write_prph(trans, DEVICE_SET_NMI_REG,

			       DEVICE_SET_NMI_VAL_HW);

	} else if (trans->cfg->gen2) {

	} else if (trans->cfg->device_family == IWL_DEVICE_FAMILY_A000) {

		iwl_write_prph(trans, UREG_NIC_SET_NMI_DRIVER,

			       DEVICE_SET_NMI_8000_VAL);

	} else {

CRA Git | Maintained and supported by SUSTech CRA and CCSE