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

Commit b1a9338d authored by John W. Linville's avatar John W. Linville
Browse files

Merge branch 'wireless-next-2.6' of... 

Merge branch 'wireless-next-2.6' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6
parents 1728943d 62cb3c6a

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

+73 −0
Original line number Diff line number Diff line
@@ -50,14 +50,20 @@ 


/* Highest firmware API version supported */

#define IWL1000_UCODE_API_MAX 3

#define IWL100_UCODE_API_MAX 5



/* Lowest firmware API version supported */

#define IWL1000_UCODE_API_MIN 1

#define IWL100_UCODE_API_MIN 5



#define IWL1000_FW_PRE "iwlwifi-1000-"

#define _IWL1000_MODULE_FIRMWARE(api) IWL1000_FW_PRE #api ".ucode"

#define IWL1000_MODULE_FIRMWARE(api) _IWL1000_MODULE_FIRMWARE(api)



#define IWL100_FW_PRE "iwlwifi-100-"

#define _IWL100_MODULE_FIRMWARE(api) IWL100_FW_PRE #api ".ucode"

#define IWL100_MODULE_FIRMWARE(api) _IWL100_MODULE_FIRMWARE(api)





/*

 * For 1000, use advance thermal throttling critical temperature threshold,
@@ -310,4 +316,71 @@ struct iwl_cfg iwl1000_bg_cfg = { 
	.chain_noise_calib_by_driver = true,

};



struct iwl_cfg iwl100_bgn_cfg = {

	.name = "Intel(R) 100 Series 1x1 BGN",

	.fw_name_pre = IWL100_FW_PRE,

	.ucode_api_max = IWL100_UCODE_API_MAX,

	.ucode_api_min = IWL100_UCODE_API_MIN,

	.sku = IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl1000_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwlagn_mod_params,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_A,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.set_l0s = true,

	.use_bsm = false,

	.max_ll_items = OTP_MAX_LL_ITEMS_1000,

	.shadow_ram_support = false,

	.ht_greenfield_support = true,

	.led_compensation = 51,

	.use_rts_for_aggregation = true, /* use rts/cts protection */

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.max_event_log_size = 128,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



struct iwl_cfg iwl100_bg_cfg = {

	.name = "Intel(R) 100 Series 1x1 BG",

	.fw_name_pre = IWL100_FW_PRE,

	.ucode_api_max = IWL100_UCODE_API_MAX,

	.ucode_api_min = IWL100_UCODE_API_MIN,

	.sku = IWL_SKU_G,

	.ops = &iwl1000_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_1000_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_1000_TX_POWER_VERSION,

	.num_of_queues = IWLAGN_NUM_QUEUES,

	.num_of_ampdu_queues = IWLAGN_NUM_AMPDU_QUEUES,

	.mod_params = &iwlagn_mod_params,

	.valid_tx_ant = ANT_A,

	.valid_rx_ant = ANT_A,

	.pll_cfg_val = CSR50_ANA_PLL_CFG_VAL,

	.set_l0s = true,

	.use_bsm = false,

	.max_ll_items = OTP_MAX_LL_ITEMS_1000,

	.shadow_ram_support = false,

	.led_compensation = 51,

	.chain_noise_num_beacons = IWL_CAL_NUM_BEACONS,

	.support_ct_kill_exit = true,

	.plcp_delta_threshold = IWL_MAX_PLCP_ERR_EXT_LONG_THRESHOLD_DEF,

	.chain_noise_scale = 1000,

	.monitor_recover_period = IWL_DEF_MONITORING_PERIOD,

	.max_event_log_size = 128,

	.ucode_tracing = true,

	.sensitivity_calib_by_driver = true,

	.chain_noise_calib_by_driver = true,

};



MODULE_FIRMWARE(IWL1000_MODULE_FIRMWARE(IWL1000_UCODE_API_MAX));

MODULE_FIRMWARE(IWL100_MODULE_FIRMWARE(IWL100_UCODE_API_MAX));

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

+47 −14
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 


/* Highest firmware API version supported */

#define IWL6000_UCODE_API_MAX 4

#define IWL6050_UCODE_API_MAX 4

#define IWL6050_UCODE_API_MAX 5

#define IWL6000G2_UCODE_API_MAX 5



/* Lowest firmware API version supported */
@@ -83,13 +83,22 @@ static void iwl6000_set_ct_threshold(struct iwl_priv *priv) 
	priv->hw_params.ct_kill_exit_threshold = CT_KILL_EXIT_THRESHOLD;

}



static void iwl6050_additional_nic_config(struct iwl_priv *priv)

{

	/* Indicate calibration version to uCode. */

static void iwl6000_set_calib_version(struct iwl_priv *priv)

	if (priv->cfg->ops->lib->eeprom_ops.calib_version(priv) >= 6)

		iwl_set_bit(priv, CSR_GP_DRIVER_REG,

				CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);

}



static void iwl6050g2_additional_nic_config(struct iwl_priv *priv)

