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

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

Merge git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

parents b28a960c 3281bd4c

drivers/net/wireless/iwlwifi/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -68,6 +68,19 @@ config IWLWIFI_OPMODE_MODULAR 
comment "WARNING: iwlwifi is useless without IWLDVM or IWLMVM"

	depends on IWLWIFI && IWLDVM=n && IWLMVM=n



config IWLWIFI_BCAST_FILTERING

	bool "Enable broadcast filtering"

	depends on IWLMVM

	help

	  Say Y here to enable default bcast filtering configuration.



	  Enabling broadcast filtering will drop any incoming wireless

	  broadcast frames, except some very specific predefined

	  patterns (e.g. incoming arp requests).



	  If unsure, don't enable this option, as some programs might

	  expect incoming broadcasts for their normal operations.



menu "Debugging Options"

	depends on IWLWIFI
@@ -111,6 +124,7 @@ config IWLWIFI_DEBUG_EXPERIMENTAL_UCODE 
	  Enable use of experimental ucode for testing and debugging.



config IWLWIFI_DEVICE_TRACING



	bool "iwlwifi device access tracing"

	depends on IWLWIFI

	depends on EVENT_TRACING

drivers/net/wireless/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ iwlwifi-objs += iwl-eeprom-read.o iwl-eeprom-parse.o 
iwlwifi-objs		+= iwl-phy-db.o iwl-nvm-parse.o

iwlwifi-objs		+= pcie/drv.o pcie/rx.o pcie/tx.o pcie/trans.o

iwlwifi-$(CONFIG_IWLDVM) += iwl-1000.o iwl-2000.o iwl-5000.o iwl-6000.o

iwlwifi-$(CONFIG_IWLMVM) += iwl-7000.o

iwlwifi-$(CONFIG_IWLMVM) += iwl-7000.o iwl-8000.o



iwlwifi-objs += $(iwlwifi-m)

drivers/net/wireless/iwlwifi/dvm/rs.c

