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

Commit 1690faef authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2015-06-03' of... 

Merge tag 'iwlwifi-next-for-kalle-2015-06-03' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

* a few fixes (re-enablement of interrupts for certain new
  platforms that have special power states)
* Rework completely the RBD allocation model towards new
  multi RX hardware.
* cleanups
* scan reworks continuation (Luca)
parents fa2ab697 5f4c02e2

drivers/net/wireless/iwlwifi/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ config IWLWIFI 
		Intel 7260 Wi-Fi Adapter

		Intel 3160 Wi-Fi Adapter

		Intel 7265 Wi-Fi Adapter

		Intel 3165 Wi-Fi Adapter

		Intel 8260 Wi-Fi Adapter

drivers/net/wireless/iwlwifi/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ 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 iwl-8000.o

iwlwifi-objs		+= iwl-trans.o



iwlwifi-objs += $(iwlwifi-m)

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

+1 −0
Original line number Diff line number Diff line
@@ -112,6 +112,7 @@ int iwlagn_mac_setup_register(struct iwl_priv *priv, 
		    IEEE80211_HW_QUEUE_CONTROL |

		    IEEE80211_HW_SUPPORTS_PS |

		    IEEE80211_HW_SUPPORTS_DYNAMIC_PS |

		    IEEE80211_HW_SUPPORT_FAST_XMIT |

		    IEEE80211_HW_WANT_MONITOR_VIF;



	hw->offchannel_tx_hw_queue = IWL_AUX_QUEUE;

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

+9 −9
Original line number Diff line number Diff line
@@ -69,16 +69,15 @@ 
#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL7260_UCODE_API_MAX	13

#define IWL3160_UCODE_API_MAX	13

#define IWL7260_UCODE_API_MAX	15



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

#define IWL7260_UCODE_API_OK	12

#define IWL3160_UCODE_API_OK	12

#define IWL3165_UCODE_API_OK	13



/* Lowest firmware API version supported */

#define IWL7260_UCODE_API_MIN	10

#define IWL3160_UCODE_API_MIN	10

#define IWL3165_UCODE_API_MIN	13



/* NVM versions */

#define IWL7260_NVM_VERSION		0x0a1d
@@ -104,9 +103,6 @@ 
#define IWL3160_FW_PRE "iwlwifi-3160-"

#define IWL3160_MODULE_FIRMWARE(api) IWL3160_FW_PRE __stringify(api) ".ucode"



#define IWL3165_FW_PRE "iwlwifi-3165-"

#define IWL3165_MODULE_FIRMWARE(api) IWL3165_FW_PRE __stringify(api) ".ucode"



#define IWL7265_FW_PRE "iwlwifi-7265-"

#define IWL7265_MODULE_FIRMWARE(api) IWL7265_FW_PRE __stringify(api) ".ucode"
@@ -271,8 +267,13 @@ static const struct iwl_ht_params iwl7265_ht_params = { 


const struct iwl_cfg iwl3165_2ac_cfg = {

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

	.fw_name_pre = IWL3165_FW_PRE,

	.fw_name_pre = IWL7265D_FW_PRE,

	IWL_DEVICE_7000,

	/* sparse doens't like the re-assignment but it is safe */

#ifndef __CHECKER__

	.ucode_api_ok = IWL3165_UCODE_API_OK,

	.ucode_api_min = IWL3165_UCODE_API_MIN,

#endif

	.ht_params = &iwl7000_ht_params,

	.nvm_ver = IWL3165_NVM_VERSION,

	.nvm_calib_ver = IWL3165_TX_POWER_VERSION,
@@ -348,6 +349,5 @@ const struct iwl_cfg iwl7265d_n_cfg = { 


MODULE_FIRMWARE(IWL7260_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

MODULE_FIRMWARE(IWL3160_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));

MODULE_FIRMWARE(IWL3165_MODULE_FIRMWARE(IWL3160_UCODE_API_OK));

MODULE_FIRMWARE(IWL7265_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

MODULE_FIRMWARE(IWL7265D_MODULE_FIRMWARE(IWL7260_UCODE_API_OK));

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

+46 −25
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2014 Intel Mobile Communications GmbH

 * Copyright(c) 2014 - 2015 Intel Mobile Communications GmbH

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -32,7 +32,7 @@ 
 * BSD LICENSE

 *

 * Copyright(c) 2014 Intel Corporation. All rights reserved.

 * Copyright(c) 2014 Intel Mobile Communications GmbH

 * Copyright(c) 2014 - 2015 Intel Mobile Communications GmbH

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -69,7 +69,7 @@ 
#include "iwl-agn-hw.h"



/* Highest firmware API version supported */

#define IWL8000_UCODE_API_MAX	13

#define IWL8000_UCODE_API_MAX	15



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

#define IWL8000_UCODE_API_OK	12
@@ -122,6 +122,27 @@ static const struct iwl_ht_params iwl8000_ht_params = { 
	.ht40_bands = BIT(IEEE80211_BAND_2GHZ) | BIT(IEEE80211_BAND_5GHZ),

};



static const struct iwl_tt_params iwl8000_tt_params = {

	.ct_kill_entry = 115,

	.ct_kill_exit = 93,

	.ct_kill_duration = 5,

	.dynamic_smps_entry = 111,

	.dynamic_smps_exit = 107,

	.tx_protection_entry = 112,

	.tx_protection_exit = 105,

	.tx_backoff = {

		{.temperature = 110, .backoff = 200},

		{.temperature = 111, .backoff = 600},

		{.temperature = 112, .backoff = 1200},

		{.temperature = 113, .backoff = 2000},

		{.temperature = 114, .backoff = 4000},

	},

	.support_ct_kill = true,

	.support_dynamic_smps = true,

	.support_tx_protection = true,

	.support_tx_backoff = true,

};



#define IWL_DEVICE_8000							\

	.ucode_api_max = IWL8000_UCODE_API_MAX,				\

	.ucode_api_ok = IWL8000_UCODE_API_OK,				\
@@ -139,7 +160,11 @@ static const struct iwl_ht_params iwl8000_ht_params = { 
	.dccm2_offset = IWL8260_DCCM2_OFFSET,				\

	.dccm2_len = IWL8260_DCCM2_LEN,					\

	.smem_offset = IWL8260_SMEM_OFFSET,				\

	.smem_len = IWL8260_SMEM_LEN

	.smem_len = IWL8260_SMEM_LEN,					\

	.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



const struct iwl_cfg iwl8260_2n_cfg = {

	.name = "Intel(R) Dual Band Wireless N 8260",
@@ -177,8 +202,6 @@ const struct iwl_cfg iwl8260_2ac_sdio_cfg = { 
	.ht_params = &iwl8000_ht_params,

	.nvm_ver = IWL8000_NVM_VERSION,

	.nvm_calib_ver = IWL8000_TX_POWER_VERSION,

	.default_nvm_file_B_step = DEFAULT_NVM_FILE_FAMILY_8000B,

	.default_nvm_file_C_step = DEFAULT_NVM_FILE_FAMILY_8000C,

	.max_rx_agg_size = MAX_RX_AGG_SIZE_8260_SDIO,

	.disable_dummy_notification = true,

	.max_ht_ampdu_exponent  = MAX_HT_AMPDU_EXPONENT_8260_SDIO,
@@ -192,8 +215,6 @@ const struct iwl_cfg iwl4165_2ac_sdio_cfg = { 
	.ht_params = &iwl8000_ht_params,

	.nvm_ver = IWL8000_NVM_VERSION,

	.nvm_calib_ver = IWL8000_TX_POWER_VERSION,

	.default_nvm_file_B_step = DEFAULT_NVM_FILE_FAMILY_8000B,

	.default_nvm_file_C_step = DEFAULT_NVM_FILE_FAMILY_8000C,

	.max_rx_agg_size = MAX_RX_AGG_SIZE_8260_SDIO,

	.bt_shared_single_ant = true,

	.disable_dummy_notification = true,