{

	if (priv->cfg->need_dc_calib &&

	    (priv->cfg->ops->lib->eeprom_ops.calib_version(priv) >= 6))

	/* Indicate calibration version to uCode. */

	if (priv->cfg->ops->lib->eeprom_ops.calib_version(priv) >= 6)

		iwl_set_bit(priv, CSR_GP_DRIVER_REG,

				CSR_GP_DRIVER_REG_BIT_CALIB_VERSION6);

	iwl_set_bit(priv, CSR_GP_DRIVER_REG,

		    CSR_GP_DRIVER_REG_BIT_6050_1x2);

}



/* NIC configuration for 6000 series */
@@ -117,9 +126,11 @@ static void iwl6000_nic_config(struct iwl_priv *priv) 
		iwl_write32(priv, CSR_GP_DRIVER_REG,

			     CSR_GP_DRIVER_REG_BIT_RADIO_SKU_2x2_IPA);

	}

	/* else do nothing, uCode configured */

	if (priv->cfg->ops->lib->temp_ops.set_calib_version)

		priv->cfg->ops->lib->temp_ops.set_calib_version(priv);

	/* do additional nic configuration if needed */

	if (priv->cfg->ops->nic &&

		priv->cfg->ops->nic->additional_nic_config) {

			priv->cfg->ops->nic->additional_nic_config(priv);

	}

}



static struct iwl_sensitivity_ranges iwl6000_sensitivity = {
@@ -188,7 +199,7 @@ static int iwl6000_hw_set_hw_params(struct iwl_priv *priv) 
		BIT(IWL_CALIB_TX_IQ)		|

		BIT(IWL_CALIB_BASE_BAND);

	if (priv->cfg->need_dc_calib)

		priv->hw_params.calib_init_cfg |= BIT(IWL_CALIB_DC);

		priv->hw_params.calib_rt_cfg |= BIT(IWL_CALIB_CFG_DC_IDX);



