Commit d4065e90 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2019-01-29' of... 

Merge tag 'iwlwifi-next-for-kalle-2019-01-29' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

Second batch of iwlwifi patches intended for v5.1

* A bunch of fixes for issues found with static analyzers;
* Relicense the pcie submodule to dual GPL/BSD;
* Reworked the TOF/CSI implementation;
* Work on new debugging infra continues;
* Some product name updates in the human-readable strings
* Some more cleanups for the device configuration refactoring;
* General bugfixes;
* Other cleanups and small fixes;
parents 1899405c 01f377dc

drivers/net/wireless/intel/iwlwifi/cfg/22000.c

+6 −0
Original line number Diff line number Diff line
@@ -269,6 +269,12 @@ const struct iwl_cfg iwl9560_2ac_cfg_qu_b0_jf_b0 = { 
	IWL_DEVICE_22500,

};



const struct iwl_cfg iwl9560_2ac_160_cfg_qu_b0_jf_b0 = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,

	IWL_DEVICE_22500,

};



const struct iwl_cfg killer1550i_2ac_cfg_qu_b0_jf_b0 = {

	.name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",

	.fw_name_pre = IWL_QU_B_JF_B_FW_PRE,

drivers/net/wireless/intel/iwlwifi/cfg/9000.c

+29 −0
Original line number Diff line number Diff line
@@ -163,6 +163,12 @@ const struct iwl_cfg iwl9260_2ac_cfg = { 
	IWL_DEVICE_9000,

};



const struct iwl_cfg iwl9260_2ac_160_cfg = {

	.name = "Intel(R) Wireless-AC 9260 160MHz",

	.fw_name_pre = IWL9260_FW_PRE,

	IWL_DEVICE_9000,

};



const struct iwl_cfg iwl9260_killer_2ac_cfg = {

	.name = "Killer (R) Wireless-AC 1550 Wireless Network Adapter (9260NGW)",

	.fw_name_pre = IWL9260_FW_PRE,
@@ -211,6 +217,12 @@ const struct iwl_cfg iwl9560_2ac_cfg = { 
	IWL_DEVICE_9000,

};



const struct iwl_cfg iwl9560_2ac_160_cfg = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL9260_FW_PRE,

	IWL_DEVICE_9000,

};



const struct iwl_cfg iwl9560_2ac_cfg_soc = {

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

	.fw_name_pre = IWL9000_FW_PRE,
@@ -219,6 +231,14 @@ const struct iwl_cfg iwl9560_2ac_cfg_soc = { 
	.soc_latency = 5000,

};



const struct iwl_cfg iwl9560_2ac_160_cfg_soc = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

};



const struct iwl_cfg iwl9560_killer_2ac_cfg_soc = {

	.name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",

	.fw_name_pre = IWL9000_FW_PRE,
@@ -271,6 +291,15 @@ const struct iwl_cfg iwl9560_2ac_cfg_shared_clk = { 
	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK

};



const struct iwl_cfg iwl9560_2ac_160_cfg_shared_clk = {

	.name = "Intel(R) Wireless-AC 9560 160MHz",

	.fw_name_pre = IWL9000_FW_PRE,

	IWL_DEVICE_9000,

	.integrated = true,

	.soc_latency = 5000,

	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK

};



const struct iwl_cfg iwl9560_killer_2ac_cfg_shared_clk = {

	.name = "Killer (R) Wireless-AC 1550i Wireless Network Adapter (9560NGW)",

	.fw_name_pre = IWL9000_FW_PRE,

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

+3 −20
Original line number Diff line number Diff line 
/******************************************************************************

 *

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

 * Copyright (C) 2018 Intel Corporation

 *

 * Portions of this file are derived from the ipw3945 project, as well

 * as portions of the ieee80211 subsystem header files.
@@ -710,24 +711,6 @@ static int iwlagn_mac_set_key(struct ieee80211_hw *hw, enum set_key_cmd cmd, 
	return ret;

}



static inline bool iwl_enable_rx_ampdu(const struct iwl_cfg *cfg)

{

	if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_RXAGG)

		return false;

	return true;

}



static inline bool iwl_enable_tx_ampdu(const struct iwl_cfg *cfg)

{

	if (iwlwifi_mod_params.disable_11n & IWL_DISABLE_HT_TXAGG)

		return false;

	if (iwlwifi_mod_params.disable_11n & IWL_ENABLE_HT_TXAGG)

		return true;



	/* disabled by default */

	return false;

}



static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw,

				   struct ieee80211_vif *vif,

				   struct ieee80211_ampdu_params *params)
@@ -752,7 +735,7 @@ static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw, 


	switch (action) {

	case IEEE80211_AMPDU_RX_START:

		if (!iwl_enable_rx_ampdu(priv->cfg))

		if (!iwl_enable_rx_ampdu())

			break;

		IWL_DEBUG_HT(priv, "start Rx\n");

		ret = iwl_sta_rx_agg_start(priv, sta, tid, *ssn);
@@ -764,7 +747,7 @@ static int iwlagn_mac_ampdu_action(struct ieee80211_hw *hw, 
	case IEEE80211_AMPDU_TX_START:

		if (!priv->trans->ops->txq_enable)

			break;

		if (!iwl_enable_tx_ampdu(priv->cfg))

		if (!iwl_enable_tx_ampdu())

			break;

		IWL_DEBUG_HT(priv, "start Tx\n");

		ret = iwlagn_tx_agg_start(priv, vif, sta, tid, ssn);

drivers/net/wireless/intel/iwlwifi/dvm/tt.c

+3 −2
Original line number Diff line number Diff line 
/******************************************************************************

 *

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

 * Copyright (C) 2018 Intel Corporation

 *

 * Portions of this file are derived from the ipw3945 project, as well

 * as portions of the ieee80211 subsystem header files.
@@ -325,9 +326,9 @@ static void iwl_legacy_tt_handler(struct iwl_priv *priv, s32 temp, bool force) 
					iwl_prepare_ct_kill_task(priv);

					tt->state = old_state;

				}

			} else if (old_state == IWL_TI_CT_KILL &&

				 tt->state != IWL_TI_CT_KILL)

			} else if (old_state == IWL_TI_CT_KILL) {

				iwl_perform_ct_kill_task(priv, false);

			}

			IWL_DEBUG_TEMP(priv, "Temperature state changed %u\n",

					tt->state);

			IWL_DEBUG_TEMP(priv, "Power Index change to %u\n",

drivers/net/wireless/intel/iwlwifi/fw/api/commands.h

+3 −12
Original line number Diff line number Diff line
@@ -77,7 +77,8 @@ 
 * @DATA_PATH_GROUP: data path group, uses command IDs from

 *	&enum iwl_data_path_subcmd_ids

 * @NAN_GROUP: NAN group, uses command IDs from &enum iwl_nan_subcmd_ids

 * @TOF_GROUP: TOF group, uses command IDs from &enum iwl_tof_subcmd_ids

 * @LOCATION_GROUP: location group, uses command IDs from

 *	&enum iwl_location_subcmd_ids

 * @PROT_OFFLOAD_GROUP: protocol offload group, uses command IDs from

 *	&enum iwl_prot_offload_subcmd_ids

 * @REGULATORY_AND_NVM_GROUP: regulatory/NVM group, uses command IDs from
@@ -92,7 +93,7 @@ enum iwl_mvm_command_groups { 
	PHY_OPS_GROUP = 0x4,

	DATA_PATH_GROUP = 0x5,

	NAN_GROUP = 0x7,

	TOF_GROUP = 0x8,

	LOCATION_GROUP = 0x8,

	PROT_OFFLOAD_GROUP = 0xb,

	REGULATORY_AND_NVM_GROUP = 0xc,

	DEBUG_GROUP = 0xf,
@@ -352,16 +353,6 @@ enum iwl_legacy_cmds { 
	 */

	PHY_DB_CMD = 0x6c,



	/**

	 * @TOF_CMD: &struct iwl_tof_config_cmd

	 */

	TOF_CMD = 0x10,



	/**

	 * @TOF_NOTIFICATION: &struct iwl_tof_gen_resp_cmd

	 */

	TOF_NOTIFICATION = 0x11,



	/**

	 * @POWER_TABLE_CMD: &struct iwl_device_power_cmd

	 */