+9 −10
Original line number Diff line number Diff line
@@ -176,46 +176,46 @@ static void rs_dbgfs_set_mcs(struct iwl_lq_sta *lq_sta, 
 * (2.4 GHz) band.

 */



static s32 expected_tpt_legacy[IWL_RATE_COUNT] = {

static const u16 expected_tpt_legacy[IWL_RATE_COUNT] = {

	7, 13, 35, 58, 40, 57, 72, 98, 121, 154, 177, 186, 0

};



static s32 expected_tpt_siso20MHz[4][IWL_RATE_COUNT] = {

static const u16 expected_tpt_siso20MHz[4][IWL_RATE_COUNT] = {

	{0, 0, 0, 0, 42, 0,  76, 102, 124, 159, 183, 193, 202}, /* Norm */

	{0, 0, 0, 0, 46, 0,  82, 110, 132, 168, 192, 202, 210}, /* SGI */

	{0, 0, 0, 0, 47, 0,  91, 133, 171, 242, 305, 334, 362}, /* AGG */

	{0, 0, 0, 0, 52, 0, 101, 145, 187, 264, 330, 361, 390}, /* AGG+SGI */

};



static s32 expected_tpt_siso40MHz[4][IWL_RATE_COUNT] = {

static const u16 expected_tpt_siso40MHz[4][IWL_RATE_COUNT] = {

	{0, 0, 0, 0,  77, 0, 127, 160, 184, 220, 242, 250, 257}, /* Norm */

	{0, 0, 0, 0,  83, 0, 135, 169, 193, 229, 250, 257, 264}, /* SGI */

	{0, 0, 0, 0,  94, 0, 177, 249, 313, 423, 512, 550, 586}, /* AGG */

	{0, 0, 0, 0, 104, 0, 193, 270, 338, 454, 545, 584, 620}, /* AGG+SGI */

};



static s32 expected_tpt_mimo2_20MHz[4][IWL_RATE_COUNT] = {

static const u16 expected_tpt_mimo2_20MHz[4][IWL_RATE_COUNT] = {

	{0, 0, 0, 0,  74, 0, 123, 155, 179, 214, 236, 244, 251}, /* Norm */

	{0, 0, 0, 0,  81, 0, 131, 164, 188, 223, 243, 251, 257}, /* SGI */

	{0, 0, 0, 0,  89, 0, 167, 235, 296, 402, 488, 526, 560}, /* AGG */

	{0, 0, 0, 0,  97, 0, 182, 255, 320, 431, 520, 558, 593}, /* AGG+SGI*/

};



static s32 expected_tpt_mimo2_40MHz[4][IWL_RATE_COUNT] = {

static const u16 expected_tpt_mimo2_40MHz[4][IWL_RATE_COUNT] = {

	{0, 0, 0, 0, 123, 0, 182, 214, 235, 264, 279, 285, 289}, /* Norm */

	{0, 0, 0, 0, 131, 0, 191, 222, 242, 270, 284, 289, 293}, /* SGI */

	{0, 0, 0, 0, 171, 0, 305, 410, 496, 634, 731, 771, 805}, /* AGG */

	{0, 0, 0, 0, 186, 0, 329, 439, 527, 667, 764, 803, 838}, /* AGG+SGI */

};



static s32 expected_tpt_mimo3_20MHz[4][IWL_RATE_COUNT] = {

static const u16 expected_tpt_mimo3_20MHz[4][IWL_RATE_COUNT] = {

	{0, 0, 0, 0,  99, 0, 153, 186, 208, 239, 256, 263, 268}, /* Norm */

	{0, 0, 0, 0, 106, 0, 162, 194, 215, 246, 262, 268, 273}, /* SGI */

	{0, 0, 0, 0, 134, 0, 249, 346, 431, 574, 685, 732, 775}, /* AGG */

	{0, 0, 0, 0, 148, 0, 272, 376, 465, 614, 727, 775, 818}, /* AGG+SGI */

};



static s32 expected_tpt_mimo3_40MHz[4][IWL_RATE_COUNT] = {

static const u16 expected_tpt_mimo3_40MHz[4][IWL_RATE_COUNT] = {

	{0, 0, 0, 0, 152, 0, 211, 239, 255, 279,  290,  294,  297}, /* Norm */

	{0, 0, 0, 0, 160, 0, 219, 245, 261, 284,  294,  297,  300}, /* SGI */

	{0, 0, 0, 0, 254, 0, 443, 584, 695, 868,  984, 1030, 1070}, /* AGG */
@@ -1111,7 +1111,7 @@ static void rs_set_expected_tpt_table(struct iwl_lq_sta *lq_sta, 
				      struct iwl_scale_tbl_info *tbl)

{

	/* Used to choose among HT tables */

	s32 (*ht_tbl_pointer)[IWL_RATE_COUNT];

	const u16 (*ht_tbl_pointer)[IWL_RATE_COUNT];



	/* Check for invalid LQ type */

	if (WARN_ON_ONCE(!is_legacy(tbl->lq_type) && !is_Ht(tbl->lq_type))) {
@@ -1173,9 +1173,8 @@ static s32 rs_get_best_rate(struct iwl_priv *priv, 
	    &(lq_sta->lq_info[lq_sta->active_tbl]);

	s32 active_sr = active_tbl->win[index].success_ratio;

	s32 active_tpt = active_tbl->expected_tpt[index];



	/* expected "search" throughput */

	s32 *tpt_tbl = tbl->expected_tpt;

	const u16 *tpt_tbl = tbl->expected_tpt;



	s32 new_rate, high, low, start_hi;

	u16 high_low;

drivers/net/wireless/iwlwifi/dvm/rs.h

+1 −1
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ struct iwl_scale_tbl_info { 
	u8 is_dup;	/* 1 = duplicated data streams */

	u8 action;	/* change modulation; IWL_[LEGACY/SISO/MIMO]_SWITCH_* */

	u8 max_search;	/* maximun number of tables we can search */

	s32 *expected_tpt;	/* throughput metrics; expected_tpt_G, etc. */

	const u16 *expected_tpt;	/* throughput metrics; expected_tpt_G, etc. */

	u32 current_rate;  /* rate_n_flags, uCode API format */

	struct iwl_rate_scale_data win[IWL_RATE_COUNT]; /* rate histories */

};

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

+20 −3
Original line number Diff line number Diff line
@@ -71,8 +71,8 @@ 
#define IWL3160_UCODE_API_MAX	8



/* Oldest version we won't warn about */

#define IWL7260_UCODE_API_OK	7

#define IWL3160_UCODE_API_OK	7

#define IWL7260_UCODE_API_OK	8

#define IWL3160_UCODE_API_OK	8



/* Lowest firmware API version supported */

#define IWL7260_UCODE_API_MIN	7
@@ -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 = {
@@ -194,6 +197,17 @@ const struct iwl_cfg iwl3160_n_cfg = { 
	.host_interrupt_operation_mode = true,

};



static const struct iwl_pwr_tx_backoff iwl7265_pwr_tx_backoffs[] = {

	{.pwr = 1600, .backoff = 0},

	{.pwr = 1300, .backoff = 467},

	{.pwr = 900,  .backoff = 1900},

	{.pwr = 800, .backoff = 2630},

	{.pwr = 700, .backoff = 3720},

	{.pwr = 600, .backoff = 5550},

	{.pwr = 500, .backoff = 9350},

	{0},

};



const struct iwl_cfg iwl7265_2ac_cfg = {

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

	.fw_name_pre = IWL7265_FW_PRE,
@@ -201,6 +215,7 @@ const struct iwl_cfg iwl7265_2ac_cfg = { 
	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

};



const struct iwl_cfg iwl7265_2n_cfg = {
@@ -210,6 +225,7 @@ const struct iwl_cfg iwl7265_2n_cfg = { 
	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

};



const struct iwl_cfg iwl7265_n_cfg = {
@@ -219,6 +235,7 @@ const struct iwl_cfg iwl7265_n_cfg = { 
	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL7265_NVM_VERSION,

	.nvm_calib_ver = IWL7265_TX_POWER_VERSION,

	.pwr_tx_backoffs = iwl7265_pwr_tx_backoffs,

};



MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));