	priv->hw_params.beacon_time_tsf_bits = IWLAGN_EXT_BEACON_TIME_POS;
@@ -320,7 +331,6 @@ static struct iwl_lib_ops iwl6000_lib = { 
	.temp_ops = {

		.temperature = iwlagn_temperature,

		.set_ct_kill = iwl6000_set_ct_threshold,

		.set_calib_version = iwl6000_set_calib_version,

	 },

	.manage_ibss_station = iwlagn_manage_ibss_station,

	.update_bcast_stations = iwl_update_bcast_stations,
@@ -396,7 +406,6 @@ static struct iwl_lib_ops iwl6000g2b_lib = { 
	.temp_ops = {

		.temperature = iwlagn_temperature,

		.set_ct_kill = iwl6000_set_ct_threshold,

		.set_calib_version = iwl6000_set_calib_version,

	 },

	.manage_ibss_station = iwlagn_manage_ibss_station,

	.update_bcast_stations = iwl_update_bcast_stations,
@@ -419,6 +428,14 @@ static struct iwl_lib_ops iwl6000g2b_lib = { 
	}

};



static struct iwl_nic_ops iwl6050_nic_ops = {

	.additional_nic_config = &iwl6050_additional_nic_config,

};



static struct iwl_nic_ops iwl6050g2_nic_ops = {

	.additional_nic_config = &iwl6050g2_additional_nic_config,

};



static const struct iwl_ops iwl6000_ops = {

	.lib = &iwl6000_lib,

	.hcmd = &iwlagn_hcmd,
@@ -426,6 +443,22 @@ static const struct iwl_ops iwl6000_ops = { 
	.led = &iwlagn_led_ops,

};



static const struct iwl_ops iwl6050_ops = {

	.lib = &iwl6000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.nic = &iwl6050_nic_ops,

};



static const struct iwl_ops iwl6050g2_ops = {

	.lib = &iwl6000_lib,

	.hcmd = &iwlagn_hcmd,

	.utils = &iwlagn_hcmd_utils,

	.led = &iwlagn_led_ops,

	.nic = &iwl6050g2_nic_ops,

};



static const struct iwl_ops iwl6000g2b_ops = {

	.lib = &iwl6000g2b_lib,

	.hcmd = &iwlagn_bt_hcmd,
@@ -909,7 +942,7 @@ struct iwl_cfg iwl6050_2agn_cfg = { 
	.ucode_api_max = IWL6050_UCODE_API_MAX,

	.ucode_api_min = IWL6050_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl6000_ops,

	.ops = &iwl6050_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,
@@ -947,7 +980,7 @@ struct iwl_cfg iwl6050g2_bgn_cfg = { 
	.ucode_api_max = IWL6050_UCODE_API_MAX,

	.ucode_api_min = IWL6050_UCODE_API_MIN,

	.sku = IWL_SKU_G|IWL_SKU_N,

	.ops = &iwl6000_ops,

	.ops = &iwl6050g2_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6050G2_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_6050G2_TX_POWER_VERSION,
@@ -985,7 +1018,7 @@ struct iwl_cfg iwl6050_2abg_cfg = { 
	.ucode_api_max = IWL6050_UCODE_API_MAX,

	.ucode_api_min = IWL6050_UCODE_API_MIN,

	.sku = IWL_SKU_A|IWL_SKU_G,

	.ops = &iwl6000_ops,

	.ops = &iwl6050_ops,

	.eeprom_size = OTP_LOW_IMAGE_SIZE,

	.eeprom_ver = EEPROM_6050_EEPROM_VERSION,

	.eeprom_calib_ver = EEPROM_6050_TX_POWER_VERSION,

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

+29 −0
Original line number Diff line number Diff line
@@ -2765,6 +2765,25 @@ static void iwl_rf_kill_ct_config(struct iwl_priv *priv) 
	}

}



static int iwlagn_send_calib_cfg_rt(struct iwl_priv *priv, u32 cfg)

{

	struct iwl_calib_cfg_cmd calib_cfg_cmd;

	struct iwl_host_cmd cmd = {

		.id = CALIBRATION_CFG_CMD,

		.len = sizeof(struct iwl_calib_cfg_cmd),

		.data = &calib_cfg_cmd,

	};



	memset(&calib_cfg_cmd, 0, sizeof(calib_cfg_cmd));

	calib_cfg_cmd.ucd_calib_cfg.once.is_enable = IWL_CALIB_INIT_CFG_ALL;

	calib_cfg_cmd.ucd_calib_cfg.once.start = cfg;

	calib_cfg_cmd.ucd_calib_cfg.once.send_res = 0;

	calib_cfg_cmd.ucd_calib_cfg.flags = 0;



	return iwl_send_cmd(priv, &cmd);

}





/**

 * iwl_alive_start - called after REPLY_ALIVE notification received

 *                   from protocol/runtime uCode (initialization uCode's
@@ -2801,6 +2820,10 @@ static void iwl_alive_start(struct iwl_priv *priv) 
		goto restart;

	}



	if (priv->hw_params.calib_rt_cfg)

		iwlagn_send_calib_cfg_rt(priv, priv->hw_params.calib_rt_cfg);





	/* After the ALIVE response, we can send host commands to the uCode */

	set_bit(STATUS_ALIVE, &priv->status);
@@ -4788,6 +4811,12 @@ static DEFINE_PCI_DEVICE_TABLE(iwl_hw_card_ids) = { 
	{IWL_PCI_DEVICE(0x0083, 0x1326, iwl1000_bg_cfg)},

	{IWL_PCI_DEVICE(0x0084, 0x1216, iwl1000_bg_cfg)},

	{IWL_PCI_DEVICE(0x0084, 0x1316, iwl1000_bg_cfg)},



	{IWL_PCI_DEVICE(0x08AE, 0x1005, iwl100_bgn_cfg)},

	{IWL_PCI_DEVICE(0x08AF, 0x1015, iwl100_bgn_cfg)},

	{IWL_PCI_DEVICE(0x08AE, 0x1025, iwl100_bgn_cfg)},

	{IWL_PCI_DEVICE(0x08AE, 0x1007, iwl100_bg_cfg)},

	{IWL_PCI_DEVICE(0x08AE, 0x1017, iwl100_bg_cfg)},

#endif /* CONFIG_IWL5000 */



	{0}

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

+2 −0
Original line number Diff line number Diff line
@@ -92,6 +92,8 @@ extern struct iwl_cfg iwl6050_2abg_cfg; 
extern struct iwl_cfg iwl6050g2_bgn_cfg;

extern struct iwl_cfg iwl1000_bgn_cfg;

extern struct iwl_cfg iwl1000_bg_cfg;

extern struct iwl_cfg iwl100_bgn_cfg;

extern struct iwl_cfg iwl100_bg_cfg;



extern struct iwl_mod_params iwlagn_mod_params;

extern struct iwl_hcmd_ops iwlagn_hcmd;

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

+15 −0
Original line number Diff line number Diff line
@@ -3800,6 +3800,21 @@ enum { 


#define IWL_CALIB_INIT_CFG_ALL	cpu_to_le32(0xffffffff)



/* This enum defines the bitmap of various calibrations to enable in both

 * init ucode and runtime ucode through CALIBRATION_CFG_CMD.

 */

enum iwl_ucode_calib_cfg {

	IWL_CALIB_CFG_RX_BB_IDX,

	IWL_CALIB_CFG_DC_IDX,

	IWL_CALIB_CFG_TX_IQ_IDX,

	IWL_CALIB_CFG_RX_IQ_IDX,

	IWL_CALIB_CFG_NOISE_IDX,

	IWL_CALIB_CFG_CRYSTAL_IDX,

	IWL_CALIB_CFG_TEMPERATURE_IDX,

	IWL_CALIB_CFG_PAPD_IDX,

};





struct iwl_calib_cfg_elmnt_s {

	__le32 is_enable;

	__le32 start;