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

Commit ae7f9a74 authored by Wey-Yi Guy's avatar Wey-Yi Guy Committed by John W. Linville
Browse files

iwlagn: support v2 of enhanced sensitivity table 



Add support for v2 of enhanced sensitivity table for 2000 series products

Signed-off-by: default avatarWey-Yi Guy <wey-yi.w.guy@intel.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent e7515ba1

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

+2 −0
Original line number Diff line number Diff line
@@ -221,6 +221,7 @@ static struct iwl_base_params iwl2000_base_params = { 
	.wd_timeout = IWL_DEF_WD_TIMEOUT,

	.max_event_log_size = 512,

	.shadow_reg_enable = true,

	.hd_v2 = true,

};
@@ -240,6 +241,7 @@ static struct iwl_base_params iwl2030_base_params = { 
	.wd_timeout = IWL_LONG_WD_TIMEOUT,

	.max_event_log_size = 512,

	.shadow_reg_enable = true,

	.hd_v2 = true,

};



static struct iwl_ht_params iwl2000_ht_params = {

drivers/net/wireless/iwlwifi/iwl-agn-calib.c

+47 −22
Original line number Diff line number Diff line
@@ -505,28 +505,53 @@ static int iwl_enhance_sensitivity_write(struct iwl_priv *priv) 


	iwl_prepare_legacy_sensitivity_tbl(priv, data, &cmd.enhance_table[0]);



