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

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

Merge tag 'iwlwifi-next-for-kalle-2018-04-20' of... 

Merge tag 'iwlwifi-next-for-kalle-2018-04-20' of git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next

iwlwifi patches for 4.18

* implement Traffic Condition Monitor;
* use TCM for scan and BT coex;
* use TCM to detect when the AP doesn't support UAPSD properly;
* some more work for the 22000 family of devices;
* introduce AMSDU rate control offload;
* a couple of clean-ups and bugfixes.
parents 9c20b937 bd8f3fc6

drivers/net/wireless/intel/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ iwlwifi-$(CONFIG_IWLMVM) += cfg/7000.o cfg/8000.o cfg/9000.o cfg/22000.o 
iwlwifi-objs		+= iwl-trans.o

iwlwifi-objs		+= fw/notif-wait.o

iwlwifi-$(CONFIG_IWLMVM) += fw/paging.o fw/smem.o fw/init.o fw/dbg.o

iwlwifi-$(CONFIG_IWLMVM) += fw/common_rx.o fw/nvm.o

iwlwifi-$(CONFIG_IWLMVM) += fw/common_rx.o

iwlwifi-$(CONFIG_ACPI) += fw/acpi.o

iwlwifi-$(CONFIG_IWLWIFI_DEBUGFS) += fw/debugfs.o

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

+0 −1
Original line number Diff line number Diff line
@@ -137,7 +137,6 @@ static const struct iwl_ht_params iwl_22000_ht_params = { 
	.gen2 = true,							\

	.nvm_type = IWL_NVM_EXT,					\

	.dbgc_supported = true,						\

	.tx_cmd_queue_size = 32,					\

	.min_umac_error_event_table = 0x400000



const struct iwl_cfg iwl22000_2ac_cfg_hr = {

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

+4 −4
Original line number Diff line number Diff line
@@ -1200,16 +1200,16 @@ static int iwl_eeprom_init_hw_params(struct iwl_priv *priv) 
		return -EINVAL;

	}



	if (!data->sku_cap_11n_enable && !data->sku_cap_band_24GHz_enable &&

	    !data->sku_cap_band_52GHz_enable) {

	if (!data->sku_cap_11n_enable && !data->sku_cap_band_24ghz_enable &&

	    !data->sku_cap_band_52ghz_enable) {

		IWL_ERR(priv, "Invalid device sku\n");

		return -EINVAL;

	}



	IWL_DEBUG_INFO(priv,

		       "Device SKU: 24GHz %s %s, 52GHz %s %s, 11.n %s %s\n",

		       data->sku_cap_band_24GHz_enable ? "" : "NOT", "enabled",

		       data->sku_cap_band_52GHz_enable ? "" : "NOT", "enabled",

		       data->sku_cap_band_24ghz_enable ? "" : "NOT", "enabled",

		       data->sku_cap_band_52ghz_enable ? "" : "NOT", "enabled",

		       data->sku_cap_11n_enable ? "" : "NOT", "enabled");



	priv->hw_params.tx_chains_num =

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

+0 −5
Original line number Diff line number Diff line
@@ -87,11 +87,6 @@ enum iwl_data_path_subcmd_ids { 
	 */

	TLC_MNG_CONFIG_CMD = 0xF,



	/**

	 * @TLC_MNG_NOTIF_REQ_CMD: &struct iwl_tlc_notif_req_config_cmd

	 */

	TLC_MNG_NOTIF_REQ_CMD = 0x10,



	/**

	 * @TLC_MNG_UPDATE_NOTIF: &struct iwl_tlc_update_notif

	 */

drivers/net/wireless/intel/iwlwifi/fw/api/nvm-reg.h

+28 −14
Original line number Diff line number Diff line
@@ -189,23 +189,37 @@ struct iwl_nvm_get_info_general { 
	u8 reserved;

} __packed; /* GRP_REGULATORY_NVM_GET_INFO_GENERAL_S_VER_1 */



/**

 * enum iwl_nvm_mac_sku_flags - flags in &iwl_nvm_get_info_sku

 * @NVM_MAC_SKU_FLAGS_BAND_2_4_ENABLED: true if 2.4 band enabled

 * @NVM_MAC_SKU_FLAGS_BAND_5_2_ENABLED: true if 5.2 band enabled

 * @NVM_MAC_SKU_FLAGS_802_11N_ENABLED: true if 11n enabled

 * @NVM_MAC_SKU_FLAGS_802_11AC_ENABLED: true if 11ac enabled

 * @NVM_MAC_SKU_FLAGS_802_11AX_ENABLED: true if 11ax enabled

 * @NVM_MAC_SKU_FLAGS_MIMO_DISABLED: true if MIMO disabled

 * @NVM_MAC_SKU_FLAGS_WAPI_ENABLED: true if WAPI enabled

 * @NVM_MAC_SKU_FLAGS_REG_CHECK_ENABLED: true if regulatory checker enabled

 * @NVM_MAC_SKU_FLAGS_API_LOCK_ENABLED: true if API lock enabled

 */

enum iwl_nvm_mac_sku_flags {

	NVM_MAC_SKU_FLAGS_BAND_2_4_ENABLED	= BIT(0),

	NVM_MAC_SKU_FLAGS_BAND_5_2_ENABLED	= BIT(1),

	NVM_MAC_SKU_FLAGS_802_11N_ENABLED	= BIT(2),

	NVM_MAC_SKU_FLAGS_802_11AC_ENABLED	= BIT(3),

	NVM_MAC_SKU_FLAGS_802_11AX_ENABLED	= BIT(4),

	NVM_MAC_SKU_FLAGS_MIMO_DISABLED		= BIT(5),

	NVM_MAC_SKU_FLAGS_WAPI_ENABLED		= BIT(8),

	NVM_MAC_SKU_FLAGS_REG_CHECK_ENABLED	= BIT(14),

	NVM_MAC_SKU_FLAGS_API_LOCK_ENABLED	= BIT(15),

};



/**

 * struct iwl_nvm_get_info_sku - mac information

 * @enable_24g: band 2.4G enabled

 * @enable_5g: band 5G enabled

 * @enable_11n: 11n enabled

 * @enable_11ac: 11ac enabled

 * @mimo_disable: MIMO enabled

 * @ext_crypto: Extended crypto enabled

 * @mac_sku_flags: flags for SKU, see &enum iwl_nvm_mac_sku_flags

 */

struct iwl_nvm_get_info_sku {

	__le32 enable_24g;

	__le32 enable_5g;

	__le32 enable_11n;

	__le32 enable_11ac;

	__le32 mimo_disable;

	__le32 ext_crypto;

} __packed; /* GRP_REGULATORY_NVM_GET_INFO_MAC_SKU_SECTION_S_VER_1 */

	__le32 mac_sku_flags;

} __packed; /* REGULATORY_NVM_GET_INFO_MAC_SKU_SECTION_S_VER_2 */



/**

 * struct iwl_nvm_get_info_phy - phy information
@@ -243,7 +257,7 @@ struct iwl_nvm_get_info_rsp { 
	struct iwl_nvm_get_info_sku mac_sku;

	struct iwl_nvm_get_info_phy phy_sku;

	struct iwl_nvm_get_info_regulatory regulatory;

} __packed; /* GRP_REGULATORY_NVM_GET_INFO_CMD_RSP_S_VER_1 */

} __packed; /* GRP_REGULATORY_NVM_GET_INFO_CMD_RSP_S_VER_2 */



/**

 * struct iwl_nvm_access_complete_cmd - NVM_ACCESS commands are completed