	if (priv->cfg->base_params->hd_v2) {

		cmd.enhance_table[HD_INA_NON_SQUARE_DET_OFDM_INDEX] =

		HD_INA_NON_SQUARE_DET_OFDM_DATA;

			HD_INA_NON_SQUARE_DET_OFDM_DATA_V2;

		cmd.enhance_table[HD_INA_NON_SQUARE_DET_CCK_INDEX] =

		HD_INA_NON_SQUARE_DET_CCK_DATA;

			HD_INA_NON_SQUARE_DET_CCK_DATA_V2;

		cmd.enhance_table[HD_CORR_11_INSTEAD_OF_CORR_9_EN_INDEX] =

		HD_CORR_11_INSTEAD_OF_CORR_9_EN_DATA;

			HD_CORR_11_INSTEAD_OF_CORR_9_EN_DATA_V2;

		cmd.enhance_table[HD_OFDM_NON_SQUARE_DET_SLOPE_MRC_INDEX] =

		HD_OFDM_NON_SQUARE_DET_SLOPE_MRC_DATA;

			HD_OFDM_NON_SQUARE_DET_SLOPE_MRC_DATA_V2;

		cmd.enhance_table[HD_OFDM_NON_SQUARE_DET_INTERCEPT_MRC_INDEX] =

		HD_OFDM_NON_SQUARE_DET_INTERCEPT_MRC_DATA;

			HD_OFDM_NON_SQUARE_DET_INTERCEPT_MRC_DATA_V2;

		cmd.enhance_table[HD_OFDM_NON_SQUARE_DET_SLOPE_INDEX] =

		HD_OFDM_NON_SQUARE_DET_SLOPE_DATA;

			HD_OFDM_NON_SQUARE_DET_SLOPE_DATA_V2;

		cmd.enhance_table[HD_OFDM_NON_SQUARE_DET_INTERCEPT_INDEX] =

		HD_OFDM_NON_SQUARE_DET_INTERCEPT_DATA;

			HD_OFDM_NON_SQUARE_DET_INTERCEPT_DATA_V2;

		cmd.enhance_table[HD_CCK_NON_SQUARE_DET_SLOPE_MRC_INDEX] =

		HD_CCK_NON_SQUARE_DET_SLOPE_MRC_DATA;

			HD_CCK_NON_SQUARE_DET_SLOPE_MRC_DATA_V2;

		cmd.enhance_table[HD_CCK_NON_SQUARE_DET_INTERCEPT_MRC_INDEX] =

		HD_CCK_NON_SQUARE_DET_INTERCEPT_MRC_DATA;

			HD_CCK_NON_SQUARE_DET_INTERCEPT_MRC_DATA_V2;

		cmd.enhance_table[HD_CCK_NON_SQUARE_DET_SLOPE_INDEX] =

		HD_CCK_NON_SQUARE_DET_SLOPE_DATA;

			HD_CCK_NON_SQUARE_DET_SLOPE_DATA_V2;

		cmd.enhance_table[HD_CCK_NON_SQUARE_DET_INTERCEPT_INDEX] =

		HD_CCK_NON_SQUARE_DET_INTERCEPT_DATA;

			HD_CCK_NON_SQUARE_DET_INTERCEPT_DATA_V2;

	} else {

		cmd.enhance_table[HD_INA_NON_SQUARE_DET_OFDM_INDEX] =

			HD_INA_NON_SQUARE_DET_OFDM_DATA_V1;

		cmd.enhance_table[HD_INA_NON_SQUARE_DET_CCK_INDEX] =

			HD_INA_NON_SQUARE_DET_CCK_DATA_V1;

		cmd.enhance_table[HD_CORR_11_INSTEAD_OF_CORR_9_EN_INDEX] =

			HD_CORR_11_INSTEAD_OF_CORR_9_EN_DATA_V1;

		cmd.enhance_table[HD_OFDM_NON_SQUARE_DET_SLOPE_MRC_INDEX] =

			HD_OFDM_NON_SQUARE_DET_SLOPE_MRC_DATA_V1;

		cmd.enhance_table[HD_OFDM_NON_SQUARE_DET_INTERCEPT_MRC_INDEX] =

			HD_OFDM_NON_SQUARE_DET_INTERCEPT_MRC_DATA_V1;

		cmd.enhance_table[HD_OFDM_NON_SQUARE_DET_SLOPE_INDEX] =

			HD_OFDM_NON_SQUARE_DET_SLOPE_DATA_V1;

		cmd.enhance_table[HD_OFDM_NON_SQUARE_DET_INTERCEPT_INDEX] =

			HD_OFDM_NON_SQUARE_DET_INTERCEPT_DATA_V1;

		cmd.enhance_table[HD_CCK_NON_SQUARE_DET_SLOPE_MRC_INDEX] =

			HD_CCK_NON_SQUARE_DET_SLOPE_MRC_DATA_V1;

		cmd.enhance_table[HD_CCK_NON_SQUARE_DET_INTERCEPT_MRC_INDEX] =

			HD_CCK_NON_SQUARE_DET_INTERCEPT_MRC_DATA_V1;

		cmd.enhance_table[HD_CCK_NON_SQUARE_DET_SLOPE_INDEX] =

			HD_CCK_NON_SQUARE_DET_SLOPE_DATA_V1;

		cmd.enhance_table[HD_CCK_NON_SQUARE_DET_INTERCEPT_INDEX] =

			HD_CCK_NON_SQUARE_DET_INTERCEPT_DATA_V1;

	}



	/* Update uCode's "work" table, and copy it to DSP */

	cmd.control = SENSITIVITY_CMD_CONTROL_WORK_TABLE;

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

+23 −11
Original line number Diff line number Diff line
@@ -3067,17 +3067,29 @@ struct iwl_missed_beacon_notif { 
/* number of additional entries for enhanced tbl */

#define ENHANCE_HD_TABLE_ENTRIES  (ENHANCE_HD_TABLE_SIZE - HD_TABLE_SIZE)



#define HD_INA_NON_SQUARE_DET_OFDM_DATA			cpu_to_le16(0)

#define HD_INA_NON_SQUARE_DET_CCK_DATA			cpu_to_le16(0)

#define HD_CORR_11_INSTEAD_OF_CORR_9_EN_DATA		cpu_to_le16(0)

#define HD_OFDM_NON_SQUARE_DET_SLOPE_MRC_DATA		cpu_to_le16(668)

#define HD_OFDM_NON_SQUARE_DET_INTERCEPT_MRC_DATA	cpu_to_le16(4)

#define HD_OFDM_NON_SQUARE_DET_SLOPE_DATA		cpu_to_le16(486)

#define HD_OFDM_NON_SQUARE_DET_INTERCEPT_DATA		cpu_to_le16(37)

#define HD_CCK_NON_SQUARE_DET_SLOPE_MRC_DATA		cpu_to_le16(853)

#define HD_CCK_NON_SQUARE_DET_INTERCEPT_MRC_DATA	cpu_to_le16(4)

#define HD_CCK_NON_SQUARE_DET_SLOPE_DATA		cpu_to_le16(476)

#define HD_CCK_NON_SQUARE_DET_INTERCEPT_DATA		cpu_to_le16(99)

#define HD_INA_NON_SQUARE_DET_OFDM_DATA_V1		cpu_to_le16(0)

#define HD_INA_NON_SQUARE_DET_CCK_DATA_V1		cpu_to_le16(0)

#define HD_CORR_11_INSTEAD_OF_CORR_9_EN_DATA_V1		cpu_to_le16(0)

#define HD_OFDM_NON_SQUARE_DET_SLOPE_MRC_DATA_V1	cpu_to_le16(668)

#define HD_OFDM_NON_SQUARE_DET_INTERCEPT_MRC_DATA_V1	cpu_to_le16(4)

#define HD_OFDM_NON_SQUARE_DET_SLOPE_DATA_V1		cpu_to_le16(486)

#define HD_OFDM_NON_SQUARE_DET_INTERCEPT_DATA_V1	cpu_to_le16(37)

#define HD_CCK_NON_SQUARE_DET_SLOPE_MRC_DATA_V1		cpu_to_le16(853)

#define HD_CCK_NON_SQUARE_DET_INTERCEPT_MRC_DATA_V1	cpu_to_le16(4)

#define HD_CCK_NON_SQUARE_DET_SLOPE_DATA_V1		cpu_to_le16(476)

#define HD_CCK_NON_SQUARE_DET_INTERCEPT_DATA_V1		cpu_to_le16(99)



#define HD_INA_NON_SQUARE_DET_OFDM_DATA_V2		cpu_to_le16(1)

#define HD_INA_NON_SQUARE_DET_CCK_DATA_V2		cpu_to_le16(1)

#define HD_CORR_11_INSTEAD_OF_CORR_9_EN_DATA_V2		cpu_to_le16(1)

#define HD_OFDM_NON_SQUARE_DET_SLOPE_MRC_DATA_V2	cpu_to_le16(600)

#define HD_OFDM_NON_SQUARE_DET_INTERCEPT_MRC_DATA_V2	cpu_to_le16(40)

#define HD_OFDM_NON_SQUARE_DET_SLOPE_DATA_V2		cpu_to_le16(486)

#define HD_OFDM_NON_SQUARE_DET_INTERCEPT_DATA_V2	cpu_to_le16(45)

#define HD_CCK_NON_SQUARE_DET_SLOPE_MRC_DATA_V2		cpu_to_le16(853)

#define HD_CCK_NON_SQUARE_DET_INTERCEPT_MRC_DATA_V2	cpu_to_le16(60)

#define HD_CCK_NON_SQUARE_DET_SLOPE_DATA_V2		cpu_to_le16(476)

#define HD_CCK_NON_SQUARE_DET_INTERCEPT_DATA_V2		cpu_to_le16(99)





/* Control field in struct iwl_sensitivity_cmd */

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

+2 −0
Original line number Diff line number Diff line
@@ -136,6 +136,7 @@ struct iwl_mod_params { 
 * @max_event_log_size: size of event log buffer size for ucode event logging

 * @shadow_reg_enable: HW shadhow register bit

 * @no_idle_support: do not support idle mode

 * @hd_v2: v2 of enhanced sensitivity value, used for 2000 series and up

 */

struct iwl_base_params {

	int eeprom_size;
@@ -158,6 +159,7 @@ struct iwl_base_params { 
	u32 max_event_log_size;

	const bool shadow_reg_enable;

	const bool no_idle_support;

	const bool hd_v2;

};

/*

 * @advanced_bt_coexist: support advanced bt coexist