Merge ~canonical-hwe-team/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:for-hwe/merge-debian-7858 into ~canonical-hwe-team/ubuntu/+source/backport-iwlwifi-dkms/+git/backport-iwlwifi-dkms:ubuntu/master

[You-Sheng Yang]

Sync with Debian version 7858.

[You-Sheng Yang (vicamo)]

Test build https://code.launchpad.net/~vicamo/+recipe/test-mp-369139-backport-iwlwifi-dkms passed in all series.

review: Approve

diff --git a/debian/changelog b/debian/changelog
index bfbb1fa..f6dc7d4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+backport-iwlwifi-dkms (7858-ubuntu1) UNRELEASED; urgency=low
+
+  * sync with debian 7858.
+
+ -- You-Sheng Yang <[e-mail]>  Fri, 21 Jun 2019 15:27:31 +0800
+
 backport-iwlwifi-dkms (7841-ubuntu2) UNRELEASED; urgency=low
 
   * add modalias support.
diff --git a/defconfigs/iwlwifi-galileo b/defconfigs/iwlwifi-galileo
index 812014f..14e0b45 100644
--- a/defconfigs/iwlwifi-galileo
+++ b/defconfigs/iwlwifi-galileo
@@ -21,8 +21,6 @@ CPTCFG_IWLWIFI_DEVICE_TESTMODE=y
 # CPTCFG_MAC80211_HWSIM is not set
 CPTCFG_IWLXVT=m
 CPTCFG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES=y
-# CPTCFG_IWLWIFI_FRQ_MGR_TEST is not set
 # CPTCFG_IWLWIFI_FORCE_OFDM_RATE is not set
-# CPTCFG_IWLWIFI_LTE_COEX is not set
 # CPTCFG_IWLMVM_P2P_UAPSD_STANDALONE is not set
 CPTCFG_IWLWIFI_NUM_CHANNELS=1
diff --git a/defconfigs/iwlwifi-public b/defconfigs/iwlwifi-public
index ef43e35..c457087 100644
--- a/defconfigs/iwlwifi-public
+++ b/defconfigs/iwlwifi-public
@@ -19,6 +19,4 @@ CPTCFG_IWLWIFI_DEVICE_TRACING=y
 CPTCFG_IWLWIFI_DEVICE_TESTMODE=y
 # CPTCFG_MAC80211_HWSIM is not set
 CPTCFG_IWLXVT=m
-CPTCFG_IWLWIFI_FRQ_MGR_TEST=y
 CPTCFG_IWLWIFI_OPMODE_MODULAR=y
-CPTCFG_IWLWIFI_LTE_COEX=y
diff --git a/defconfigs/iwlwifi-public-android b/defconfigs/iwlwifi-public-android
index f430328..16114af 100644
--- a/defconfigs/iwlwifi-public-android
+++ b/defconfigs/iwlwifi-public-android
@@ -19,9 +19,6 @@ CPTCFG_IWLWIFI_DEVICE_TRACING=y
 CPTCFG_IWLWIFI_DEVICE_TESTMODE=y
 # CPTCFG_MAC80211_HWSIM is not set
 # CPTCFG_IWLXVT is not set
-# CPTCFG_IWLWIFI_FRQ_MGR_TEST is not set
-# CPTCFG_IWLWIFI_FRQ_MGR is not set
 CPTCFG_IWLWIFI_OPMODE_MODULAR=y
-CPTCFG_IWLWIFI_LTE_COEX=y
 CPTCFG_IWLWIFI_BCAST_FILTERING=y
 # CPTCFG_IWLMVM_AX_SUPPORT is not set
diff --git a/defconfigs/prune-public b/defconfigs/prune-public
index 4076f6d..52e509d 100644
--- a/defconfigs/prune-public
+++ b/defconfigs/prune-public
@@ -17,6 +17,4 @@ CPTCFG_IWLWIFI_DEBUGFS=y
 CPTCFG_IWLWIFI_DEVICE_TRACING=y
 CPTCFG_IWLWIFI_DEVICE_TESTMODE=y
 CPTCFG_IWLXVT=m
-CPTCFG_IWLWIFI_FRQ_MGR_TEST=y
 CPTCFG_IWLWIFI_OPMODE_MODULAR=y
-CPTCFG_IWLWIFI_LTE_COEX=y
diff --git a/defconfigs/soc_ip_hfpga b/defconfigs/soc_ip_hfpga
index 57aba4d..4485fbf 100644
--- a/defconfigs/soc_ip_hfpga
+++ b/defconfigs/soc_ip_hfpga
@@ -19,6 +19,4 @@ CPTCFG_IWLWIFI_DEVICE_TRACING=y
 CPTCFG_IWLWIFI_DEVICE_TESTMODE=y
 CPTCFG_IWLXVT=m
 CPTCFG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES=y
-# CPTCFG_IWLWIFI_FRQ_MGR_TEST is not set
 # CPTCFG_IWLWIFI_FORCE_OFDM_RATE is not set
-# CPTCFG_IWLWIFI_LTE_COEX is not set
diff --git a/drivers/net/wireless/intel/iwlwifi/Kconfig.noupstream b/drivers/net/wireless/intel/iwlwifi/Kconfig.noupstream
index fb00937..434c115 100644
--- a/drivers/net/wireless/intel/iwlwifi/Kconfig.noupstream
+++ b/drivers/net/wireless/intel/iwlwifi/Kconfig.noupstream
@@ -38,26 +38,6 @@ config IWLWIFI_DEVICE_TESTMODE
 	default y if IWLMVM
 	select IWLWIFI_SUPPORT_DEBUG_OVERRIDES
 
-config IWLWIFI_FRQ_MGR_TEST
-	bool "Enable Frequency Manager API - Test Mode"
-	depends on IWLMVM && IWLWIFI_SUPPORT_DEBUG_OVERRIDES
-	help
-	  This option enables running The Frequency Manager API
-	  in Debug Mode without having A Frequency Manager.
-	  In this mode you can run the Frequency Manager on any Platform,
-	  monitor the notifications that the driver send the Frequency Manager,
-	  and initiate notifications from the Frequency Manager.
-
-config IWLWIFI_FRQ_MGR
-	bool "enable Frequency Manager API" if !IWLWIFI_FRQ_MGR_TEST
-	default y if IWLWIFI_FRQ_MGR_TEST
-	depends on IWLMVM && (IUI_FM || IWLWIFI_FRQ_MGR_TEST)
-	help
-	  This option enables The Frequency Manager API.
-	  Enabling this option allows the driver to receive and send
-	  Frequency notification from and to the Frequency Manager.
-	  The notification can involve Tx power, Rx gain, and ADC/DAC
-
 config IWLWIFI_SUPPORT_DEBUG_OVERRIDES
 	depends on IWLWIFI
 	bool "enable default value override (for debugging)"
@@ -94,12 +74,6 @@ config IWLMVM_VENDOR_CMDS
 	  This option mostly exists for non-upstream tagging, so best
 	  leave it set to Y.
 
-config IWLWIFI_LTE_COEX
-        bool "enable lte coexistence support"
-        depends on IWLMVM_VENDOR_CMDS
-	help
-	  This option enables LTE-Coexistence (vendor) commands
-
 config IWLMVM_TDLS_PEER_CACHE
 	bool "enable TDLS peer caching and traffic monitoring"
 	depends on IWLMVM_VENDOR_CMDS
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/coex.h b/drivers/net/wireless/intel/iwlwifi/fw/api/coex.h
index 33abd47..faf38ee 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/coex.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/coex.h
@@ -8,7 +8,7 @@
  * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
  * Copyright(c) 2017        Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -31,7 +31,7 @@
  * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
  * Copyright(c) 2017        Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -242,124 +242,4 @@ struct iwl_bt_coex_profile_notif {
 	__le16 reserved;
 } __packed; /* BT_COEX_PROFILE_NTFY_API_S_VER_4 */
 
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR
-/*
- * struct iwl_config_2g_coex_cmd - 2G Coex configuration command
- * (CONFIG_2G_COEX_CMD = 0x71)
- * @enabled: 2g coex is enabled/disabled
- */
-struct iwl_config_2g_coex_cmd {
-	__le32 enabled;
-} __packed; /* CONFIG_2G_COEX_CMD_API_S_VER_1 */
-#endif
-
-#ifdef CPTCFG_IWLWIFI_LTE_COEX
-
-#define WIFI_BAND_24_NUM_CHANNELS       14
-#define LTE_COEX_MFUART_CONFIG_LENGTH   12
-#define LTE_COEX_FRAME_STRUCTURE_LENGTH 2
-
-/**
- * struct iwl_lte_coex_config_cmd - LTE Coex configuration command
- * @lte_state: lte modem state
- * @lte_band: lte operating band
- * @lte_chan: lte operating channel
- * @lte_frame_structure: ?
- * @tx_safe_freq_min: ?
- * @tx_safe_freq_max: ?
- * @rx_safe_freq_min: ?
- * @rx_safe_freq_max: ?
- * @max_tx_power: wifi static max tx output power per channel
- *
- * Used for LTE_COEX_CONFIG_CMD command
- */
-struct iwl_lte_coex_config_cmd {
-	__le32 lte_state;
-	__le32 lte_band;
-	__le32 lte_chan;
-	__le32 lte_frame_structure[LTE_COEX_FRAME_STRUCTURE_LENGTH];
-	__le32 tx_safe_freq_min;
-	__le32 tx_safe_freq_max;
-	__le32 rx_safe_freq_min;
-	__le32 rx_safe_freq_max;
-	u8 max_tx_power[WIFI_BAND_24_NUM_CHANNELS];
-} __packed; /* LTE_COEX_CONFIG_CMD_API_S_VER_1 */
-
-/**
- * struct iwl_lte_coex_static_params_cmd - LTE Coex static params configuration
- * command
- * @mfu_config: MFUART config and RT signals assert/de-assert timing
- * @tx_power_in_dbm: Wifi safe power table
- *
- * Used for LTE_COEX_STATIC_PARAMS_CMD command
- */
-struct iwl_lte_coex_static_params_cmd {
-	__le32 mfu_config[LTE_COEX_MFUART_CONFIG_LENGTH];
-	s8 tx_power_in_dbm[32];
-} __packed; /* LTE_COEX_STATIC_PARAMS_CMD_API_S_VER_1 */
-
-/**
- * struct iwl_lte_coex_wifi_reported_channel_cmd - LTE Coex reported channels
- * configuration command
- * @channel: channel number (1-14)
- * @bandwidth: bandwidth (0-3)
- *
- * Used for LTE_COEX_WIFI_REPORTED_CHANNEL_CMD command
- */
-struct iwl_lte_coex_wifi_reported_channel_cmd {
-	__le32 channel;
-	__le32 bandwidth;
-} __packed; /* LTE_COEX_WIFI_REPORTED_CHANNEL_CMD_API_S_VER_1 */
-
-/**
- * struct iwl_lte_coex_sps_cmd - LTE Coex semi persistent info command
- *
- * @lte_semi_persistent_info:
- *
- * Used for LTE_COEX_SPS_CMD command
- */
-struct iwl_lte_coex_sps_cmd {
-	__le32 lte_semi_persistent_info;
-} __packed; /* LTE_COEX_WIFI_SPS_CMD_API_S_VER_1 */
-
-/**
- * struct iwl_lte_coex_fine_tuning_params_cmd - LTE Coex fine tuning parameters
- * @rx_protection_assert_timing: 802_RX_PRI request advance time
- * @tx_protection_assert_timing: 802_TX_ON request advance time
- * @rx_protection_timeout: Cancel Rx Protection request due to no Rx threshold
- * @min_tx_power: Min-Tx-Power threshold for Data/Management frames
- * @lte_ul_load_uapsd_threshold: 'LTE UL Load' counter thresholds
- *  for recommending Power-Manager to enter to UAPSD
- * @rx_failure_during_ul_uapsd_threshold: 'Rx Failure due to UL' counter
- *  thresholds for recommending Power-Manager to enter to UAPSD
- * @rx_failure_during_ul_sc_threshold: 'Rx Failure due to UL'
- *  counter threshold for recommending Scan-Manager to apply compensation
- * @rx_duration_for_ack_protection_us: Tx Ack size for Tx Protection
- * @beacon_failure_during_ul_counter: Failed Rx Beacon threshold
- * @dtim_failure_during_ul_counter: Failed Rx DTIM threshold
- *
- * Used for LTE_COEX_FINE_TUNING_PARAMS_CMD command
- */
-struct iwl_lte_coex_fine_tuning_params_cmd {
-	__le32 rx_protection_assert_timing;
-	__le32 tx_protection_assert_timing;
-	__le32 rx_protection_timeout;
-	__le32 min_tx_power;
-	__le32 lte_ul_load_uapsd_threshold;
-	__le32 rx_failure_during_ul_uapsd_threshold;
-	__le32 rx_failure_during_ul_sc_threshold;
-	__le32 rx_duration_for_ack_protection_us;
-	__le32 beacon_failure_during_ul_counter;
-	__le32 dtim_failure_during_ul_counter;
-} __packed; /* LTE_COEX_FINE_TUNING_PARAMS_CMD_API_S_VER_1 */
-
-/**
- * struct iwl_lte_coex_statistic_ntfy - LTE Coex statistics notification
- * @statistic_placeholder: placeholder
- */
-struct iwl_lte_coex_statistic_ntfy {
-	__le32 statistic_placeholder;
-} __packed; /* LTE_COEX_STATISTIC_NTFY_API_S_VER_1 */
-#endif /* CPTCFG_IWLWIFI_LTE_COEX */
-
 #endif /* __iwl_fw_api_coex_h__ */
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
index e7eecb1..d665938 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/commands.h
@@ -8,7 +8,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -31,7 +31,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -540,35 +540,6 @@ enum iwl_legacy_cmds {
 	 */
 	BT_COEX_CI = 0x5d,
 
-#ifdef CPTCFG_IWLWIFI_LTE_COEX
-	/**
-	 * @LTE_COEX_CONFIG_CMD: &struct iwl_lte_coex_config_cmd
-	 */
-	LTE_COEX_CONFIG_CMD = 0x4a,
-
-	/**
-	 * @LTE_COEX_WIFI_REPORTED_CHANNEL_CMD:
-	 * &struct iwl_lte_coex_wifi_reported_channel_cmd
-	 */
-	LTE_COEX_WIFI_REPORTED_CHANNEL_CMD = 0X4b,
-
-	/**
-	 * @LTE_COEX_STATIC_PARAMS_CMD: &struct iwl_lte_coex_static_params_cmd
-	 */
-	LTE_COEX_STATIC_PARAMS_CMD = 0x4c,
-
-	/**
-	 * @LTE_COEX_SPS_CMD: struct iwl_lte_coex_sps_cmd
-	 */
-	LTE_COEX_SPS_CMD = 0x4d,
-
-	/**
-	 * @LTE_COEX_FINE_TUNING_PARAMS_CMD:
-	 * &struct iwl_lte_coex_fine_tuning_params_cmd
-	 */
-	LTE_COEX_FINE_TUNING_PARAMS_CMD = 0x57,
-#endif
-
 	/**
 	 * @REPLY_SF_CFG_CMD: &struct iwl_sf_cfg_cmd
 	 */
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h b/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h
index 9eddc4d..4347be6 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/rs.h
@@ -7,7 +7,7 @@
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -29,7 +29,7 @@
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2017 Intel Deutschland GmbH
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -166,8 +166,16 @@ enum iwl_tlc_mng_ht_rates {
 	IWL_TLC_MNG_HT_RATE_MAX = IWL_TLC_MNG_HT_RATE_MCS11,
 };
 
-/* Maximum supported tx antennas number */
-#define MAX_NSS 2
+enum IWL_TLC_MNG_NSS {
+	IWL_TLC_NSS_1,
+	IWL_TLC_NSS_2,
+	IWL_TLC_NSS_MAX
+};
+
+enum IWL_TLC_HT_BW_RATES {
+	IWL_TLC_HT_BW_NONE_160,
+	IWL_TLC_HT_BW_160,
+};
 
 /**
  * struct tlc_config_cmd - TLC configuration
@@ -195,7 +203,7 @@ struct iwl_tlc_config_cmd {
 	u8 amsdu;
 	__le16 flags;
 	__le16 non_ht_rates;
-	__le16 ht_rates[MAX_NSS][2];
+	__le16 ht_rates[IWL_TLC_NSS_MAX][2];
 	__le16 max_mpdu_len;
 	u8 sgi_ch_width_supp;
 	u8 reserved2[1];
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h b/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
index 1940a8c..8678b78 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/api/scan.h
@@ -93,6 +93,8 @@ struct iwl_ssid_ie {
 #define IWL_SCAN_SHORT_BLACKLIST_LEN	16
 #define IWL_SCAN_MAX_PROFILES		11
 #define SCAN_OFFLOAD_PROBE_REQ_SIZE	512
+#define SCAN_NUM_BAND_PROBE_DATA_V_1	2
+#define SCAN_NUM_BAND_PROBE_DATA_V_2	3
 
 /* Default watchdog (in MS) for scheduled scan iteration */
 #define IWL_SCHED_SCAN_WATCHDOG cpu_to_le16(15000)
@@ -252,9 +254,22 @@ struct iwl_scan_probe_segment {
  * @common_data: last (and common) part of the probe
  * @buf: raw data block
  */
+struct iwl_scan_probe_req_v1 {
+	struct iwl_scan_probe_segment mac_header;
+	struct iwl_scan_probe_segment band_data[SCAN_NUM_BAND_PROBE_DATA_V_1];
+	struct iwl_scan_probe_segment common_data;
+	u8 buf[SCAN_OFFLOAD_PROBE_REQ_SIZE];
+} __packed;
+
+/* iwl_scan_probe_req - PROBE_REQUEST_FRAME_API_S_VER_v2
+ * @mac_header: first (and common) part of the probe
+ * @band_data: band specific data
+ * @common_data: last (and common) part of the probe
+ * @buf: raw data block
+ */
 struct iwl_scan_probe_req {
 	struct iwl_scan_probe_segment mac_header;
-	struct iwl_scan_probe_segment band_data[2];
+	struct iwl_scan_probe_segment band_data[SCAN_NUM_BAND_PROBE_DATA_V_2];
 	struct iwl_scan_probe_segment common_data;
 	u8 buf[SCAN_OFFLOAD_PROBE_REQ_SIZE];
 } __packed;
@@ -627,15 +642,29 @@ enum iwl_umac_scan_general_flags2 {
  * struct iwl_scan_channel_cfg_umac
  * @flags:		bitmap - 0-19:	directed scan to i'th ssid.
  * @channel_num:	channel number 1-13 etc.
+ * @band:		band of channel: 0 for 2GHz, 1 for 5GHz
  * @iter_count:		repetition count for the channel.
  * @iter_interval:	interval between two scan iterations on one channel.
  */
-struct iwl_scan_channel_cfg_umac {
+struct  iwl_scan_channel_cfg_umac {
 	__le32 flags;
-	u8 channel_num;
-	u8 iter_count;
-	__le16 iter_interval;
-} __packed; /* SCAN_CHANNEL_CFG_S_VER2 */
+	/* Both versions are of the same size, so use a union without adjusting
+	 * the command size later
+	 */
+	union {
+		struct {
+			u8 channel_num;
+			u8 iter_count;
+			__le16 iter_interval;
+		} v1;  /* SCAN_CHANNEL_CFG_S_VER1 */
+		struct {
+			u8 channel_num;
+			u8 band;
+			u8 iter_count;
+			u8 iter_interval;
+		 } v2; /* SCAN_CHANNEL_CFG_S_VER2 */
+	};
+} __packed;
 
 /**
  * struct iwl_scan_umac_schedule
@@ -649,6 +678,16 @@ struct iwl_scan_umac_schedule {
 	u8 reserved;
 } __packed; /* SCAN_SCHED_PARAM_API_S_VER_1 */
 
+struct iwl_scan_req_umac_tail_v1 {
+	/* SCAN_PERIODIC_PARAMS_API_S_VER_1 */
+	struct iwl_scan_umac_schedule schedule[IWL_MAX_SCHED_SCAN_PLANS];
+	__le16 delay;
+	__le16 reserved;
+	/* SCAN_PROBE_PARAMS_API_S_VER_1 */
+	struct iwl_scan_probe_req_v1 preq;
+	struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];
+} __packed;
+
 /**
  * struct iwl_scan_req_umac_tail - the rest of the UMAC scan request command
  *      parameters following channels configuration array.
@@ -658,12 +697,12 @@ struct iwl_scan_umac_schedule {
  * @preq: probe request with IEs blocks
  * @direct_scan: list of SSIDs for directed active scan
  */
-struct iwl_scan_req_umac_tail {
+struct iwl_scan_req_umac_tail_v2 {
 	/* SCAN_PERIODIC_PARAMS_API_S_VER_1 */
 	struct iwl_scan_umac_schedule schedule[IWL_MAX_SCHED_SCAN_PLANS];
 	__le16 delay;
 	__le16 reserved;
-	/* SCAN_PROBE_PARAMS_API_S_VER_1 */
+	/* SCAN_PROBE_PARAMS_API_S_VER_2 */
 	struct iwl_scan_probe_req preq;
 	struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];
 } __packed;
diff --git a/drivers/net/wireless/intel/iwlwifi/fw/file.h b/drivers/net/wireless/intel/iwlwifi/fw/file.h
index b3f8e7f..a2b9299 100644
--- a/drivers/net/wireless/intel/iwlwifi/fw/file.h
+++ b/drivers/net/wireless/intel/iwlwifi/fw/file.h
@@ -248,9 +248,6 @@ enum iwl_ucode_tlv_flag {
 	IWL_UCODE_TLV_FLAGS_EBS_SUPPORT		= BIT(25),
 	IWL_UCODE_TLV_FLAGS_P2P_PS_UAPSD	= BIT(26),
 	IWL_UCODE_TLV_FLAGS_BCAST_FILTERING	= BIT(29),
-#ifdef CPTCFG_IWLWIFI_LTE_COEX
-	IWL_UCODE_TLV_FLAGS_LTE_COEX		= BIT(31),
-#endif
 };
 
 typedef unsigned int __bitwise iwl_ucode_tlv_api_t;
@@ -335,6 +332,7 @@ enum iwl_ucode_tlv_api {
 	IWL_UCODE_TLV_API_SAR_TABLE_VER         = (__force iwl_ucode_tlv_api_t)55,
 	IWL_UCODE_TLV_API_REDUCED_SCAN_CONFIG   = (__force iwl_ucode_tlv_api_t)56,
 	IWL_UCODE_TLV_API_ADWELL_HB_DEF_N_AP	= (__force iwl_ucode_tlv_api_t)57,
+	IWL_UCODE_TLV_API_SCAN_EXT_CHAN_VER	= (__force iwl_ucode_tlv_api_t)58,
 
 	NUM_IWL_UCODE_TLV_API
 #ifdef __CHECKER__
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.h b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.h
index 75ceca4..f470ca4 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-dbg-cfg.h
@@ -204,9 +204,6 @@ struct iwl_dbg_cfg {
 	IWL_MVM_MOD_PARAM(bool, init_dbg)
 	IWL_MVM_MOD_PARAM(bool, tfd_q_hang_detect)
 #endif /* CPTCFG_IWLMVM */
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR_TEST
-	IWL_DBG_CFG_NODEF(u8, fm_debug_mode)
-#endif
 #ifdef CPTCFG_IWLWIFI_DEVICE_TESTMODE
 	IWL_DBG_CFG_NODEF(u32, dnt_out_mode)
 	/* XXX: should be dbgm_ or dbg_mon_ for consistency? */
@@ -262,18 +259,17 @@ struct iwl_dbg_cfg {
 	IWL_DBG_CFG_STR(fw_dbg_conf)
 	IWL_DBG_CFG_STR(nvm_file)
 	IWL_DBG_CFG_STR(fw_file_pre)
-	IWL_DBG_CFG_NODEF(u32, d0i3_debug)
 	IWL_DBG_CFG_NODEF(u32, valid_ants)
 	IWL_DBG_CFG_NODEF(u32, no_ack_en)
 	IWL_DBG_CFG_NODEF(bool, no_ldpc)
 	IWL_DBG_CFG_NODEF(u16, rx_agg_subframes)
+	IWL_DBG_CFG_NODEF(bool, tx_siso_80bw_like_160bw)
 	IWL_DBG_CFG_NODEF(u16, rx_mcs_80)
 	IWL_DBG_CFG_NODEF(u16, tx_mcs_80)
 	IWL_DBG_CFG_NODEF(u16, rx_mcs_160)
 	IWL_DBG_CFG_NODEF(u16, tx_mcs_160)
 	IWL_DBG_CFG_NODEF(u32, secure_boot_cfg)
 	IWL_MOD_PARAM(u32, uapsd_disable)
-	IWL_MOD_PARAM(bool, d0i3_disable)
 	IWL_MOD_PARAM(bool, lar_disable)
 	IWL_MOD_PARAM(bool, fw_monitor)
 	IWL_MOD_PARAM(bool, fw_restart)
@@ -285,7 +281,6 @@ struct iwl_dbg_cfg {
 	IWL_MOD_PARAM(int, amsdu_size)
 	IWL_MOD_PARAM(int, swcrypto)
 	IWL_MOD_PARAM(uint, disable_11n)
-	IWL_MOD_PARAM(uint, d0i3_timeout)
 	IWL_DBG_CFG_BIN(he_ppe_thres)
 	IWL_DBG_CFG_NODEF(u8, he_chan_width_dis)
 	IWL_DBG_CFG_NODEF(u32, vht_cap_flip)
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
index 2308b4f..c4bfbb8 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-drv.c
@@ -2048,8 +2048,6 @@ struct iwl_mod_params iwlwifi_mod_params = {
 	.fw_restart = true,
 	.bt_coex_active = true,
 	.power_level = IWL_POWER_INDEX_1,
-	.d0i3_disable = true,
-	.d0i3_timeout = 1000,
 	.uapsd_disable = IWL_DISABLE_UAPSD_BSS | IWL_DISABLE_UAPSD_P2P_CLIENT,
 	/* the rest are 0 by default */
 };
@@ -2202,9 +2200,6 @@ MODULE_PARM_DESC(antenna_coupling,
 module_param_named(nvm_file, iwlwifi_mod_params.nvm_file, charp, 0444);
 MODULE_PARM_DESC(nvm_file, "NVM file name");
 
-module_param_named(d0i3_disable, iwlwifi_mod_params.d0i3_disable, bool, 0444);
-MODULE_PARM_DESC(d0i3_disable, "disable d0i3 functionality (default: N)");
-
 module_param_named(lar_disable, iwlwifi_mod_params.lar_disable, bool, 0444);
 MODULE_PARM_DESC(lar_disable, "disable LAR functionality (default: N)");
 
@@ -2252,9 +2247,6 @@ module_param_named(fw_monitor, iwlwifi_mod_params.fw_monitor, bool, 0444);
 MODULE_PARM_DESC(fw_monitor,
 		 "firmware monitor - to debug FW (default: false - needs lots of memory)");
 
-module_param_named(d0i3_timeout, iwlwifi_mod_params.d0i3_timeout, uint, 0444);
-MODULE_PARM_DESC(d0i3_timeout, "Timeout to D0i3 entry when idle (ms)");
-
 module_param_named(disable_11ac, iwlwifi_mod_params.disable_11ac, bool, 0444);
 MODULE_PARM_DESC(disable_11ac, "Disable VHT capabilities (default: false)");
 
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
index d8d1202..27d2cb3 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-modparams.h
@@ -6,7 +6,7 @@
  * GPL LICENSE SUMMARY
  *
  * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -27,7 +27,7 @@
  * BSD LICENSE
  *
  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2018 Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -116,9 +116,6 @@ enum iwl_uapsd_disable {
  * @uapsd_disable: disable U-APSD, see &enum iwl_uapsd_disable, default =
  *	IWL_DISABLE_UAPSD_BSS | IWL_DISABLE_UAPSD_P2P_CLIENT
  * @xvt_default_mode: xVT is the default operation mode, default = false
- * @d0i3_disable: disable d0i3, default = 1,
- * @d0i3_timeout: time to wait after no refs are taken before
- *	entering D0i3 (in msecs)
  * @lar_disable: disable LAR (regulatory), default = 0
  * @fw_monitor: allow to use firmware monitor
  * @disable_11ac: disable VHT capabilities, default = false.
@@ -144,8 +141,6 @@ struct iwl_mod_params {
 #endif
 	char *nvm_file;
 	u32 uapsd_disable;
-	bool d0i3_disable;
-	unsigned int d0i3_timeout;
 	bool lar_disable;
 	bool fw_monitor;
 	bool disable_11ac;
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h b/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h
index 2f4ecde..fcb0b69 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h
@@ -166,9 +166,6 @@ struct iwl_test_ops {
  * @nic_config: configure NIC, called before firmware is started.
  *	May sleep
  * @wimax_active: invoked when WiMax becomes active. May sleep
- * @enter_d0i3: configure the fw to enter d0i3. return 1 to indicate d0i3
- *	entrance is aborted (e.g. due to held reference). May sleep.
- * @exit_d0i3: configure the fw to exit d0i3. May sleep.
  */
 struct iwl_op_mode_ops {
 	struct iwl_op_mode *(*start)(struct iwl_trans *trans,
@@ -193,8 +190,6 @@ struct iwl_op_mode_ops {
 #ifdef CPTCFG_IWLWIFI_DEVICE_TESTMODE
 	struct iwl_test_ops test_ops;
 #endif
-	int (*enter_d0i3)(struct iwl_op_mode *op_mode);
-	int (*exit_d0i3)(struct iwl_op_mode *op_mode);
 };
 
 int iwl_opmode_register(const char *name, const struct iwl_op_mode_ops *ops);
@@ -287,22 +282,4 @@ static inline void iwl_op_mode_wimax_active(struct iwl_op_mode *op_mode)
 	op_mode->ops->wimax_active(op_mode);
 }
 
-static inline int iwl_op_mode_enter_d0i3(struct iwl_op_mode *op_mode)
-{
-	might_sleep();
-
-	if (!op_mode->ops->enter_d0i3)
-		return 0;
-	return op_mode->ops->enter_d0i3(op_mode);
-}
-
-static inline int iwl_op_mode_exit_d0i3(struct iwl_op_mode *op_mode)
-{
-	might_sleep();
-
-	if (!op_mode->ops->exit_d0i3)
-		return 0;
-	return op_mode->ops->exit_d0i3(op_mode);
-}
-
 #endif /* __iwl_op_mode_h__ */
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.c b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c
index 2c93164..7223469 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.c
@@ -205,17 +205,3 @@ int iwl_cmd_groups_verify_sorted(const struct iwl_trans_config *trans)
 	return 0;
 }
 IWL_EXPORT_SYMBOL(iwl_cmd_groups_verify_sorted);
-
-void iwl_trans_ref(struct iwl_trans *trans)
-{
-	if (trans->ops->ref)
-		trans->ops->ref(trans);
-}
-IWL_EXPORT_SYMBOL(iwl_trans_ref);
-
-void iwl_trans_unref(struct iwl_trans *trans)
-{
-	if (trans->ops->unref)
-		trans->ops->unref(trans);
-}
-IWL_EXPORT_SYMBOL(iwl_trans_unref);
diff --git a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
index 43cfa59..6d156ee 100644
--- a/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
+++ b/drivers/net/wireless/intel/iwlwifi/iwl-trans.h
@@ -165,10 +165,6 @@ static inline u32 iwl_rx_packet_payload_len(const struct iwl_rx_packet *pkt)
  * @CMD_ASYNC: Return right away and don't wait for the response
  * @CMD_WANT_SKB: Not valid with CMD_ASYNC. The caller needs the buffer of
  *	the response. The caller needs to call iwl_free_resp when done.
- * @CMD_SEND_IN_IDLE: The command should be sent even when the trans is idle.
- * @CMD_MAKE_TRANS_IDLE: The command response should mark the trans as idle.
- * @CMD_WAKE_UP_TRANS: The command response should wake up the trans
- *	(i.e. mark it as non-idle).
  * @CMD_WANT_ASYNC_CALLBACK: the op_mode's async callback function must be
  *	called after this command completes. Valid only with CMD_ASYNC.
  */
@@ -176,10 +172,7 @@ enum CMD_MODE {
 	CMD_ASYNC		= BIT(0),
 	CMD_WANT_SKB		= BIT(1),
 	CMD_SEND_IN_RFKILL	= BIT(2),
-	CMD_SEND_IN_IDLE	= BIT(3),
-	CMD_MAKE_TRANS_IDLE	= BIT(4),
-	CMD_WAKE_UP_TRANS	= BIT(5),
-	CMD_WANT_ASYNC_CALLBACK	= BIT(6),
+	CMD_WANT_ASYNC_CALLBACK	= BIT(3),
 };
 
 #define DEF_CMD_PAYLOAD_SIZE 320
@@ -467,9 +460,8 @@ struct iwl_trans_rxq_dma_data {
  *
  * All the handlers MUST be implemented
  *
- * @start_hw: starts the HW. If low_power is true, the NIC needs to be taken
- *	out of a low power state. From that point on, the HW can send
- *	interrupts. May sleep.
+ * @start_hw: starts the HW. From that point on, the HW can send interrupts.
+ *	May sleep.
  * @op_mode_leave: Turn off the HW RF kill indication if on
  *	May sleep
  * @start_fw: allocates and inits all the resources for the transport
@@ -479,9 +471,8 @@ struct iwl_trans_rxq_dma_data {
  *	the SCD base address in SRAM, then provide it here, or 0 otherwise.
  *	May sleep
  * @stop_device: stops the whole device (embedded CPU put to reset) and stops
- *	the HW. If low_power is true, the NIC will be put in low power state.
- *	From that point on, the HW will be stopped but will still issue an
- *	interrupt if the HW RF kill switch is triggered.
+ *	the HW. From that point on, the HW will be stopped but will still issue
+ *	an interrupt if the HW RF kill switch is triggered.
  *	This callback must do the right thing and not crash even if %start_hw()
  *	was called but not &start_fw(). May sleep.
  * @d3_suspend: put the device into the correct mode for WoWLAN during
@@ -539,11 +530,6 @@ struct iwl_trans_rxq_dma_data {
  * @release_nic_access: let the NIC go to sleep. The "flags" parameter
  *	must be the same one that was sent before to the grab_nic_access.
  * @set_bits_mask - set SRAM register according to value and mask.
- * @ref: grab a reference to the transport/FW layers, disallowing
- *	certain low power states
- * @unref: release a reference previously taken with @ref. Note that
- *	initially the reference count is 1, making an initial @unref
- *	necessary to allow low power states.
  * @dump_data: return a vmalloc'ed buffer with debug data, maybe containing last
  *	TX'ed commands and similar. The buffer will be vfree'd by the caller.
  *	Note that the transport must fill in the proper file headers.
@@ -552,7 +538,7 @@ struct iwl_trans_rxq_dma_data {
  */
 struct iwl_trans_ops {
 
-	int (*start_hw)(struct iwl_trans *iwl_trans, bool low_power);
+	int (*start_hw)(struct iwl_trans *iwl_trans);
 	void (*op_mode_leave)(struct iwl_trans *iwl_trans);
 #if IS_ENABLED(CPTCFG_IWLXVT)
 	int (*start_fw_dbg)(struct iwl_trans *trans, const struct fw_img *fw,
@@ -562,7 +548,7 @@ struct iwl_trans_ops {
 	int (*start_fw)(struct iwl_trans *trans, const struct fw_img *fw,
 			bool run_in_rfkill);
 	void (*fw_alive)(struct iwl_trans *trans, u32 scd_addr);
-	void (*stop_device)(struct iwl_trans *trans, bool low_power);
+	void (*stop_device)(struct iwl_trans *trans);
 
 	void (*d3_suspend)(struct iwl_trans *trans, bool test, bool reset);
 	int (*d3_resume)(struct iwl_trans *trans, enum iwl_d3_status *status,
@@ -575,6 +561,8 @@ struct iwl_trans_ops {
 	void (*reclaim)(struct iwl_trans *trans, int queue, int ssn,
 			struct sk_buff_head *skbs);
 
+	void (*set_q_ptrs)(struct iwl_trans *trans, int queue, int ptr);
+
 	bool (*txq_enable)(struct iwl_trans *trans, int queue, u16 ssn,
 			   const struct iwl_trans_txq_scd_cfg *cfg,
 			   unsigned int queue_wdg_timeout);
@@ -616,8 +604,6 @@ struct iwl_trans_ops {
 				   unsigned long *flags);
 	void (*set_bits_mask)(struct iwl_trans *trans, u32 reg, u32 mask,
 			      u32 value);
-	void (*ref)(struct iwl_trans *trans);
-	void (*unref)(struct iwl_trans *trans);
 	int  (*suspend)(struct iwl_trans *trans);
 	void (*resume)(struct iwl_trans *trans);
 
@@ -641,9 +627,6 @@ enum iwl_trans_state {
 /**
  * DOC: Platform power management
  *
- * There are two types of platform power management: system-wide
- * (WoWLAN) and runtime.
- *
  * In system-wide power management the entire platform goes into a low
  * power state (e.g. idle or suspend to RAM) at the same time and the
  * device is configured as a wakeup source for the entire platform.
@@ -652,55 +635,34 @@ enum iwl_trans_state {
  * put the platform in low power mode).  The device's behavior in this
  * mode is dictated by the wake-on-WLAN configuration.
  *
- * In runtime power management, only the devices which are themselves
- * idle enter a low power state.  This is done at runtime, which means
- * that the entire system is still running normally.  This mode is
- * usually triggered automatically by the device driver and requires
- * the ability to enter and exit the low power modes in a very short
- * time, so there is not much impact in usability.
- *
  * The terms used for the device's behavior are as follows:
  *
  *	- D0: the device is fully powered and the host is awake;
  *	- D3: the device is in low power mode and only reacts to
  *		specific events (e.g. magic-packet received or scan
  *		results found);
- *	- D0I3: the device is in low power mode and reacts to any
- *		activity (e.g. RX);
  *
  * These terms reflect the power modes in the firmware and are not to
- * be confused with the physical device power state.  The NIC can be
- * in D0I3 mode even if, for instance, the PCI device is in D3 state.
+ * be confused with the physical device power state.
  */
 
 /**
  * enum iwl_plat_pm_mode - platform power management mode
  *
  * This enumeration describes the device's platform power management
- * behavior when in idle mode (i.e. runtime power management) or when
- * in system-wide suspend (i.e WoWLAN).
+ * behavior when in system-wide suspend (i.e WoWLAN).
  *
  * @IWL_PLAT_PM_MODE_DISABLED: power management is disabled for this
- *	device.  At runtime, this means that nothing happens and the
- *	device always remains in active.  In system-wide suspend mode,
- *	it means that the all connections will be closed automatically
- *	by mac80211 before the platform is suspended.
+ *	device.  In system-wide suspend mode, it means that the all
+ *	connections will be closed automatically by mac80211 before
+ *	the platform is suspended.
  * @IWL_PLAT_PM_MODE_D3: the device goes into D3 mode (i.e. WoWLAN).
- *	For runtime power management, this mode is not officially
- *	supported.
- * @IWL_PLAT_PM_MODE_D0I3: the device goes into D0I3 mode.
  */
 enum iwl_plat_pm_mode {
 	IWL_PLAT_PM_MODE_DISABLED,
 	IWL_PLAT_PM_MODE_D3,
-	IWL_PLAT_PM_MODE_D0I3,
 };
 
-/* Max time to wait for trans to become idle/non-idle on d0i3
- * enter/exit (in msecs).
- */
-#define IWL_TRANS_IDLE_TIMEOUT (CPTCFG_IWL_TIMEOUT_FACTOR * 2000)
-
 /* Max time to wait for nmi interrupt */
 #define IWL_TRANS_NMI_TIMEOUT (HZ / 4 * CPTCFG_IWL_TIMEOUT_FACTOR)
 
@@ -806,9 +768,6 @@ struct iwl_trans_debug {
  * @system_pm_mode: the system-wide power management mode in use.
  *	This mode is set dynamically, depending on the WoWLAN values
  *	configured from the userspace at runtime.
- * @runtime_pm_mode: the runtime power management mode in use.  This
- *	mode is set during the initialization phase and is not
- *	supposed to change during runtime.
  */
 struct iwl_trans {
 	const struct iwl_trans_ops *ops;
@@ -857,7 +816,6 @@ struct iwl_trans {
 	struct iwl_self_init_dram init_dram;
 
 	enum iwl_plat_pm_mode system_pm_mode;
-	enum iwl_plat_pm_mode runtime_pm_mode;
 
 #ifdef CPTCFG_IWLWIFI_DEVICE_TESTMODE
 	struct iwl_testmode testmode;
@@ -880,16 +838,11 @@ static inline void iwl_trans_configure(struct iwl_trans *trans,
 	WARN_ON(iwl_cmd_groups_verify_sorted(trans_cfg));
 }
 
-static inline int _iwl_trans_start_hw(struct iwl_trans *trans, bool low_power)
+static inline int iwl_trans_start_hw(struct iwl_trans *trans)
 {
 	might_sleep();
 
-	return trans->ops->start_hw(trans, low_power);
-}
-
-static inline int iwl_trans_start_hw(struct iwl_trans *trans)
-{
-	return trans->ops->start_hw(trans, true);
+	return trans->ops->start_hw(trans);
 }
 
 static inline void iwl_trans_op_mode_leave(struct iwl_trans *trans)
@@ -950,21 +903,15 @@ static inline int iwl_trans_start_fw_dbg(struct iwl_trans *trans,
 }
 #endif
 
-static inline void _iwl_trans_stop_device(struct iwl_trans *trans,
-					  bool low_power)
+static inline void iwl_trans_stop_device(struct iwl_trans *trans)
 {
 	might_sleep();
 
-	trans->ops->stop_device(trans, low_power);
+	trans->ops->stop_device(trans);
 
 	trans->state = IWL_TRANS_NO_FW;
 }
 
-static inline void iwl_trans_stop_device(struct iwl_trans *trans)
-{
-	_iwl_trans_stop_device(trans, true);
-}
-
 static inline void iwl_trans_d3_suspend(struct iwl_trans *trans, bool test,
 					bool reset)
 {
@@ -1045,6 +992,17 @@ static inline void iwl_trans_reclaim(struct iwl_trans *trans, int queue,
 	trans->ops->reclaim(trans, queue, ssn, skbs);
 }
 
+static inline void iwl_trans_set_q_ptrs(struct iwl_trans *trans, int queue,
+					int ptr)
+{
+	if (WARN_ON_ONCE(trans->state != IWL_TRANS_FW_ALIVE)) {
+		IWL_ERR(trans, "%s bad state = %d\n", __func__, trans->state);
+		return;
+	}
+
+	trans->ops->set_q_ptrs(trans, queue, ptr);
+}
+
 static inline void iwl_trans_txq_disable(struct iwl_trans *trans, int queue,
 					 bool configure_scd)
 {
@@ -1324,8 +1282,6 @@ struct iwl_trans *iwl_trans_alloc(unsigned int priv_size,
 				  const struct iwl_cfg *cfg,
 				  const struct iwl_trans_ops *ops);
 void iwl_trans_free(struct iwl_trans *trans);
-void iwl_trans_ref(struct iwl_trans *trans);
-void iwl_trans_unref(struct iwl_trans *trans);
 
 /*****************************************************
 * driver (transport) register/unregister functions
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/Makefile b/drivers/net/wireless/intel/iwlwifi/mvm/Makefile
index 8e43da7..256e08b 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/Makefile
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/Makefile
@@ -16,5 +16,3 @@ ccflags-y += -I$(src)/../
 
 # non-upstream things
 iwlmvm-$(CPTCFG_IWLMVM_VENDOR_CMDS) += vendor-cmd.o
-iwlmvm-$(CPTCFG_IWLWIFI_FRQ_MGR) += fm-ops.o
-iwlmvm-$(CPTCFG_IWLWIFI_FRQ_MGR_TEST) += fm-test.o
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/coex.c b/drivers/net/wireless/intel/iwlwifi/mvm/coex.c
index bd9c105..7fb4ac9 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/coex.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/coex.c
@@ -7,7 +7,7 @@
  *
  * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -29,7 +29,7 @@
  *
  * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -69,10 +69,6 @@
 #include "mvm.h"
 #include "iwl-debug.h"
 
-#ifdef CPTCFG_IWLWIFI_LTE_COEX
-#include "lte-coex.h"
-#endif
-
 /* 20MHz / 40MHz below / 40Mhz above*/
 static const __le64 iwl_ci_mask[][3] = {
 	/* dummy entry for channel 0 */
@@ -622,11 +618,6 @@ u16 iwl_mvm_coex_agg_time_limit(struct iwl_mvm *mvm,
 	if (mvm->last_bt_notif.ttc_status & BIT(phy_ctxt->id))
 		return LINK_QUAL_AGG_TIME_LIMIT_DEF;
 
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR
-	/* 2G coex */
-	if (mvm->coex_2g_enabled)
-		return LINK_QUAL_AGG_TIME_LIMIT_BT_ACT;
-#endif
 	if (le32_to_cpu(mvm->last_bt_notif.bt_activity_grading) <
 	    BT_HIGH_TRAFFIC)
 		return LINK_QUAL_AGG_TIME_LIMIT_DEF;
@@ -751,150 +742,3 @@ void iwl_mvm_bt_coex_vif_change(struct iwl_mvm *mvm)
 	iwl_mvm_bt_coex_notif_handle(mvm);
 }
 
-#ifdef CPTCFG_IWLWIFI_LTE_COEX
-int iwl_mvm_send_lte_coex_config_cmd(struct iwl_mvm *mvm)
-{
-	const struct iwl_lte_coex_config_cmd *cmd = &mvm->lte_state.config;
-
-	if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_LTE_COEX)) {
-		IWL_DEBUG_COEX(mvm, "LTE-Coex not supported!\n");
-		return -EOPNOTSUPP;
-	}
-
-	IWL_DEBUG_COEX(mvm, "LTE-Coex: lte_coex_config_cmd:\n"
-		       "\tstate: %d\n\tband: %d\n\tchan: %d\n",
-		       le32_to_cpu(cmd->lte_state), le32_to_cpu(cmd->lte_band),
-		       le32_to_cpu(cmd->lte_chan));
-
-	IWL_DEBUG_COEX(mvm, "\ttx safe freq min: %d\n\ttx safe freq max: %d\n"
-		       "\trx safe freq min: %d\n\trx safe freq max: %d\n",
-		       le32_to_cpu(cmd->tx_safe_freq_min),
-		       le32_to_cpu(cmd->tx_safe_freq_max),
-		       le32_to_cpu(cmd->rx_safe_freq_min),
-		       le32_to_cpu(cmd->rx_safe_freq_max));
-
-	return iwl_mvm_send_cmd_pdu(mvm, LTE_COEX_CONFIG_CMD, 0, sizeof(*cmd),
-				    cmd);
-}
-
-int iwl_mvm_send_lte_coex_wifi_reported_channel_cmd(struct iwl_mvm *mvm)
-{
-	const struct iwl_lte_coex_wifi_reported_channel_cmd *cmd =
-						&mvm->lte_state.rprtd_chan;
-
-	if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_LTE_COEX)) {
-		IWL_DEBUG_COEX(mvm, "LTE-Coex not supported!\n");
-		return -EOPNOTSUPP;
-	}
-
-	IWL_DEBUG_COEX(mvm, "LTE-COEX: lte_coex_wifi_reported_channel_cmd:\n"
-		       "\tchannel: %d\n\tbandwidth: %d\n",
-		       le32_to_cpu(cmd->channel), le32_to_cpu(cmd->bandwidth));
-
-	return iwl_mvm_send_cmd_pdu(mvm, LTE_COEX_WIFI_REPORTED_CHANNEL_CMD,
-				    0, sizeof(*cmd), cmd);
-}
-
-int iwl_mvm_send_lte_coex_static_params_cmd(struct iwl_mvm *mvm)
-{
-	const struct iwl_lte_coex_static_params_cmd *cmd = &mvm->lte_state.stat;
-
-	if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_LTE_COEX)) {
-		IWL_DEBUG_COEX(mvm, "LTE-Coex not supported!\n");
-		return -EOPNOTSUPP;
-	}
-
-	IWL_DEBUG_COEX(mvm, "LTE-COEX: lte_coex_static_params_cmd:\n"
-		       "\tmfu config[0]: %d\n\ttx power[0]: %d\n",
-		       le32_to_cpu(cmd->mfu_config[0]),
-		       cmd->tx_power_in_dbm[0]);
-
-	return iwl_mvm_send_cmd_pdu(mvm, LTE_COEX_STATIC_PARAMS_CMD, 0,
-				    sizeof(*cmd), cmd);
-}
-
-int iwl_mvm_send_lte_fine_tuning_params_cmd(struct iwl_mvm *mvm)
-{
-	const struct iwl_lte_coex_fine_tuning_params_cmd *cmd =
-							&mvm->lte_state.ft;
-
-	if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_LTE_COEX)) {
-		IWL_DEBUG_COEX(mvm, "LTE-Coex not supported!\n");
-		return -EOPNOTSUPP;
-	}
-
-	IWL_DEBUG_COEX(mvm, "LTE-COEX: lte_fine_tuning_params_cmd:\n"
-		       "\trx protection assert timing: %d\n",
-		       le32_to_cpu(cmd->rx_protection_assert_timing));
-
-	IWL_DEBUG_COEX(mvm, "\ttx protection assert timing: %d\n"
-		       "\trx protection timeout: %d\n\tmin tx power: %d\n",
-		       le32_to_cpu(cmd->tx_protection_assert_timing),
-		       le32_to_cpu(cmd->rx_protection_timeout),
-		       le32_to_cpu(cmd->min_tx_power));
-
-	IWL_DEBUG_COEX(mvm, "\tul load uapsd threshold: %d\n"
-		       "\trx failure during ul uapsd threshold: %d\n",
-		       le32_to_cpu(cmd->lte_ul_load_uapsd_threshold),
-		       le32_to_cpu(cmd->rx_failure_during_ul_uapsd_threshold));
-
-	IWL_DEBUG_COEX(mvm,
-		       "\trx failure during ul scan compensation threshold: %d\n"
-		       "\trx duration for ack protection: %d\n",
-		       le32_to_cpu(cmd->rx_failure_during_ul_sc_threshold),
-		       le32_to_cpu(cmd->rx_duration_for_ack_protection_us));
-
-	IWL_DEBUG_COEX(mvm, "\tbeacon failure during ul counter: %d\n"
-		       "\tdtim failure during ul counter: %d\n",
-		       le32_to_cpu(cmd->beacon_failure_during_ul_counter),
-		       le32_to_cpu(cmd->dtim_failure_during_ul_counter));
-
-	return iwl_mvm_send_cmd_pdu(mvm, LTE_COEX_FINE_TUNING_PARAMS_CMD,
-				    0, sizeof(*cmd), cmd);
-}
-
-int iwl_mvm_send_lte_sps_cmd(struct iwl_mvm *mvm)
-{
-	const struct iwl_lte_coex_sps_cmd *cmd = &mvm->lte_state.sps;
-
-	if (!(mvm->fw->ucode_capa.flags & IWL_UCODE_TLV_FLAGS_LTE_COEX)) {
-		IWL_DEBUG_COEX(mvm, "LTE-Coex not supported!\n");
-		return -EOPNOTSUPP;
-	}
-
-	IWL_DEBUG_COEX(mvm, "LTE-COEX: lte_sps_cmd:\n\tsps info: %d\n",
-		       le32_to_cpu(cmd->lte_semi_persistent_info));
-
-	return iwl_mvm_send_cmd_pdu(mvm, LTE_COEX_SPS_CMD, 0, sizeof(*cmd),
-				    cmd);
-}
-
-void iwl_mvm_reset_lte_state(struct iwl_mvm *mvm)
-{
-	struct lte_coex_state *lte_state = &mvm->lte_state;
-
-	lte_state->state = LTE_OFF;
-	lte_state->has_config = 0;
-	lte_state->has_rprtd_chan = 0;
-	lte_state->has_sps = 0;
-	lte_state->has_ft = 0;
-}
-
-void iwl_mvm_send_lte_commands(struct iwl_mvm *mvm)
-{
-	struct lte_coex_state *lte_state = &mvm->lte_state;
-
-	lockdep_assert_held(&mvm->mutex);
-
-	if (lte_state->has_static)
-		iwl_mvm_send_lte_coex_static_params_cmd(mvm);
-	if (lte_state->has_rprtd_chan)
-		iwl_mvm_send_lte_coex_wifi_reported_channel_cmd(mvm);
-	if (lte_state->state != LTE_OFF)
-		iwl_mvm_send_lte_coex_config_cmd(mvm);
-	if (lte_state->has_sps)
-		iwl_mvm_send_lte_sps_cmd(mvm);
-	if (lte_state->has_ft)
-		iwl_mvm_send_lte_fine_tuning_params_cmd(mvm);
-}
-#endif /* CPTCFG_IWLWIFI_LTE_COEX */
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
index 68814b9..5e6cd75 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/d3.c
@@ -831,6 +831,8 @@ iwl_mvm_wowlan_config(struct iwl_mvm *mvm,
 	bool unified_image = fw_has_capa(&mvm->fw->ucode_capa,
 					 IWL_UCODE_TLV_CAPA_CNSLDTD_D3_D0_IMG);
 
+	mvm->offload_tid = wowlan_config_cmd->offloading_tid;
+
 	if (!unified_image) {
 		ret = iwl_mvm_switch_to_d3(mvm);
 		if (ret)
@@ -1656,6 +1658,13 @@ static bool iwl_mvm_query_wakeup_reasons(struct iwl_mvm *mvm,
 		mvm_ap_sta->tid_data[i].seq_number = seq;
 	}
 
+	if (mvm->trans->cfg->device_family >= IWL_DEVICE_FAMILY_22000) {
+		i = mvm->offload_tid;
+		iwl_trans_set_q_ptrs(mvm->trans,
+				     mvm_ap_sta->tid_data[i].txq_id,
+				     mvm_ap_sta->tid_data[i].seq_number >> 4);
+	}
+
 	/* now we have all the data we need, unlock to avoid mac80211 issues */
 	mutex_unlock(&mvm->mutex);
 
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
index 02ff26d..222c4c8 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/debugfs-vif.c
@@ -8,7 +8,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -31,7 +31,7 @@
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
  * Copyright(c) 2016 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -201,19 +201,6 @@ static ssize_t iwl_dbgfs_tx_pwr_lmt_read(struct file *file,
 	pos = scnprintf(buf, bufsz, "bss limit = %d\n",
 			vif->bss_conf.txpower);
 
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR
-	{
-	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
-	struct iwl_mvm *mvm = mvmvif->mvm;
-
-	mutex_lock(&mvm->mutex);
-	if (mvmvif->phy_ctxt)
-		pos += scnprintf(buf + pos, bufsz - pos, "fm limit = %d\n",
-				mvmvif->phy_ctxt->fm_tx_power_limit);
-	mutex_unlock(&mvm->mutex);
-	}
-#endif
-
 	return simple_read_from_buffer(user_buf, count, ppos, buf, pos);
 }
 
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fm-ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/fm-ops.c
 deleted file mode 100644
index f312f90..0000000
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fm-ops.c
+++ /dev/null
@@ -1,837 +0,0 @@
-/******************************************************************************
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * The full GNU General Public License is included in this distribution
- * in the file called COPYING.
- *
- * Contact Information:
- *  Intel Linux Wireless <[e-mail]>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2013 - 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *  * Neither the name Intel Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *****************************************************************************/
-#include <linux/fm/iui_fm.h>
-#include "mvm.h"
-
-/*
- * Used in the FM callback and is declared here since according
- * to the FM API, the callback does not receive an mvm pointer
- */
-static struct iwl_mvm *g_mvm;
-
-/* If in debug mode use the fm-test module instead of the original fm API */
-static bool debug_mode;
-
-struct chan_ifaces {
-	struct iui_fm_wlan_channel_tx_power *chan_txpwr;
-	int num_of_vif; /* for statistics */
-};
-
-struct chan_list {
-	struct iui_fm_wlan_info *winfo;
-	enum iwl_fm_chan_change_action action;
-};
-
-/* last reported channel notification to the FM */
-static struct iui_fm_wlan_info last_chan_notif;
-/* last dcdc values requested by the FM */
-static int g_dcdc_div0;
-static int g_dcdc_div1;
-
-static struct work_struct fm_chan_notif_wk;
-
-/*
- * Search for an interface with a given frequency
- */
-static void iwl_mvm_fm_iface_iterator(void *_data, u8 *mac,
-				      struct ieee80211_vif *vif)
-{
-	struct chan_ifaces *data = _data;
-	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
-	struct ieee80211_chanctx_conf *chanctx_conf;
-
-	/* P2P device or NAN are never assigned a channel */
-	if ((vif->type == NL80211_IFTYPE_P2P_DEVICE) ||
-	    (vif->type == NL80211_IFTYPE_NAN))
-		return;
-
-	rcu_read_lock();
-
-	chanctx_conf = rcu_dereference(vif->chanctx_conf);
-	/* make sure the channel context is assigned */
-	if (!chanctx_conf) {
-		rcu_read_unlock();
-		return;
-	}
-
-	if (chanctx_conf->min_def.center_freq1 ==
-	    KHZ_TO_MHZ(data->chan_txpwr->frequency)) {
-		mvmvif->phy_ctxt->fm_tx_power_limit =
-			data->chan_txpwr->max_tx_pwr;
-		data->num_of_vif++;
-		rcu_read_unlock();
-		/* FM requests to remove Tx power limitation */
-		if (data->chan_txpwr->max_tx_pwr == IUI_FM_WLAN_NO_TX_PWR_LIMIT)
-			data->chan_txpwr->max_tx_pwr =
-				IWL_DEFAULT_MAX_TX_POWER;
-
-		iwl_mvm_fm_set_tx_power(g_mvm, vif,
-					data->chan_txpwr->max_tx_pwr);
-		return;
-	}
-
-	rcu_read_unlock();
-}
-
-/*
- * Search for an interface with a given frequency
- */
-static void iwl_mvm_fm_chan_vldt_iter(void *_data, u8 *mac,
-				      struct ieee80211_vif *vif)
-{
-	struct chan_ifaces *data = _data;
-	struct ieee80211_chanctx_conf *chanctx_conf;
-
-	rcu_read_lock();
-
-	chanctx_conf = rcu_dereference(vif->chanctx_conf);
-	/* make sure the channel context is assigned */
-	if (!chanctx_conf) {
-		rcu_read_unlock();
-		return;
-	}
-
-	if (chanctx_conf->min_def.center_freq1 ==
-	    KHZ_TO_MHZ(data->chan_txpwr->frequency))
-		data->num_of_vif++;
-
-	rcu_read_unlock();
-}
-
-static enum iui_fm_wlan_bandwidth
-iwl_mvm_fm_get_bandwidth(enum nl80211_chan_width bandwidth)
-{
-	switch (bandwidth) {
-	case NL80211_CHAN_WIDTH_20_NOHT:
-		return IUI_FM_WLAN_BW_20MHZ;
-	case NL80211_CHAN_WIDTH_20:
-		return IUI_FM_WLAN_BW_20MHZ;
-	case NL80211_CHAN_WIDTH_40:
-		return  IUI_FM_WLAN_BW_40MHZ;
-	case NL80211_CHAN_WIDTH_80:
-		return IUI_FM_WLAN_BW_80MHZ;
-	case NL80211_CHAN_WIDTH_160:
-		return IUI_FM_WLAN_BW_160MHZ;
-	default:
-		return IUI_FM_WLAN_BW_INVALID;
-	}
-}
-
-/*
- * Search for all channels used by interfaces
- */
-static void iwl_mvm_fm_chan_iterator(struct ieee80211_hw *hw,
-				     struct ieee80211_chanctx_conf *ctx,
-				     void *_data)
-{
-	int i;
-	enum nl80211_chan_width band;
-	u32 freq;
-	struct chan_list *data = _data;
-	struct iui_fm_wlan_info *winfo = data->winfo;
-
-	if (winfo->num_channels == IUI_FM_WLAN_MAX_CHANNELS)
-		return;
-
-	freq = MHZ_TO_KHZ(ctx->min_def.center_freq1);
-	band = ctx->min_def.width;
-
-	for (i = 0; i < winfo->num_channels; i++)
-		if (winfo->channel_info[i].frequency == freq) {
-			/*
-			 * channel exists - but bandwidth maybe invalid since
-			 * we are removing a ctx that operates on this channel
-			 */
-			winfo->channel_info[winfo->num_channels].bandwidth =
-				iwl_mvm_fm_get_bandwidth(band);
-			return; /* channel already exists in list */
-		}
-
-	winfo->channel_info[winfo->num_channels].frequency = freq;
-	winfo->channel_info[winfo->num_channels].bandwidth =
-		iwl_mvm_fm_get_bandwidth(band);
-
-	winfo->num_channels++;
-}
-
-/*
- * Handling Frequency Managers Tx power mitigation Request.
- * Reducing the Tx power of all interfaces that use a specific channel.
- */
-static enum iui_fm_mitigation_status
-iwl_mvm_fm_mitig_txpwr(struct iui_fm_wlan_mitigation *mit)
-{
-	int i;
-	struct chan_ifaces chan_ifaces;
-	struct iui_fm_wlan_channel_tx_power *chan_txpwr_list =
-		mit->channel_tx_pwr;
-	u32 num_channels = mit->num_channels;
-
-	/* Not required to mitigate tx power */
-	if (!(mit->bitmask & WLAN_MITI))
-		goto ret;
-
-	if (IUI_FM_WLAN_MAX_CHANNELS < num_channels)
-		return IUI_FM_MITIGATION_ERROR_INVALID_PARAM;
-
-	for (i = 0; i < num_channels; i++) {
-		chan_ifaces.chan_txpwr = &chan_txpwr_list[i];
-		chan_ifaces.num_of_vif = 0;
-		/* find all interfaces that use this channel */
-		ieee80211_iterate_active_interfaces(g_mvm->hw,
-						    IEEE80211_IFACE_ITER_NORMAL,
-						    iwl_mvm_fm_iface_iterator,
-						    &chan_ifaces);
-		IWL_DEBUG_EXTERNAL(g_mvm,
-				   "FM: Changed Tx power to %d for %d"
-				   " vifs on channel %d\n",
-				   chan_ifaces.chan_txpwr->max_tx_pwr,
-				   chan_ifaces.num_of_vif,
-				   chan_ifaces.chan_txpwr->frequency);
-	}
-ret:
-	return IUI_FM_MITIGATION_COMPLETE_OK;
-}
-
-/*
- * Handling Frequency Managers ADC/DAC mitigation Request
- * TODO: implement
- */
-static enum iui_fm_mitigation_status
-iwl_mvm_fm_mitig_adc_dac_freq(struct iui_fm_wlan_mitigation *mit)
-{
-	u32 adc_dac_freq = mit->wlan_adc_dac_freq;
-
-	/* Not required to mitigate adc dac */
-	if (!(mit->bitmask & WLAN_MITI))
-		goto ret;
-
-	if (adc_dac_freq != 0)
-		return IUI_FM_MITIGATION_ERROR_INVALID_PARAM;
-
-	IWL_DEBUG_EXTERNAL(g_mvm, "FM: adc - dac mitigation\n");
-ret:
-	return IUI_FM_MITIGATION_COMPLETE_OK;
-}
-
-/*
- * Handling Frequency Managers Rx Gain mitigation Request
- * TODO: implement
- */
-static enum iui_fm_mitigation_status
-iwl_mvm_fm_mitig_rxgain_behavior(struct iui_fm_wlan_mitigation *mit)
-{
-	enum iui_fm_wlan_rx_gain_behavior rx_gain = mit->rx_gain_behavior;
-
-	/* Not required to mitigate rx gain */
-	if (!(mit->bitmask & WLAN_MITI))
-		goto ret;
-
-	if (rx_gain != IUI_FM_WLAN_RX_GAIN_NORMAL)
-		return IUI_FM_MITIGATION_ERROR_INVALID_PARAM;
-
-	IWL_DEBUG_EXTERNAL(g_mvm,
-			   "FM: rxgain behaviour mitigation - not implemented\n");
-ret:
-	return IUI_FM_MITIGATION_COMPLETE_OK;
-}
-
-/*
- * Enables/Disable 2G coex mode -  aggregation limiting.
- */
-static enum iui_fm_mitigation_status
-iwl_mvm_fm_2g_coex(struct iui_fm_wlan_mitigation *mit)
-{
-	enum iui_fm_mitigation_status ret = IUI_FM_MITIGATION_COMPLETE_OK;
-	struct iwl_config_2g_coex_cmd cmd = {};
-	int i;
-	struct iui_fm_wlan_channel_tx_power *chan;
-	struct iui_fm_wlan_channel_tx_power *chan_txpwr_list =
-		mit->channel_tx_pwr;
-	u32 num_channels = mit->num_channels;
-
-	/* Not required to mitigate 2g coex */
-	if (!(mit->bitmask & WLAN_MITI))
-		return ret;
-
-	/* fw does not support the 2g coex cmd */
-	if (!fw_has_capa(&g_mvm->fw->ucode_capa,
-			 IWL_UCODE_TLV_CAPA_2G_COEX_SUPPORT))
-		goto sofia_xmm;
-
-	/* No need to change 2g coex state */
-	if (g_mvm->coex_2g_enabled == mit->wlan_2g_coex_enable)
-		return ret;
-
-	g_mvm->coex_2g_enabled = mit->wlan_2g_coex_enable;
-
-	cmd.enabled = cpu_to_le32(g_mvm->coex_2g_enabled);
-
-	mutex_lock(&g_mvm->mutex);
-	ret = iwl_mvm_send_cmd_pdu(g_mvm, CONFIG_2G_COEX_CMD, 0, sizeof(cmd),
-				   &cmd);
-	mutex_unlock(&g_mvm->mutex);
-	if (ret) {
-		IWL_ERR(g_mvm, "Failed to send 2g coex command(%sabling)\n",
-			g_mvm->coex_2g_enabled ? "en" : "dis");
-		return IUI_FM_MITIGATION_ERROR;
-	}
-	IWL_DEBUG_EXTERNAL(g_mvm,
-			   "FM 2G coex: %sabling 2G coex mode (sent fw cmd)\n",
-			   g_mvm->coex_2g_enabled ? "en" : "dis");
-	return ret;
-
-sofia_xmm:
-	/* Flow for SOFIA 3G & XMM6321 - don't support the 2g coex cmd */
-	if (IUI_FM_WLAN_MAX_CHANNELS < num_channels)
-		return IUI_FM_MITIGATION_ERROR_INVALID_PARAM;
-
-	for (i = 0; i < num_channels; i++) {
-		chan = &chan_txpwr_list[i];
-		if (chan->frequency == FM_2G_COEX_ENABLE_DISABLE) {
-			mutex_lock(&g_mvm->mutex);
-			if (chan->max_tx_pwr == FM_2G_COEX_ENABLE) {
-				g_mvm->coex_2g_enabled = true;
-			} else if (chan->max_tx_pwr == FM_2G_COEX_DISABLE) {
-				g_mvm->coex_2g_enabled = false;
-			} else {
-				IWL_DEBUG_EXTERNAL(g_mvm,
-						   "FM 2G coex: ERROR: Invalid paramters for enable/disable(%d)\n",
-						   chan->max_tx_pwr);
-				ret = IUI_FM_MITIGATION_ERROR_INVALID_PARAM;
-			}
-			IWL_DEBUG_EXTERNAL(g_mvm,
-					   "FM 2G coex: %sabling 2G coex mode\n",
-					   g_mvm->coex_2g_enabled ?
-					   "en" : "dis");
-			mutex_unlock(&g_mvm->mutex);
-			break;
-		}
-	}
-
-	return ret;
-}
-
-static int iwl_mvm_fm_send_dcdc_cmd(u32 div0, u32 div1, u32 flags)
-{
-	int ret;
-	struct iwl_dc2dc_config_resp *resp;
-	struct iwl_rx_packet *pkt;
-	struct iwl_dc2dc_config_cmd dcdc = {
-		.flags = cpu_to_le32(flags),
-		.dc2dc_freq_tune0 = cpu_to_le32(div0),
-		.dc2dc_freq_tune1 = cpu_to_le32(div1),
-	};
-	struct iwl_host_cmd cmd = {
-		.id = DC2DC_CONFIG_CMD,
-		.flags = CMD_WANT_SKB,
-		.data = { &dcdc },
-		.len = { sizeof(struct iwl_dc2dc_config_cmd) },
-	};
-
-	/* fw does not support the dcdc cmd */
-	if (!fw_has_capa(&g_mvm->fw->ucode_capa,
-			 IWL_UCODE_TLV_CAPA_DC2DC_CONFIG_SUPPORT))
-		return -EINVAL;
-
-	ret = iwl_mvm_send_cmd(g_mvm, &cmd);
-
-	if (ret) {
-		IWL_ERR(g_mvm, "FM: Failed to send dcdc cmd (ret = %d)\n", ret);
-		return ret;
-	}
-
-	pkt = cmd.resp_pkt;
-	if (!pkt) {
-		IWL_ERR(g_mvm, "FM: Error DCDC cmd response is NULL\n");
-		return -EIO;
-	}
-	resp = (void *)pkt->data;
-
-	/* update the current dcdc values */
-	g_dcdc_div0 = le32_to_cpu(resp->dc2dc_freq_tune0);
-	g_dcdc_div1 = le32_to_cpu(resp->dc2dc_freq_tune1);
-
-	iwl_free_resp(&cmd);
-	return ret;
-}
-
-/*
- * Enables/Disable DCDC mitigation
- * In some scenarios, DCDC inserts noise to FMR due to its (DCDC's)
- * internal clock rate. When WiFi is ON the noise level is very high,
- * and therefore DCDC needs to change its clock rate.
- */
-static enum iui_fm_mitigation_status
-iwl_mvm_fm_mitig_dcdc(struct iui_fm_wlan_mitigation *mit)
-{
-	enum iui_fm_mitigation_status ret = IUI_FM_MITIGATION_COMPLETE_OK;
-
-	/* Not required to mitigate dcdc */
-	if (!(mit->bitmask & DCDC_MITI))
-		return ret;
-
-	/* Current dcdc values match requested values */
-	if (mit->dcdc_div0 == g_dcdc_div0 && mit->dcdc_div1 == g_dcdc_div0) {
-		IWL_DEBUG_EXTERNAL(g_mvm,
-				   "FM DCDC: Current dcdc values match requested values - not mitigating\n");
-		goto out;
-	}
-
-	mutex_lock(&g_mvm->mutex);
-	ret = iwl_mvm_fm_send_dcdc_cmd(mit->dcdc_div0, mit->dcdc_div1,
-				       DCDC_FREQ_TUNE_SET);
-	mutex_unlock(&g_mvm->mutex);
-
-	if (ret)
-		ret = IUI_FM_MITIGATION_ERROR;
-
-out:
-	IWL_DEBUG_EXTERNAL(g_mvm,
-			   "FM DCDC: mitigation %s (div0 = %d, div1 = %d)\n",
-			   ret ? "failed" : "succeeded", g_dcdc_div0,
-			   g_dcdc_div1);
-
-	return ret;
-}
-
-/*
- * Send the FM the original DCDC values, so that FM can know when to activate
- * the DCDC mitigation.
- */
-void iwl_mvm_fm_notify_current_dcdc(void)
-{
-	int ret;
-	struct iui_fm_freq_notification notification;
-	struct iui_fm_wlan_info winfo;
-
-	if (!g_mvm)
-		return;
-
-	memset(&winfo, 0, sizeof(struct iui_fm_wlan_info));
-
-	/* Get current DCDC from the FW */
-	ret = iwl_mvm_fm_send_dcdc_cmd(0, 0, 0);
-	if (ret)
-		goto out;
-
-	winfo.dcdc_div0 = g_dcdc_div0;
-	winfo.dcdc_div1 = g_dcdc_div1;
-
-	/* mark the change that we are reporting */
-	winfo.bitmask |= DCDC_UPDATE;
-
-	notification.type = IUI_FM_FREQ_NOTIFICATION_TYPE_WLAN;
-	notification.info.wlan_info = &winfo;
-
-	ret = iwl_mvm_fm_notify_frequency(debug_mode, IUI_FM_MACRO_ID_WLAN,
-					  &notification);
-
-out:
-	IWL_DEBUG_EXTERNAL(g_mvm,
-			   "FM: notified fm about dcdc div0 = %d div1 = %d (fail = %d)\n",
-			   winfo.dcdc_div0, winfo.dcdc_div1, ret);
-}
-
-/*
- * Check if the list of channels that the FM supplied is valid
- */
-static bool iwl_mvm_fm_invalid_channel_list(struct iui_fm_wlan_mitigation *mit)
-{
-	struct iui_fm_wlan_channel_tx_power *chan_txpwr_list =
-		mit->channel_tx_pwr;
-	u32 num_channels = mit->num_channels;
-	u8 i, j;
-
-	/* Check if the same frequency appears twice */
-	for (i = 0; i < num_channels; i++) {
-		for (j = 0; j < num_channels; j++) {
-			if (chan_txpwr_list[i].frequency ==
-			    chan_txpwr_list[j].frequency && i != j) {
-				int freq;
-
-				freq = chan_txpwr_list[i].frequency;
-				IWL_DEBUG_EXTERNAL(g_mvm,
-						   "FM: Invalid channel list: duplicated frequencies (freq = %d)\n",
-						   freq);
-				return true;
-			}
-		}
-	}
-
-	/* Check that all of the channels are used */
-	for (i = 0; i < num_channels; i++) {
-		struct chan_ifaces chan_ifaces = {
-			.chan_txpwr = &chan_txpwr_list[i],
-			.num_of_vif = 0,
-		};
-		ieee80211_iterate_active_interfaces(g_mvm->hw,
-						    IEEE80211_IFACE_ITER_NORMAL,
-						    iwl_mvm_fm_chan_vldt_iter,
-						    &chan_ifaces);
-		if (!chan_ifaces.num_of_vif) {
-			IWL_DEBUG_EXTERNAL(g_mvm,
-					   "FM: Invalid channel list: frequency is not in use (freq = %d)\n",
-					   chan_txpwr_list[i].frequency);
-			return true;
-		}
-	}
-
-	return false;
-}
-
-/*
- * Frequency Mitigation Callback function implementation.
- * Frequency Manager can ask to:
- * 1. Limit Tx power on specific channels
- * 2. Change ADC/DAC frequency - Currently not supported
- * 3. Request Rx Gain behavior - Currently not supported
- * 4. Enter 2G coex mode
- * 5. Change dcdc clock values
- */
-static enum iui_fm_mitigation_status
-iwl_mvm_fm_wlan_mitigation(const enum iui_fm_macro_id macro_id,
-			   const struct iui_fm_mitigation *mitigation,
-			   const uint32_t sequence)
-{
-	enum iui_fm_mitigation_status ret;
-	struct iui_fm_wlan_mitigation *mit;
-
-	if (WARN_ON(!g_mvm))
-		return IUI_FM_MITIGATION_ERROR;
-
-	if (macro_id != IUI_FM_MACRO_ID_WLAN ||
-	    mitigation->type != IUI_FM_MITIGATION_TYPE_WLAN) {
-		ret = IUI_FM_MITIGATION_ERROR_INVALID_PARAM;
-		goto end;
-	}
-
-	mit = mitigation->info.wlan_mitigation;
-
-	if (iwl_mvm_fm_invalid_channel_list(mit))
-		return IUI_FM_MITIGATION_ERROR_INVALID_PARAM;
-
-	IWL_DEBUG_EXTERNAL(g_mvm, "FM: fm mitigation callback bit mask 0x%x\n",
-			   mit->bitmask);
-
-	ret = iwl_mvm_fm_mitig_dcdc(mit);
-	if (ret)
-		goto end;
-
-	/* Enable/Disable 2G coex mode */
-	ret = iwl_mvm_fm_2g_coex(mit);
-	if (ret)
-		goto end;
-
-	/*
-	 * Going to mitigate the Tx power of all stations using the channels in
-	 * the channel list mit->channel_tx_pwr received from the FM.
-	 */
-	ret = iwl_mvm_fm_mitig_txpwr(mit);
-	if (ret)
-		goto end;
-
-	ret = iwl_mvm_fm_mitig_adc_dac_freq(mit);
-
-	if (ret)
-		goto end;
-
-	ret = iwl_mvm_fm_mitig_rxgain_behavior(mit);
-end:
-	IWL_DEBUG_EXTERNAL(g_mvm, "FM: fm mitigation callback %s\n",
-			   ret ? "failed" : "succeeded");
-	return ret;
-}
-
-/*
- * Check if the new list of active channels that the FM is going to be
- * updated with differs from the old list.
- * The check includes the channel frequency & BW.
- */
-static bool iwl_mvm_fm_channel_changed(struct iui_fm_wlan_info *winfo)
-{
-	int i, j;
-	bool changed;
-
-	for (i = 0; i < winfo->num_channels; i++) {
-		changed = true;
-		for (j = 0; j < last_chan_notif.num_channels; j++) {
-			/* The channel was not updated */
-			if (winfo->channel_info[i].frequency ==
-			    last_chan_notif.channel_info[j].frequency &&
-			    winfo->channel_info[i].bandwidth ==
-			    last_chan_notif.channel_info[j].bandwidth) {
-				changed = false;
-				break;
-			}
-		}
-		/* Channel was updated */
-		if (changed)
-			return true;
-	}
-
-	IWL_DEBUG_EXTERNAL(g_mvm,
-			   "FM: Channel list has not changed - not reporting\n");
-	return false;
-}
-
-/*
- * Check if the new list of channels being reported to the FM is missing
- * channels that have been removed - but not reported as removed.
- *
- * The check is done by checking the old list of active channels that was
- * reported to the FM, and making sure that the active channel is still in the
- * new list. If the channel is absent from the list - it means that it is no
- * longer in use, so report it invalid.
- *
- * For example in case of connecting to an AP on 80MHZ BW. At first the
- * connection will be on the primary channel with 20MHZ, and then it will be
- * modified to the center frequency with 80MHZ, but the primary channel will not
- * be reported as removed. So we need to report this channel as invalid.
- *
- */
-static void iwl_mvm_fm_remove_channels(struct iui_fm_wlan_info *winfo)
-{
-	int i, j;
-	bool found;
-
-	for (i = 0; i < last_chan_notif.num_channels; i++) {
-		/* Can't report more channels since we are in the max */
-		if (winfo->num_channels == IUI_FM_WLAN_MAX_CHANNELS)
-			return;
-		found = false;
-
-		if (last_chan_notif.channel_info[i].bandwidth ==
-		    IUI_FM_WLAN_BW_INVALID)
-			continue;
-		/*
-		 * Search for the old reported channel in the new reported
-		 * channels
-		 */
-		for (j = 0; j < winfo->num_channels; j++) {
-			if (last_chan_notif.channel_info[i].frequency ==
-			    winfo->channel_info[j].frequency) {
-				found = true;
-				break;
-			}
-		}
-		/*
-		 * The old reported channel is not in the new ones (It was
-		 * removed) - Adding it to the report.
-		 */
-		if (!found) {
-			winfo->channel_info[winfo->num_channels].frequency =
-				last_chan_notif.channel_info[i].frequency;
-			winfo->channel_info[winfo->num_channels].bandwidth =
-				IUI_FM_WLAN_BW_INVALID;
-			winfo->num_channels++;
-			IWL_DEBUG_EXTERNAL(g_mvm,
-					   "FM: reporting channel %d invalid\n",
-					   last_chan_notif.channel_info[i].
-					   frequency);
-		}
-	}
-}
-
-static void iwl_mvm_fm_notif_chan_change_wk(struct work_struct *wk)
-{
-	int ret;
-	struct iui_fm_freq_notification notification;
-
-	/* FM is enabled - but registration failed */
-	if (!g_mvm)
-		return;
-
-	mutex_lock(&g_mvm->mutex);
-
-	notification.type = IUI_FM_FREQ_NOTIFICATION_TYPE_WLAN;
-	notification.info.wlan_info = &last_chan_notif;
-	/* parameter not yet supported */
-	notification.info.wlan_info->wlan_adc_dac_freq = 0;
-
-	ret = iwl_mvm_fm_notify_frequency(debug_mode, IUI_FM_MACRO_ID_WLAN,
-					  &notification);
-
-	IWL_DEBUG_EXTERNAL(g_mvm,
-			   "FM: notified fm about channel change (fail = %d)\n",
-			   ret);
-
-	mutex_unlock(&g_mvm->mutex);
-}
-
-/*
- * Notify Frequency Manager that an interface changed a channel.
- */
-void iwl_mvm_fm_notify_channel_change(struct ieee80211_chanctx_conf *ctx,
-				      enum iwl_fm_chan_change_action action)
-{
-	int i;
-	struct iui_fm_wlan_info winfo = {
-		.num_channels  = 0,
-	};
-	struct chan_list chan_info = {
-		.winfo = &winfo,
-		.action = action,
-	};
-
-	/* FM is enabled - but registration failed */
-	if (!g_mvm)
-		return;
-
-	lockdep_assert_held(&g_mvm->mutex);
-
-	/*
-	 * if notifying the FM about adding/removing a channel ctx we
-	 * need to add this channel to the list before iterating over
-	 * the channel list since the list is updated only after this
-	 * function is called.
-	 */
-	if (action != IWL_FM_CHANGE_CHANCTX) {
-		winfo.channel_info[0].frequency =
-			MHZ_TO_KHZ(ctx->min_def.center_freq1);
-		winfo.channel_info[0].bandwidth =
-			iwl_mvm_fm_get_bandwidth(ctx->min_def.width);
-		/* when removing a channel - report the BW invalid */
-		winfo.num_channels++;
-		if (action == IWL_FM_REMOVE_CHANCTX)
-			winfo.channel_info[0].bandwidth =
-				IUI_FM_WLAN_BW_INVALID;
-	}
-
-	/* finding all bandwidths of used channels for FM notification */
-	ieee80211_iter_chan_contexts_atomic(g_mvm->hw,
-					    iwl_mvm_fm_chan_iterator,
-					    &chan_info);
-
-	iwl_mvm_fm_remove_channels(&winfo);
-
-	for (i = 0; i < winfo.num_channels; i++)
-		IWL_DEBUG_EXTERNAL(g_mvm,
-				   "FM: notifying fm about: channel=%d bandwith=%d\n",
-				   winfo.channel_info[i].frequency,
-				   winfo.channel_info[i].bandwidth);
-
-	/* Do not report to FM if no change happened */
-	if (!iwl_mvm_fm_channel_changed(&winfo))
-		return;
-
-	/* mark the change that we are reporting */
-	winfo.bitmask = WLAN_UPDATE;
-	/* Update the last notification to the FM */
-	memcpy(&last_chan_notif, &winfo, sizeof(struct iui_fm_wlan_info));
-
-	schedule_work(&fm_chan_notif_wk);
-}
-
-/*
- * Register the Frequency Mitigation Callback function implementation with
- * Frequency Manager to receive Frequency Mitigation messages from Frequency
- * Manager.
- */
-int iwl_mvm_fm_register(struct iwl_mvm *mvm)
-{
-	int ret;
-
-	if (g_mvm)
-		return -EINVAL;
-
-	g_mvm = mvm;
-	INIT_WORK(&fm_chan_notif_wk, iwl_mvm_fm_notif_chan_change_wk);
-
-#ifdef CPTCFG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES
-	debug_mode = g_mvm->trans->dbg_cfg.fm_debug_mode;
-#else
-	debug_mode = false;
-#endif
-
-	ret = iwl_mvm_fm_register_callback(debug_mode, IUI_FM_MACRO_ID_WLAN,
-					   iwl_mvm_fm_wlan_mitigation);
-
-	IWL_DEBUG_EXTERNAL(g_mvm,
-			   "FM: registering fm callback function (fail = %d)\n",
-			   ret);
-	if (ret)
-		g_mvm = NULL;
-
-	return ret ? -EINVAL : ret;
-}
-
-/*
- * Unregister the Frequency Mitigation Callback function implementation
- */
-int iwl_mvm_fm_unregister(struct iwl_mvm *mvm)
-{
-	int ret;
-
-	if (g_mvm != mvm)
-		return 0;
-
-	ret = iwl_mvm_fm_register_callback(debug_mode, IUI_FM_MACRO_ID_WLAN,
-					   NULL);
-
-	IWL_DEBUG_EXTERNAL(g_mvm,
-			   "FM: unregistering fm callback function (fail = %d)\n",
-			   ret);
-
-	cancel_work_sync(&fm_chan_notif_wk);
-	g_mvm = NULL;
-
-	return ret ? -EINVAL : ret;
-}
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fm-test.c b/drivers/net/wireless/intel/iwlwifi/mvm/fm-test.c
 deleted file mode 100644
index 385c92f..0000000
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fm-test.c
+++ /dev/null
@@ -1,264 +0,0 @@
-/******************************************************************************
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2013 - 2015 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * The full GNU General Public License is included in this distribution
- * in the file called COPYING.
- *
- * Contact Information:
- *  Intel Linux Wireless <[e-mail]>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2013 - 2015 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *  * Neither the name Intel Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *****************************************************************************/
-#include <linux/fm/iui_fm.h>
-#include <linux/kernel.h>
-#include <linux/debugfs.h>
-#include <linux/netdevice.h>
-
-/*
- * UT framework to debug Frequency Manager on any platform.
- *
- * The framework contains stub functions & debugfs entries so the iwlwifi driver
- * can run the FM code  without having an active FM in the background.
- *
- * FM--> iwlwifi driver API:
- * Done via debugfs entry: request the driver to mitigate its activity.
- * Through the debugfs the user can request driver to start tx power &
- * 2g coex mitigation.
- *
- * Iwlwfi driver-->FM API
- * Done via internal "stub" functions that will simulate the calls to the FM
- * If the debug mode is set, the calls to the real API functions are ignored,
- * and the stubs are called instead.
- *
- * To activate the FM debug mode you need to:
- * 1. Enable the IWLWIFI_FRQ_MGR_TEST config (it will enable by default the
- * IWLWIFI_FRQ_MGR config)
- * 2. add fm_debug_mode=0x1 in the file iwl-dbg-cfg.ini
- *
- * NOTE: If the platform does not have a FM then the ut will use the
- * include/linux/fm/iui_fm_test.h header file, otherwise it will use the
- * platform header file.
- */
-
-/* pointer to callback function in debug mode */
-static iui_fm_mitigation_cb fm_callback;
-static struct iui_fm_wlan_info fm_notif;
-static struct dentry *fm_debug_dir;
-
-static ssize_t
-iwl_mvm_fm_debug_mitigate_write(struct file *file,
-				const char __user *user_buf,
-				size_t count, loff_t *ppos)
-{
-	struct iui_fm_mitigation mitigation;
-	struct iui_fm_wlan_mitigation wm;
-	char buf[128];
-	size_t buf_size = sizeof(buf);
-	int mitigate_2g;
-	int ret;
-	int mitigate_dcdc;
-
-	mitigation.info.wlan_mitigation = &wm;
-	mitigation.type = IUI_FM_MITIGATION_TYPE_WLAN;
-
-	if (copy_from_user(buf, user_buf, buf_size))
-		return -EFAULT;
-
-	/* All platforms that are not xmm6321 & SOFIA 3G */
-	if (IUI_FM_WLAN_MAX_CHANNELS == 4) {
-		if (sscanf(buf, "%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d,%d",
-			   &wm.num_channels,
-			   &wm.channel_tx_pwr[0].frequency,
-			   &wm.channel_tx_pwr[0].max_tx_pwr,
-			   &wm.channel_tx_pwr[1].frequency,
-			   &wm.channel_tx_pwr[1].max_tx_pwr,
-			   &wm.channel_tx_pwr[2].frequency,
-			   &wm.channel_tx_pwr[2].max_tx_pwr,
-			   &wm.channel_tx_pwr[3].frequency,
-			   &wm.channel_tx_pwr[3].max_tx_pwr,
-			   &mitigate_dcdc,
-			   &wm.dcdc_div0,
-			   &wm.dcdc_div1,
-			   &mitigate_2g,
-			   &wm.wlan_2g_coex_enable) != 14)
-			return -EINVAL;
-	} else if (sscanf(buf, "%d,%d,%d,%d,%d", &wm.num_channels,
-			   &wm.channel_tx_pwr[0].frequency,
-			   &wm.channel_tx_pwr[0].max_tx_pwr,
-			   &wm.channel_tx_pwr[1].frequency,
-			   &wm.channel_tx_pwr[1].max_tx_pwr) != 5) {
-			return -EINVAL;
-	}
-
-	if (IUI_FM_WLAN_MAX_CHANNELS < wm.num_channels)
-		return -EINVAL;
-
-	wm.wlan_adc_dac_freq = 0;
-	wm.rx_gain_behavior = IUI_FM_WLAN_RX_GAIN_NORMAL;
-
-	wm.bitmask = 0;
-
-	/* Set bit bitmask to indicate the required mitigations */
-	if (wm.num_channels || mitigate_2g)
-		wm.bitmask |= WLAN_MITI;
-	if (mitigate_dcdc)
-		wm.bitmask |= DCDC_MITI;
-
-	ret = fm_callback(IUI_FM_MACRO_ID_WLAN, &mitigation, 0);
-	pr_info("FM[test-mode]: mitigation callback %s (bitmask = 0x%x)\n",
-		ret ? "failed" : "succeeded", wm.bitmask);
-
-	return count;
-}
-
-static ssize_t
-iwl_mvm_fm_debug_notify_read(struct file *file, char __user *userbuf,
-			     size_t count, loff_t *ppos)
-{
-	char buf[512];
-	int bufsz = sizeof(buf);
-	int pos = 0;
-	u8 i;
-
-	pos += scnprintf(buf + pos, bufsz - pos, "num_channels=%d\n",
-			 fm_notif.num_channels);
-	for (i = 0; i < fm_notif.num_channels; i++)
-		pos += scnprintf(buf + pos, bufsz - pos,
-				 "channel=%d, bandwidth=%d\n",
-				 fm_notif.channel_info[i].frequency,
-				 fm_notif.channel_info[i].bandwidth);
-
-	pos += scnprintf(buf + pos, bufsz - pos, "dcdc_div0=%d\n",
-			 fm_notif.dcdc_div0);
-	pos += scnprintf(buf + pos, bufsz - pos, "dcdc_div1=%d\n",
-			 fm_notif.dcdc_div1);
-
-	return simple_read_from_buffer(userbuf, count, ppos, buf, pos);
-}
-
-static const struct file_operations fm_debug_mitigate_ops = {
-	.write = iwl_mvm_fm_debug_mitigate_write,
-	.open = simple_open,
-	.llseek = generic_file_llseek,
-};
-
-static const struct file_operations fm_debug_notify_ops = {
-	.read = iwl_mvm_fm_debug_notify_read,
-	.open = simple_open,
-	.llseek = generic_file_llseek,
-};
-
-static int iwl_mvm_fm_create_debugfs(void)
-{
-	struct dentry *entry;
-
-	fm_debug_dir = debugfs_create_dir("frq_mgr", NULL);
-
-	if (!fm_debug_dir)
-		goto err;
-
-	entry = debugfs_create_file("mitigate", S_IWUSR, fm_debug_dir,
-				    NULL, &fm_debug_mitigate_ops);
-	if (!entry)
-		goto err;
-
-	entry = debugfs_create_file("notify", S_IRUSR, fm_debug_dir,
-				    NULL, &fm_debug_notify_ops);
-	if (!entry)
-		goto err;
-
-	return 0;
-err:
-	pr_info("FM: Could not create debugfs entries\n");
-	debugfs_remove_recursive(fm_debug_dir);
-	return -1;
-}
-
-int32_t
-iwl_mvm_fm_test_register_callback(const enum iui_fm_macro_id macro_id,
-				  const iui_fm_mitigation_cb mitigation_cb)
-{
-	int ret = 0;
-
-	fm_callback = mitigation_cb;
-
-	/* Unregister fm callback */
-	if (!mitigation_cb) {
-		debugfs_remove_recursive(fm_debug_dir);
-		goto end;
-	}
-
-	/* Register fm callback */
-	if (iwl_mvm_fm_create_debugfs()) {
-		ret = -1;
-		goto end;
-	}
-
-end:
-	pr_info("FM[test-mode]: %sregistering fm callback function (fail = %d)\n",
-		ret ? "un" : "", ret);
-	return ret;
-}
-
-int32_t
-iwl_mvm_fm_test_notify_frequency(const enum iui_fm_macro_id macro_id,
-				 const struct iui_fm_freq_notification *
-				 const notification)
-{
-	/* Platform does not have a FM or test mode was requested */
-	memcpy(&fm_notif, notification->info.wlan_info,
-	       sizeof(struct iui_fm_wlan_info));
-
-	pr_info("FM[test-mode]: notifying fm about change (mask = 0x%x)\n",
-		notification->info.wlan_info->bitmask);
-
-	return 0;
-}
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
index 8ce91d4..bb2ad8b 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/fw.c
@@ -1244,13 +1244,8 @@ static int iwl_mvm_load_rt_fw(struct iwl_mvm *mvm)
 	}
 
 	iwl_fw_dbg_stop_sync(&mvm->fwrt);
-	/*
-	 * Stop and start the transport without entering low power
-	 * mode. This will save the state of other components on the
-	 * device that are triggered by the INIT firwmare (MFUART).
-	 */
-	_iwl_trans_stop_device(mvm->trans, false);
-	ret = _iwl_trans_start_hw(mvm->trans, false);
+	iwl_trans_stop_device(mvm->trans);
+	ret = iwl_trans_start_hw(mvm->trans);
 	if (ret)
 		return ret;
 
@@ -1422,7 +1417,6 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
 			goto error;
 	}
 
-#ifdef CONFIG_THERMAL
 	if (iwl_mvm_is_tt_in_fw(mvm)) {
 		/* in order to give the responsibility of ct-kill and
 		 * TX backoff to FW we need to send empty temperature reporting
@@ -1434,6 +1428,7 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
 		iwl_mvm_tt_tx_backoff(mvm, 0);
 	}
 
+#ifdef CONFIG_THERMAL
 	/* TODO: read the budget from BIOS / Platform NVM */
 
 	/*
@@ -1446,9 +1441,6 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
 		if (ret)
 			goto error;
 	}
-#else
-	/* Initialize tx backoffs to the minimal possible */
-	iwl_mvm_tt_tx_backoff(mvm, 0);
 #endif
 
 	if (!fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_SET_LTR_GEN2))
@@ -1479,10 +1471,6 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
 	if (test_bit(IWL_MVM_STATUS_IN_HW_RESTART, &mvm->status))
 		iwl_mvm_send_recovery_cmd(mvm, ERROR_RECOVERY_UPDATE_DB);
 
-#ifdef CPTCFG_IWLWIFI_LTE_COEX
-	iwl_mvm_send_lte_commands(mvm);
-#endif
-
 #ifdef CPTCFG_IWLMVM_VENDOR_CMDS
 	/* set_mode must be IWL_TX_POWER_MODE_SET_DEVICE if this was
 	 * ever initialized.
@@ -1506,10 +1494,6 @@ int iwl_mvm_up(struct iwl_mvm *mvm)
 	}
 #endif
 
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR
-	iwl_mvm_fm_notify_current_dcdc();
-#endif
-
 	if (iwl_acpi_get_eckv(mvm->dev, &mvm->ext_clock_valid))
 		IWL_DEBUG_INFO(mvm, "ECKV table doesn't exist in BIOS\n");
 
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/lte-coex.h b/drivers/net/wireless/intel/iwlwifi/mvm/lte-coex.h
 deleted file mode 100644
index 5bf99ee..0000000
--- a/drivers/net/wireless/intel/iwlwifi/mvm/lte-coex.h
+++ /dev/null
@@ -1,125 +0,0 @@
-/******************************************************************************
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2014 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * The full GNU General Public License is included in this distribution
- * in the file called COPYING.
- *
- * Contact Information:
- *  Intel Linux Wireless <[e-mail]>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2014 Intel Corporation. All rights reserved.
- * Copyright(c) 2014 Intel Mobile Communications GmbH
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *  * Neither the name Intel Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *****************************************************************************/
-
-#ifndef __coex_h__
-#define __coex_h__
-
-#include <linux/types.h>
-
-/* LTE-Coex protocol user space commands */
-
-#define LTE_OFF	      0
-#define LTE_IDLE      1
-#define LTE_CONNECTED 2
-
-/* LTE-Coex error codes */
-
-#define LTE_OK 0
-/* LTE state machine violation */
-#define LTE_STATE_ERR 1
-#define LTE_ILLEGAL_PARAMS 2
-#define LTE_INVALID_DATA 3
-#define LTE_OTHER_ERR 4
-
-
-struct lte_coex_state_cmd {
-	__u8 lte_state;
-} __packed;
-
-#define LTE_MWS_CONF_LENGTH 12
-#define LTE_SAFE_PT_LENGTH 32
-#define LTE_SAFE_PT_FIRST -128
-#define LTE_SAFE_PT_LAST 127
-struct lte_coex_config_info_cmd {
-	__u32 mws_conf_data[LTE_MWS_CONF_LENGTH];
-	__s8 safe_power_table[LTE_SAFE_PT_LENGTH];
-} __packed;
-
-#define LTE_CONNECTED_BANDS_LENGTH 8
-#define LTE_FRAME_STRUCT_LENGTH 2
-#define LTE_TX_POWER_LENGTH 14
-#define LTE_FRQ_MIN 2400
-#define LTE_FRQ_MAX 2500
-#define LTE_MAX_TX_MIN 0
-#define LTE_MAX_TX_MAX 31
-struct lte_coex_dynamic_info_cmd {
-	__u32 lte_connected_bands[LTE_CONNECTED_BANDS_LENGTH];
-	__u32 lte_frame_structure[LTE_FRAME_STRUCT_LENGTH];
-	__u16 wifi_tx_safe_freq_min;
-	__u16 wifi_tx_safe_freq_max;
-	__u16 wifi_rx_safe_freq_min;
-	__u16 wifi_rx_safe_freq_max;
-	__u8 wifi_max_tx_power[LTE_TX_POWER_LENGTH];
-} __packed;
-
-struct lte_coex_sps_info_cmd {
-	__u32 sps_info;
-} __packed;
-
-#define LTE_RC_CHAN_MIN 1
-#define LTE_RC_CHAN_MAX 14
-#define LTE_RC_BW_MIN 0
-#define LTE_RC_BW_MAX 3
-struct lte_coex_wifi_reported_chan_cmd {
-	__u8 chan;
-	__u8 bandwidth;
-} __packed;
-
-#endif /* __coex_h__ */
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
index 9c26dd4..ebcacd1 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c
@@ -633,6 +633,8 @@ static int iwl_mvm_mac_ctxt_cmd_sta(struct iwl_mvm *mvm,
 	/* We need the dtim_period to set the MAC as associated */
 	if (vif->bss_conf.assoc && vif->bss_conf.dtim_period &&
 	    !force_assoc_off) {
+		struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
+		u8 ap_sta_id = mvmvif->ap_sta_id;
 		u32 dtim_offs;
 
 		/*
@@ -668,7 +670,29 @@ static int iwl_mvm_mac_ctxt_cmd_sta(struct iwl_mvm *mvm,
 			       dtim_offs);
 
 		ctxt_sta->is_assoc = cpu_to_le32(1);
-		cmd.filter_flags |= cpu_to_le32(MAC_FILTER_ACCEPT_GRP);
+
+		/*
+		 * allow multicast data frames only as long as the station is
+		 * authorized, i.e., GTK keys are already installed (if needed)
+		 */
+		if (ap_sta_id < IWL_MVM_STATION_COUNT) {
+			struct ieee80211_sta *sta;
+
+			rcu_read_lock();
+
+			sta = rcu_dereference(mvm->fw_id_to_mac_id[ap_sta_id]);
+			if (!IS_ERR_OR_NULL(sta)) {
+				struct iwl_mvm_sta *mvmsta =
+					iwl_mvm_sta_from_mac80211(sta);
+
+				if (mvmsta->sta_state ==
+				    IEEE80211_STA_AUTHORIZED)
+					cmd.filter_flags |=
+						cpu_to_le32(MAC_FILTER_ACCEPT_GRP);
+			}
+
+			rcu_read_unlock();
+		}
 	} else {
 		ctxt_sta->is_assoc = cpu_to_le32(0);
 
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
index 60a345c..c610056 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c
@@ -1124,15 +1124,6 @@ static void iwl_mvm_restart_cleanup(struct iwl_mvm *mvm)
 	mvm->ps_disabled = false;
 	mvm->rfkill_safe_init_done = false;
 
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR
-	/*
-	 * In case that 2g coex was enabled - and now the FW is being
-	 * restarted, we need to disable 2g coex mode in the driver as well
-	 * so that the fw & driver will be synced on the mode.
-	 */
-	mvm->coex_2g_enabled = false;
-#endif
-
 	/* just in case one was running */
 	iwl_mvm_cleanup_roc_te(mvm);
 	ieee80211_remain_on_channel_expired(mvm->hw);
@@ -1368,18 +1359,6 @@ static int iwl_mvm_set_tx_power(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 		.v5.v3.pwr_restriction = cpu_to_le16(8 * tx_power),
 	};
 
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR
-	struct iwl_mvm_vif *mvmvif = iwl_mvm_vif_from_mac80211(vif);
-
-	/*
-	 * if set Tx power request did not come from Frequency Manager(FM)
-	 * Take minimum between wanted Tx power to FM Tx power limit
-	 */
-	if (mvmvif->phy_ctxt && tx_power > mvmvif->phy_ctxt->fm_tx_power_limit)
-		cmd.v5.v3.pwr_restriction =
-			cpu_to_le16(mvmvif->phy_ctxt->fm_tx_power_limit);
-#endif
-
 	if (tx_power == IWL_DEFAULT_MAX_TX_POWER)
 		cmd.v5.v3.pwr_restriction = cpu_to_le16(IWL_DEV_MAX_TX_POWER);
 
@@ -1395,35 +1374,6 @@ static int iwl_mvm_set_tx_power(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 	return iwl_mvm_send_cmd_pdu(mvm, REDUCE_TX_POWER_CMD, 0, len, &cmd);
 }
 
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR
-int iwl_mvm_fm_set_tx_power(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
-			    s8 txpower)
-{
-	int ret;
-
-	mutex_lock(&mvm->mutex);
-	/* set Tx power to min between drivers limit and FM limit */
-	ret = iwl_mvm_set_tx_power(mvm, vif, min_t(s8, txpower,
-						   vif->bss_conf.txpower));
-	mutex_unlock(&mvm->mutex);
-	return ret;
-}
-
-/*
- * Updates Tx power limitation for the mac if FM has already limited
- * the Tx power on the channel that this mac is using.
- */
-static void iwl_mvm_update_ctx_tx_power_limit(struct iwl_mvm *mvm,
-					      struct ieee80211_vif *vif,
-					      struct iwl_mvm_phy_ctxt *phy_ctxt)
-{
-	/* Tx power has not been limited by FM */
-	if (phy_ctxt->fm_tx_power_limit == IWL_DEFAULT_MAX_TX_POWER)
-		return;
-	iwl_mvm_set_tx_power(mvm, vif, phy_ctxt->fm_tx_power_limit);
-}
-#endif
-
 static int iwl_mvm_post_channel_switch(struct ieee80211_hw *hw,
 				       struct ieee80211_vif *vif)
 {
@@ -1620,10 +1570,6 @@ static int iwl_mvm_mac_add_interface(struct ieee80211_hw *hw,
 		if (ret)
 			goto out_unref_phy;
 
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR
-		iwl_mvm_update_ctx_tx_power_limit(mvm, vif, mvmvif->phy_ctxt);
-#endif
-
 		ret = iwl_mvm_add_p2p_bcast_sta(mvm, vif);
 		if (ret)
 			goto out_unbind;
@@ -2647,10 +2593,6 @@ static int iwl_mvm_start_ap_ibss(struct ieee80211_hw *hw,
 	if (ret)
 		goto out_remove;
 
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR
-	iwl_mvm_update_ctx_tx_power_limit(mvm, vif, mvmvif->phy_ctxt);
-#endif
-
 	/*
 	 * This is not very nice, but the simplest:
 	 * For older FWs adding the mcast sta before the bcast station may
@@ -3323,10 +3265,20 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,
 		/* enable beacon filtering */
 		WARN_ON(iwl_mvm_enable_beacon_filter(mvm, vif, 0));
 
+		/*
+		 * Now that the station is authorized, i.e., keys were already
+		 * installed, need to indicate to the FW that
+		 * multicast data frames can be forwarded to the driver
+		 */
+		iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);
+
 		iwl_mvm_rs_rate_init(mvm, sta, mvmvif->phy_ctxt->channel->band,
 				     true);
 	} else if (old_state == IEEE80211_STA_AUTHORIZED &&
 		   new_state == IEEE80211_STA_ASSOC) {
+		/* Multicast data frames are no longer allowed */
+		iwl_mvm_mac_ctxt_changed(mvm, vif, false, NULL);
+
 		/* disable beacon filtering */
 		ret = iwl_mvm_disable_beacon_filter(mvm, vif, 0);
 		WARN_ON(ret &&
@@ -4083,10 +4035,6 @@ static int __iwl_mvm_add_chanctx(struct iwl_mvm *mvm,
 	iwl_mvm_phy_ctxt_ref(mvm, phy_ctxt);
 	*phy_ctxt_id = phy_ctxt->id;
 
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR
-	iwl_mvm_fm_notify_channel_change(ctx, IWL_FM_ADD_CHANCTX);
-#endif
-
 out:
 	return ret;
 }
@@ -4113,9 +4061,6 @@ static void __iwl_mvm_remove_chanctx(struct iwl_mvm *mvm,
 	lockdep_assert_held(&mvm->mutex);
 
 	iwl_mvm_phy_ctxt_unref(mvm, phy_ctxt);
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR
-	iwl_mvm_fm_notify_channel_change(ctx, IWL_FM_REMOVE_CHANCTX);
-#endif
 }
 
 static void iwl_mvm_remove_chanctx(struct ieee80211_hw *hw,
@@ -4164,9 +4109,6 @@ static void iwl_mvm_change_chanctx(struct ieee80211_hw *hw,
 	iwl_mvm_phy_ctxt_changed(mvm, phy_ctxt, def,
 				 ctx->rx_chains_static,
 				 ctx->rx_chains_dynamic);
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR
-	iwl_mvm_fm_notify_channel_change(ctx, IWL_FM_CHANGE_CHANCTX);
-#endif
 
 out_unlock:
 	mutex_unlock(&mvm->mutex);
@@ -4217,10 +4159,6 @@ static int __iwl_mvm_assign_vif_chanctx(struct iwl_mvm *mvm,
 	if (ret)
 		goto out;
 
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR
-	iwl_mvm_update_ctx_tx_power_limit(mvm, vif, mvmvif->phy_ctxt);
-#endif
-
 	/*
 	 * Power state must be updated before quotas,
 	 * otherwise fw will complain.
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
index 372e86e..e140a1f 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/mvm.h
@@ -89,10 +89,6 @@
 #include "fw/acpi.h"
 #include "iwl-nvm-parse.h"
 
-#ifdef CPTCFG_IWLWIFI_LTE_COEX
-#include "lte-coex.h"
-#endif
-
 #include <linux/average.h>
 
 #define IWL_MVM_MAX_ADDRESSES		5
@@ -162,10 +158,6 @@ struct iwl_mvm_phy_ctxt {
 	 */
 	struct ieee80211_channel *channel;
 
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR
-	/* Frequency Manager tx power limit*/
-	s8 fm_tx_power_limit;
-#endif
 };
 
 struct iwl_mvm_time_event_data {
@@ -598,24 +590,6 @@ struct iwl_mvm_frame_stats {
 	int last_frame_idx;
 };
 
-#ifdef CPTCFG_IWLWIFI_LTE_COEX
-struct lte_coex_state {
-	u8 state;
-
-	bool has_static;
-	bool has_config;
-	bool has_sps;
-	bool has_rprtd_chan;
-	bool has_ft;
-
-	struct iwl_lte_coex_static_params_cmd stat;
-	struct iwl_lte_coex_config_cmd config;
-	struct iwl_lte_coex_sps_cmd sps;
-	struct iwl_lte_coex_wifi_reported_channel_cmd rprtd_chan;
-	struct iwl_lte_coex_fine_tuning_params_cmd ft;
-};
-#endif
-
 #define IWL_MVM_DEBUG_SET_TEMPERATURE_DISABLE 0xff
 #define IWL_MVM_DEBUG_SET_TEMPERATURE_MIN -100
 #define IWL_MVM_DEBUG_SET_TEMPERATURE_MAX 200
@@ -1062,6 +1036,7 @@ struct iwl_mvm {
 	struct ieee80211_channel **nd_channels;
 	int n_nd_channels;
 	bool net_detect;
+	u8 offload_tid;
 #ifdef CPTCFG_IWLWIFI_DEBUGFS
 	bool d3_wake_sysassert;
 	bool d3_test_active;
@@ -1080,17 +1055,9 @@ struct iwl_mvm {
 	u8 bt_tx_prio;
 	enum iwl_bt_force_ant_mode bt_force_ant_mode;
 
-#ifdef CPTCFG_IWLWIFI_LTE_COEX
-	/* LTE-Coex */
-	struct lte_coex_state lte_state;
-#endif
 	/* Aux ROC */
 	struct list_head aux_roc_te_list;
 
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR
-	/* 2G-Coex */
-	bool coex_2g_enabled;
-#endif
 	/* Thermal Throttling and CTkill */
 	struct iwl_mvm_tt_mgmt thermal_throttle;
 #ifdef CONFIG_THERMAL
@@ -1519,6 +1486,12 @@ static inline bool iwl_mvm_is_reduced_config_scan_supported(struct iwl_mvm *mvm)
 			  IWL_UCODE_TLV_API_REDUCED_SCAN_CONFIG);
 }
 
+static inline bool iwl_mvm_is_scan_ext_chan_supported(struct iwl_mvm *mvm)
+{
+	return fw_has_api(&mvm->fw->ucode_capa,
+			  IWL_UCODE_TLV_API_SCAN_EXT_CHAN_VER);
+}
+
 static inline bool iwl_mvm_has_new_rx_stats_api(struct iwl_mvm *mvm)
 {
 	return fw_has_api(&mvm->fw->ucode_capa,
@@ -1548,7 +1521,6 @@ iwl_mvm_get_agg_status(struct iwl_mvm *mvm, void *tx_resp)
 
 static inline bool iwl_mvm_is_tt_in_fw(struct iwl_mvm *mvm)
 {
-#ifdef CONFIG_THERMAL
 	/* these two TLV are redundant since the responsibility to CT-kill by
 	 * FW happens only after we send at least one command of
 	 * temperature THs report.
@@ -1557,9 +1529,6 @@ static inline bool iwl_mvm_is_tt_in_fw(struct iwl_mvm *mvm)
 			   IWL_UCODE_TLV_CAPA_CT_KILL_BY_FW) &&
 	       fw_has_capa(&mvm->fw->ucode_capa,
 			   IWL_UCODE_TLV_CAPA_TEMP_THS_REPORT_SUPPORT);
-#else /* CONFIG_THERMAL */
-	return false;
-#endif /* CONFIG_THERMAL */
 }
 
 static inline bool iwl_mvm_is_ctdp_supported(struct iwl_mvm *mvm)
@@ -2087,27 +2056,6 @@ void iwl_mvm_enter_ctkill(struct iwl_mvm *mvm);
 int iwl_mvm_send_temp_report_ths_cmd(struct iwl_mvm *mvm);
 int iwl_mvm_ctdp_command(struct iwl_mvm *mvm, u32 op, u32 budget);
 
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR
-/* Frequency Manager */
-#define FM_2G_COEX_ENABLE_DISABLE 0xFFFFFFFF
-#define FM_2G_COEX_ENABLE -100
-#define FM_2G_COEX_DISABLE 25
-
-enum iwl_fm_chan_change_action {
-	IWL_FM_ADD_CHANCTX = 0,
-	IWL_FM_REMOVE_CHANCTX = 1,
-	IWL_FM_CHANGE_CHANCTX = 2,
-};
-
-int iwl_mvm_fm_set_tx_power(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
-			    s8 txpower);
-void iwl_mvm_fm_notify_channel_change(struct ieee80211_chanctx_conf *ctx,
-				      enum iwl_fm_chan_change_action action);
-void iwl_mvm_fm_notify_current_dcdc(void);
-int iwl_mvm_fm_register(struct iwl_mvm *mvm);
-int iwl_mvm_fm_unregister(struct iwl_mvm *mvm);
-#endif
-
 /* Location Aware Regulatory */
 struct iwl_mcc_update_resp *
 iwl_mvm_update_mcc(struct iwl_mvm *mvm, const char *alpha2,
@@ -2205,16 +2153,6 @@ void iwl_mvm_tcm_add_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
 void iwl_mvm_tcm_rm_vif(struct iwl_mvm *mvm, struct ieee80211_vif *vif);
 u8 iwl_mvm_tcm_load_percentage(u32 airtime, u32 elapsed);
 
-#ifdef CPTCFG_IWLWIFI_LTE_COEX
-int iwl_mvm_send_lte_coex_static_params_cmd(struct iwl_mvm *mvm);
-int iwl_mvm_send_lte_coex_config_cmd(struct iwl_mvm *mvm);
-int iwl_mvm_send_lte_coex_wifi_reported_channel_cmd(struct iwl_mvm *mvm);
-int iwl_mvm_send_lte_sps_cmd(struct iwl_mvm *mvm);
-int iwl_mvm_send_lte_fine_tuning_params_cmd(struct iwl_mvm *mvm);
-void iwl_mvm_reset_lte_state(struct iwl_mvm *mvm);
-void iwl_mvm_send_lte_commands(struct iwl_mvm *mvm);
-#endif
-
 void iwl_mvm_nic_restart(struct iwl_mvm *mvm, bool fw_error);
 unsigned int iwl_mvm_get_wd_timeout(struct iwl_mvm *mvm,
 				    struct ieee80211_vif *vif,
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
index 018d6e0..ca25c5c 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/ops.c
@@ -399,21 +399,12 @@ static const struct iwl_hcmd_names iwl_mvm_legacy_names[] = {
 	HCMD_NAME(TIME_QUOTA_CMD),
 	HCMD_NAME(NON_QOS_TX_COUNTER_CMD),
 	HCMD_NAME(LEDS_CMD),
-#ifdef CPTCFG_IWLWIFI_LTE_COEX
-	HCMD_NAME(LTE_COEX_CONFIG_CMD),
-	HCMD_NAME(LTE_COEX_WIFI_REPORTED_CHANNEL_CMD),
-	HCMD_NAME(LTE_COEX_STATIC_PARAMS_CMD),
-	HCMD_NAME(LTE_COEX_SPS_CMD),
-#endif
 	HCMD_NAME(LQ_CMD),
 	HCMD_NAME(FW_PAGING_BLOCK_CMD),
 	HCMD_NAME(SCAN_OFFLOAD_REQUEST_CMD),
 	HCMD_NAME(SCAN_OFFLOAD_ABORT_CMD),
 	HCMD_NAME(HOT_SPOT_CMD),
 	HCMD_NAME(SCAN_OFFLOAD_PROFILES_QUERY_CMD),
-#ifdef CPTCFG_IWLWIFI_LTE_COEX
-	HCMD_NAME(LTE_COEX_FINE_TUNING_PARAMS_CMD),
-#endif
 	HCMD_NAME(BT_COEX_UPDATE_REDUCED_TXP),
 	HCMD_NAME(BT_COEX_CI),
 	HCMD_NAME(PHY_CONFIGURATION_CMD),
@@ -1024,12 +1015,6 @@ iwl_op_mode_mvm_start(struct iwl_trans *trans, const struct iwl_cfg *cfg,
 	else
 		memset(&mvm->rx_stats, 0, sizeof(struct mvm_statistics_rx));
 
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR
-	err = iwl_mvm_fm_register(mvm);
-	if (err)
-		pr_err("Unable to register with Frequency Manager: %d\n", err);
-#endif
-
 #ifdef CPTCFG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES
 	iwl_mvm_init_modparams(mvm);
 #endif
@@ -1066,10 +1051,6 @@ static void iwl_op_mode_mvm_stop(struct iwl_op_mode *op_mode)
 
 	ieee80211_unregister_hw(mvm->hw);
 
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR
-	iwl_mvm_fm_unregister(mvm);
-#endif
-
 	kfree(mvm->scan_cmd);
 	kfree(mvm->mcast_filter_cmd);
 	mvm->mcast_filter_cmd = NULL;
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c b/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c
index cd5ff55..9925616 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c
@@ -7,8 +7,8 @@
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
- * Copyright(c) 2017           Intel Deutschland GmbH
- * Copyright(c) 2018           Intel Corporation
+ * Copyright(c) 2017        Intel Deutschland GmbH
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -30,7 +30,7 @@
  *
  * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH
- * Copyright(c) 2018           Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -221,10 +221,6 @@ int iwl_mvm_phy_ctxt_add(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt,
 
 	ctxt->channel = chandef->chan;
 
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR
-	ctxt->fm_tx_power_limit = IWL_DEFAULT_MAX_TX_POWER;
-#endif
-
 	return iwl_mvm_phy_ctxt_apply(mvm, ctxt, chandef,
 				      chains_static, chains_dynamic,
 				      FW_CTXT_ACTION_ADD, 0);
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c b/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c
index 4a7b1e6..761a3e6 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c
@@ -193,7 +193,7 @@ rs_fw_vht_set_enabled_rates(const struct ieee80211_sta *sta,
 	int i, highest_mcs;
 
 	for (i = 0; i < sta->rx_nss; i++) {
-		if (i == MAX_NSS)
+		if (i == IWL_TLC_NSS_MAX)
 			break;
 
 		highest_mcs = rs_fw_vht_highest_rx_mcs_index(vht_cap, i + 1);
@@ -204,9 +204,10 @@ rs_fw_vht_set_enabled_rates(const struct ieee80211_sta *sta,
 		if (sta->bandwidth == IEEE80211_STA_RX_BW_20)
 			supp &= ~BIT(IWL_TLC_MNG_HT_RATE_MCS9);
 
-		cmd->ht_rates[i][0] = cpu_to_le16(supp);
+		cmd->ht_rates[i][IWL_TLC_HT_BW_NONE_160] = cpu_to_le16(supp);
 		if (sta->bandwidth == IEEE80211_STA_RX_BW_160)
-			cmd->ht_rates[i][1] = cmd->ht_rates[i][0];
+			cmd->ht_rates[i][IWL_TLC_HT_BW_160] =
+				cmd->ht_rates[i][IWL_TLC_HT_BW_NONE_160];
 	}
 }
 
@@ -241,7 +242,7 @@ rs_fw_he_set_enabled_rates(const struct ieee80211_sta *sta,
 		le16_to_cpu(sband->iftype_data->he_cap.he_mcs_nss_supp.tx_mcs_160);
 	int i;
 
-	for (i = 0; i < sta->rx_nss && i < MAX_NSS; i++) {
+	for (i = 0; i < sta->rx_nss && i < IWL_TLC_NSS_MAX; i++) {
 		u16 _mcs_160 = (mcs_160 >> (2 * i)) & 0x3;
 		u16 _mcs_80 = (mcs_80 >> (2 * i)) & 0x3;
 		u16 _tx_mcs_160 = (tx_mcs_160 >> (2 * i)) & 0x3;
@@ -255,7 +256,7 @@ rs_fw_he_set_enabled_rates(const struct ieee80211_sta *sta,
 		}
 		if (_mcs_80 > _tx_mcs_80)
 			_mcs_80 = _tx_mcs_80;
-		cmd->ht_rates[i][0] =
+		cmd->ht_rates[i][IWL_TLC_HT_BW_NONE_160] =
 			cpu_to_le16(rs_fw_he_ieee80211_mcs_to_rs_mcs(_mcs_80));
 
 		/* If one side doesn't support - mark both as not supporting */
@@ -266,7 +267,7 @@ rs_fw_he_set_enabled_rates(const struct ieee80211_sta *sta,
 		}
 		if (_mcs_160 > _tx_mcs_160)
 			_mcs_160 = _tx_mcs_160;
-		cmd->ht_rates[i][1] =
+		cmd->ht_rates[i][IWL_TLC_HT_BW_160] =
 			cpu_to_le16(rs_fw_he_ieee80211_mcs_to_rs_mcs(_mcs_160));
 	}
 }
@@ -300,8 +301,10 @@ static void rs_fw_set_supp_rates(struct ieee80211_sta *sta,
 		rs_fw_vht_set_enabled_rates(sta, vht_cap, cmd);
 	} else if (ht_cap->ht_supported) {
 		cmd->mode = IWL_TLC_MNG_MODE_HT;
-		cmd->ht_rates[0][0] = cpu_to_le16(ht_cap->mcs.rx_mask[0]);
-		cmd->ht_rates[1][0] = cpu_to_le16(ht_cap->mcs.rx_mask[1]);
+		cmd->ht_rates[IWL_TLC_NSS_1][IWL_TLC_HT_BW_NONE_160] =
+			cpu_to_le16(ht_cap->mcs.rx_mask[0]);
+		cmd->ht_rates[IWL_TLC_NSS_2][IWL_TLC_HT_BW_NONE_160] =
+			cpu_to_le16(ht_cap->mcs.rx_mask[1]);
 	}
 }
 
@@ -433,6 +436,16 @@ void rs_fw_rate_init(struct iwl_mvm *mvm, struct ieee80211_sta *sta,
 	iwl_mvm_reset_frame_stats(mvm);
 #endif
 	rs_fw_set_supp_rates(sta, sband, &cfg_cmd);
+#ifdef CPTCFG_IWLWIFI_SUPPORT_DEBUG_OVERRIDES
+	/*
+	 * if AP disables mimo on 160bw (cmd->ht_rates[1][1] == 0
+	 * we disable mimo on 80bw cmd->ht_rates[1][0]
+	 */
+	if (mvm->trans->dbg_cfg.tx_siso_80bw_like_160bw &&
+	    !cfg_cmd.ht_rates[1][1])
+		cfg_cmd.ht_rates[1][0] = 0;
+
+#endif
 
 	/*
 	 * since TLC offload works with one mode we can assume
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
index 446d523..4acee82 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/scan.c
@@ -77,7 +77,10 @@
 #define IWL_SCAN_DWELL_FRAGMENTED	44
 #define IWL_SCAN_DWELL_EXTENDED		90
 #define IWL_SCAN_NUM_OF_FRAGS		3
+#define IWL_SCAN_LAST_2_4_CHN		14
 
+#define IWL_SCAN_BAND_5_2		0
+#define IWL_SCAN_BAND_2_4		1
 
 /* adaptive dwell max budget time [TU] for full scan */
 #define IWL_SCAN_ADWELL_MAX_BUDGET_FULL_SCAN 300
@@ -956,11 +959,24 @@ static int iwl_mvm_scan_lmac_flags(struct iwl_mvm *mvm,
 	return flags;
 }
 
+static void
+iwl_mvm_scan_set_legacy_probe_req(struct iwl_scan_probe_req_v1 *p_req,
+				  struct iwl_scan_probe_req *src_p_req)
+{
+	int i;
+
+	p_req->mac_header = src_p_req->mac_header;
+	for (i = 0; i < SCAN_NUM_BAND_PROBE_DATA_V_1; i++)
+		p_req->band_data[i] = src_p_req->band_data[i];
+	p_req->common_data = src_p_req->common_data;
+	memcpy(p_req->buf, src_p_req->buf, sizeof(p_req->buf));
+}
+
 static int iwl_mvm_scan_lmac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 			     struct iwl_mvm_scan_params *params)
 {
 	struct iwl_scan_req_lmac *cmd = mvm->scan_cmd;
-	struct iwl_scan_probe_req *preq =
+	struct iwl_scan_probe_req_v1 *preq =
 		(void *)(cmd->data + sizeof(struct iwl_scan_channel_cfg_lmac) *
 			 mvm->fw->ucode_capa.n_scan_channels);
 	u32 ssid_bitmap = 0;
@@ -1030,7 +1046,7 @@ static int iwl_mvm_scan_lmac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 	iwl_mvm_lmac_scan_cfg_channels(mvm, params->channels,
 				       params->n_channels, ssid_bitmap, cmd);
 
-	*preq = params->preq;
+	iwl_mvm_scan_set_legacy_probe_req(preq, &params->preq);
 
 	return 0;
 }
@@ -1408,9 +1424,17 @@ iwl_mvm_umac_scan_cfg_channels(struct iwl_mvm *mvm,
 
 	for (i = 0; i < n_channels; i++) {
 		channel_cfg[i].flags = cpu_to_le32(ssid_bitmap);
-		channel_cfg[i].channel_num = channels[i]->hw_value;
-		channel_cfg[i].iter_count = 1;
-		channel_cfg[i].iter_interval = 0;
+		channel_cfg[i].v1.channel_num = channels[i]->hw_value;
+		if (iwl_mvm_is_scan_ext_chan_supported(mvm)) {
+			channel_cfg[i].v2.band =
+				channels[i]->hw_value <= IWL_SCAN_LAST_2_4_CHN ?
+					IWL_SCAN_BAND_2_4 : IWL_SCAN_BAND_5_2;
+			channel_cfg[i].v2.iter_count = 1;
+			channel_cfg[i].v2.iter_interval = 0;
+		} else {
+			channel_cfg[i].v1.iter_count = 1;
+			channel_cfg[i].v1.iter_interval = 0;
+		}
 	}
 }
 
@@ -1500,9 +1524,12 @@ static int iwl_mvm_scan_umac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 	struct iwl_scan_req_umac *cmd = mvm->scan_cmd;
 	struct iwl_scan_umac_chan_param *chan_param;
 	void *cmd_data = iwl_mvm_get_scan_req_umac_data(mvm);
-	struct iwl_scan_req_umac_tail *sec_part = cmd_data +
-		sizeof(struct iwl_scan_channel_cfg_umac) *
-			mvm->fw->ucode_capa.n_scan_channels;
+	void *sec_part = cmd_data + sizeof(struct iwl_scan_channel_cfg_umac) *
+		mvm->fw->ucode_capa.n_scan_channels;
+	struct iwl_scan_req_umac_tail_v2 *tail_v2 =
+		(struct iwl_scan_req_umac_tail_v2 *)sec_part;
+	struct iwl_scan_req_umac_tail_v1 *tail_v1;
+	struct iwl_ssid_ie *direct_scan;
 	int uid, i;
 	u32 ssid_bitmap = 0;
 	u8 channel_flags = 0;
@@ -1564,18 +1591,12 @@ static int iwl_mvm_scan_umac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 	chan_param->flags = channel_flags;
 	chan_param->count = params->n_channels;
 
-	iwl_scan_build_ssids(params, sec_part->direct_scan, &ssid_bitmap);
-
-	iwl_mvm_umac_scan_cfg_channels(mvm, params->channels,
-				       params->n_channels, ssid_bitmap,
-				       cmd_data);
-
 	for (i = 0; i < params->n_scan_plans; i++) {
 		struct cfg80211_sched_scan_plan *scan_plan =
 			&params->scan_plans[i];
 
-		sec_part->schedule[i].iter_count = scan_plan->iterations;
-		sec_part->schedule[i].interval =
+		tail_v2->schedule[i].iter_count = scan_plan->iterations;
+		tail_v2->schedule[i].interval =
 			cpu_to_le16(scan_plan->interval);
 	}
 
@@ -1585,12 +1606,24 @@ static int iwl_mvm_scan_umac(struct iwl_mvm *mvm, struct ieee80211_vif *vif,
 	 * For example, when regular scan is requested the driver sets one scan
 	 * plan with one iteration.
 	 */
-	if (!sec_part->schedule[i - 1].iter_count)
-		sec_part->schedule[i - 1].iter_count = 0xff;
+	if (!tail_v2->schedule[i - 1].iter_count)
+		tail_v2->schedule[i - 1].iter_count = 0xff;
 
-	sec_part->delay = cpu_to_le16(params->delay);
-	sec_part->preq = params->preq;
+	tail_v2->delay = cpu_to_le16(params->delay);
 
+	if (iwl_mvm_is_scan_ext_chan_supported(mvm)) {
+		tail_v2->preq = params->preq;
+		direct_scan = tail_v2->direct_scan;
+	} else {
+		tail_v1 = (struct iwl_scan_req_umac_tail_v1 *)sec_part;
+		iwl_mvm_scan_set_legacy_probe_req(&tail_v1->preq,
+						  &params->preq);
+		direct_scan = tail_v1->direct_scan;
+	}
+	iwl_scan_build_ssids(params, direct_scan, &ssid_bitmap);
+	iwl_mvm_umac_scan_cfg_channels(mvm, params->channels,
+				       params->n_channels, ssid_bitmap,
+				       cmd_data);
 	return 0;
 }
 
@@ -2020,6 +2053,7 @@ static int iwl_mvm_scan_stop_wait(struct iwl_mvm *mvm, int type)
 int iwl_mvm_scan_size(struct iwl_mvm *mvm)
 {
 	int base_size = IWL_SCAN_REQ_UMAC_SIZE_V1;
+	int tail_size;
 
 	if (iwl_mvm_is_adaptive_dwell_v2_supported(mvm))
 		base_size = IWL_SCAN_REQ_UMAC_SIZE_V8;
@@ -2028,16 +2062,21 @@ int iwl_mvm_scan_size(struct iwl_mvm *mvm)
 	else if (iwl_mvm_cdb_scan_api(mvm))
 		base_size = IWL_SCAN_REQ_UMAC_SIZE_V6;
 
-	if (fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_UMAC_SCAN))
+	if (fw_has_capa(&mvm->fw->ucode_capa, IWL_UCODE_TLV_CAPA_UMAC_SCAN)) {
+		if (iwl_mvm_is_scan_ext_chan_supported(mvm))
+			tail_size = sizeof(struct iwl_scan_req_umac_tail_v2);
+		else
+			tail_size = sizeof(struct iwl_scan_req_umac_tail_v1);
+
 		return base_size +
 			sizeof(struct iwl_scan_channel_cfg_umac) *
 				mvm->fw->ucode_capa.n_scan_channels +
-			sizeof(struct iwl_scan_req_umac_tail);
-
+			tail_size;
+	}
 	return sizeof(struct iwl_scan_req_lmac) +
 		sizeof(struct iwl_scan_channel_cfg_lmac) *
 		mvm->fw->ucode_capa.n_scan_channels +
-		sizeof(struct iwl_scan_probe_req);
+		sizeof(struct iwl_scan_probe_req_v1);
 }
 
 /*
diff --git a/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c b/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c
index 7cf15d1..c3ab21b 100644
--- a/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c
+++ b/drivers/net/wireless/intel/iwlwifi/mvm/vendor-cmd.c
@@ -67,10 +67,6 @@
 #include "mvm.h"
 #include "iwl-vendor-cmd.h"
 
-#ifdef CPTCFG_IWLWIFI_LTE_COEX
-#include "lte-coex.h"
-#endif
-
 #include "iwl-io.h"
 #include "iwl-prph.h"
 
@@ -267,360 +263,6 @@ free:
 	return retval;
 }
 
-#ifdef CPTCFG_IWLWIFI_LTE_COEX
-static int iwl_vendor_lte_coex_state_cmd(struct wiphy *wiphy,
-					 struct wireless_dev *wdev,
-					 const void *data, int data_len)
-{
-	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
-	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
-	const struct lte_coex_state_cmd *cmd = data;
-	struct sk_buff *skb;
-	int err = LTE_OK;
-
-	skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, 100);
-	if (!skb)
-		return -ENOMEM;
-
-	if (data_len != sizeof(*cmd)) {
-		err = LTE_INVALID_DATA;
-		goto out;
-	}
-
-	IWL_DEBUG_COEX(mvm, "LTE-COEX: state cmd:\n\tstate: %d\n",
-		       cmd->lte_state);
-
-	switch (cmd->lte_state) {
-	case LTE_OFF:
-		if (mvm->lte_state.has_config &&
-		    mvm->lte_state.state != LTE_CONNECTED) {
-			err = LTE_STATE_ERR;
-			goto out;
-		}
-		mvm->lte_state.state = LTE_OFF;
-		mvm->lte_state.has_config = 0;
-		mvm->lte_state.has_rprtd_chan = 0;
-		mvm->lte_state.has_sps = 0;
-		mvm->lte_state.has_ft = 0;
-		break;
-	case LTE_IDLE:
-		if (!mvm->lte_state.has_static ||
-		    (mvm->lte_state.has_config &&
-		     mvm->lte_state.state != LTE_CONNECTED)) {
-			err = LTE_STATE_ERR;
-			goto out;
-		}
-		mvm->lte_state.has_config = 0;
-		mvm->lte_state.has_sps = 0;
-		mvm->lte_state.state = LTE_IDLE;
-		break;
-	case LTE_CONNECTED:
-		if (!(mvm->lte_state.has_config)) {
-			err = LTE_STATE_ERR;
-			goto out;
-		}
-		mvm->lte_state.state = LTE_CONNECTED;
-		break;
-	default:
-		err = LTE_ILLEGAL_PARAMS;
-		goto out;
-	}
-
-	mvm->lte_state.config.lte_state = cpu_to_le32(mvm->lte_state.state);
-
-	mutex_lock(&mvm->mutex);
-	if (iwl_mvm_send_lte_coex_config_cmd(mvm))
-		err = LTE_OTHER_ERR;
-	mutex_unlock(&mvm->mutex);
-
-out:
-	if (err)
-		iwl_mvm_reset_lte_state(mvm);
-
-	if (nla_put_u8(skb, NLA_BINARY, err)) {
-		kfree_skb(skb);
-		return -ENOBUFS;
-	}
-
-	return cfg80211_vendor_cmd_reply(skb);
-}
-
-static int iwl_vendor_lte_coex_config_cmd(struct wiphy *wiphy,
-					  struct wireless_dev *wdev,
-					  const void *data, int data_len)
-{
-	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
-	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
-	const struct lte_coex_config_info_cmd *cmd = data;
-	struct iwl_lte_coex_static_params_cmd *stat = &mvm->lte_state.stat;
-	struct sk_buff *skb;
-	int err = LTE_OK;
-	int i, j;
-
-	skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, 100);
-	if (!skb)
-		return -ENOMEM;
-
-	if (data_len != sizeof(*cmd)) {
-		err = LTE_INVALID_DATA;
-		goto out;
-	}
-
-	IWL_DEBUG_COEX(mvm, "LTE-COEX: config cmd:\n");
-
-	/* send static config only once in the FW life */
-	if (mvm->lte_state.has_static)
-		goto out;
-
-	for (i = 0; i < LTE_MWS_CONF_LENGTH; i++) {
-		IWL_DEBUG_COEX(mvm, "\tmws config data[%d]: %d\n", i,
-			       cmd->mws_conf_data[i]);
-		stat->mfu_config[i] = cpu_to_le32(cmd->mws_conf_data[i]);
-	}
-
-	if (cmd->safe_power_table[0] != LTE_SAFE_PT_FIRST ||
-	    cmd->safe_power_table[LTE_SAFE_PT_LENGTH - 1] !=
-							LTE_SAFE_PT_LAST) {
-		err = LTE_ILLEGAL_PARAMS;
-		goto out;
-	}
-
-	/* power table must be ascending ordered */
-	j = LTE_SAFE_PT_FIRST;
-	for (i = 0; i < LTE_SAFE_PT_LENGTH; i++) {
-		IWL_DEBUG_COEX(mvm, "\tsafe power table[%d]: %d\n", i,
-			       cmd->safe_power_table[i]);
-		if (cmd->safe_power_table[i] < j) {
-			err = LTE_ILLEGAL_PARAMS;
-			goto out;
-		}
-		j = cmd->safe_power_table[i];
-		stat->tx_power_in_dbm[i] = cmd->safe_power_table[i];
-	}
-
-	mutex_lock(&mvm->mutex);
-	if (iwl_mvm_send_lte_coex_static_params_cmd(mvm))
-		err = LTE_OTHER_ERR;
-	else
-		mvm->lte_state.has_static = 1;
-	mutex_unlock(&mvm->mutex);
-
-out:
-	if (err)
-		iwl_mvm_reset_lte_state(mvm);
-
-	if (nla_put_u8(skb, NLA_BINARY, err)) {
-		kfree_skb(skb);
-		return -ENOBUFS;
-	}
-
-	return cfg80211_vendor_cmd_reply(skb);
-}
-
-static int in_range(int val, int min, int max)
-{
-	return (val >= min) && (val <= max);
-}
-
-static bool is_valid_lte_range(u16 min, u16 max)
-{
-	return (min == 0 && max == 0) ||
-	       (max >= min &&
-		in_range(min, LTE_FRQ_MIN, LTE_FRQ_MAX) &&
-		in_range(max, LTE_FRQ_MIN, LTE_FRQ_MAX));
-}
-
-static int iwl_vendor_lte_coex_dynamic_info_cmd(struct wiphy *wiphy,
-						struct wireless_dev *wdev,
-						const void *data, int data_len)
-{
-	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
-	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
-	const struct lte_coex_dynamic_info_cmd *cmd = data;
-	struct iwl_lte_coex_config_cmd *config = &mvm->lte_state.config;
-	struct sk_buff *skb;
-	int err = LTE_OK;
-	int i;
-
-	skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, 100);
-	if (!skb)
-		return -ENOMEM;
-
-	if (data_len != sizeof(*cmd)) {
-		err = LTE_INVALID_DATA;
-		goto out;
-	}
-
-	if (!mvm->lte_state.has_static ||
-	    (mvm->lte_state.has_config &&
-	     mvm->lte_state.state != LTE_CONNECTED)) {
-		err = LTE_STATE_ERR;
-		goto out;
-	}
-
-	IWL_DEBUG_COEX(mvm, "LTE-COEX: dynamic cmd:\n"
-		       "\tlte band[0]: %d, chan[0]: %d\n\ttx range: %d - %d\n"
-		       "\trx range: %d - %d\n", cmd->lte_connected_bands[0],
-		       cmd->lte_connected_bands[1], cmd->wifi_tx_safe_freq_min,
-		       cmd->wifi_tx_safe_freq_max, cmd->wifi_rx_safe_freq_min,
-		       cmd->wifi_rx_safe_freq_max);
-
-	/* TODO: validate lte connected bands and channel, and frame struct */
-	config->lte_band = cpu_to_le32(cmd->lte_connected_bands[0]);
-	config->lte_chan = cpu_to_le32(cmd->lte_connected_bands[1]);
-	for (i = 0; i < LTE_FRAME_STRUCT_LENGTH; i++) {
-		IWL_DEBUG_COEX(mvm, "\tframe structure[%d]: %d\n", i,
-			       cmd->lte_frame_structure[i]);
-		config->lte_frame_structure[i] =
-				cpu_to_le32(cmd->lte_frame_structure[i]);
-	}
-	if (!is_valid_lte_range(cmd->wifi_tx_safe_freq_min,
-				cmd->wifi_tx_safe_freq_max) ||
-	    !is_valid_lte_range(cmd->wifi_rx_safe_freq_min,
-				cmd->wifi_rx_safe_freq_max)) {
-		err = LTE_ILLEGAL_PARAMS;
-		goto out;
-	}
-	config->tx_safe_freq_min = cpu_to_le32(cmd->wifi_tx_safe_freq_min);
-	config->tx_safe_freq_max = cpu_to_le32(cmd->wifi_tx_safe_freq_max);
-	config->rx_safe_freq_min = cpu_to_le32(cmd->wifi_rx_safe_freq_min);
-	config->rx_safe_freq_max = cpu_to_le32(cmd->wifi_rx_safe_freq_max);
-	for (i = 0; i < LTE_TX_POWER_LENGTH; i++) {
-		IWL_DEBUG_COEX(mvm, "\twifi max tx power[%d]: %d\n", i,
-			       cmd->wifi_max_tx_power[i]);
-		if (!in_range(cmd->wifi_max_tx_power[i], LTE_MAX_TX_MIN,
-			      LTE_MAX_TX_MAX)) {
-			err = LTE_ILLEGAL_PARAMS;
-			goto out;
-		}
-		config->max_tx_power[i] = cmd->wifi_max_tx_power[i];
-	}
-
-	mvm->lte_state.has_config = 1;
-
-	if (mvm->lte_state.state == LTE_CONNECTED) {
-		mutex_lock(&mvm->mutex);
-		if (iwl_mvm_send_lte_coex_config_cmd(mvm))
-			err = LTE_OTHER_ERR;
-		mutex_unlock(&mvm->mutex);
-	}
-out:
-	if (err)
-		iwl_mvm_reset_lte_state(mvm);
-
-	if (nla_put_u8(skb, NLA_BINARY, err)) {
-		kfree_skb(skb);
-		return -ENOBUFS;
-	}
-
-	return cfg80211_vendor_cmd_reply(skb);
-}
-
-static int iwl_vendor_lte_sps_cmd(struct wiphy *wiphy,
-				  struct wireless_dev *wdev, const void *data,
-				  int data_len)
-{
-	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
-	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
-	const struct lte_coex_sps_info_cmd *cmd = data;
-	struct iwl_lte_coex_sps_cmd *sps = &mvm->lte_state.sps;
-	struct sk_buff *skb;
-	int err = LTE_OK;
-
-	skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, 100);
-	if (!skb)
-		return -ENOMEM;
-
-	if (data_len != sizeof(*cmd)) {
-		err = LTE_INVALID_DATA;
-		goto out;
-	}
-
-	IWL_DEBUG_COEX(mvm, "LTE-COEX: sps cmd:\n\tsps info: %d\n",
-		       cmd->sps_info);
-
-	if (mvm->lte_state.state != LTE_CONNECTED) {
-		err = LTE_STATE_ERR;
-		goto out;
-	}
-
-	/* TODO: validate SPS */
-	sps->lte_semi_persistent_info = cpu_to_le32(cmd->sps_info);
-
-	mutex_lock(&mvm->mutex);
-	if (iwl_mvm_send_lte_sps_cmd(mvm))
-		err = LTE_OTHER_ERR;
-	else
-		mvm->lte_state.has_sps = 1;
-	mutex_unlock(&mvm->mutex);
-
-out:
-	if (err)
-		iwl_mvm_reset_lte_state(mvm);
-
-	if (nla_put_u8(skb, NLA_BINARY, err)) {
-		kfree_skb(skb);
-		return -ENOBUFS;
-	}
-
-	return cfg80211_vendor_cmd_reply(skb);
-}
-
-static int
-iwl_vendor_lte_coex_wifi_reported_channel_cmd(struct wiphy *wiphy,
-					      struct wireless_dev *wdev,
-					      const void *data, int data_len)
-{
-	struct ieee80211_hw *hw = wiphy_to_ieee80211_hw(wiphy);
-	struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
-	const struct lte_coex_wifi_reported_chan_cmd *cmd = data;
-	struct iwl_lte_coex_wifi_reported_channel_cmd *rprtd_chan =
-						&mvm->lte_state.rprtd_chan;
-	struct sk_buff *skb;
-	int err = LTE_OK;
-
-	skb = cfg80211_vendor_cmd_alloc_reply_skb(wiphy, 100);
-	if (!skb)
-		return -ENOMEM;
-
-	if (data_len != sizeof(*cmd)) {
-		err = LTE_INVALID_DATA;
-		goto out;
-	}
-
-	IWL_DEBUG_COEX(mvm, "LTE-COEX: wifi reported channel cmd:\n"
-		       "\tchannel: %d, bandwidth: %d\n", cmd->chan,
-		       cmd->bandwidth);
-
-	if (!in_range(cmd->chan, LTE_RC_CHAN_MIN, LTE_RC_CHAN_MAX) ||
-	    !in_range(cmd->bandwidth, LTE_RC_BW_MIN, LTE_RC_BW_MAX)) {
-		err = LTE_ILLEGAL_PARAMS;
-		goto out;
-	}
-
-	rprtd_chan->channel = cpu_to_le32(cmd->chan);
-	rprtd_chan->bandwidth = cpu_to_le32(cmd->bandwidth);
-
-	mutex_lock(&mvm->mutex);
-	if (iwl_mvm_send_lte_coex_wifi_reported_channel_cmd(mvm))
-		err = LTE_OTHER_ERR;
-	else
-		mvm->lte_state.has_rprtd_chan = 1;
-	mutex_unlock(&mvm->mutex);
-
-out:
-	if (err)
-		iwl_mvm_reset_lte_state(mvm);
-
-	if (nla_put_u8(skb, NLA_BINARY, err)) {
-		kfree_skb(skb);
-		return -ENOBUFS;
-	}
-
-	return cfg80211_vendor_cmd_reply(skb);
-}
-#endif /* CPTCFG_IWLWIFI_LTE_COEX */
-
 static int iwl_vendor_frame_filter_cmd(struct wiphy *wiphy,
 				       struct wireless_dev *wdev,
 				       const void *data, int data_len)
@@ -1563,53 +1205,6 @@ static const struct wiphy_vendor_command iwl_mvm_vendor_commands[] = {
 			 WIPHY_VENDOR_CMD_NEED_RUNNING,
 		.doit = iwl_mvm_get_low_latency,
 	},
-#ifdef CPTCFG_IWLWIFI_LTE_COEX
-	{
-		.info = {
-			.vendor_id = INTEL_OUI,
-			.subcmd = IWL_MVM_VENDOR_CMD_LTE_STATE,
-		},
-		.flags = WIPHY_VENDOR_CMD_NEED_NETDEV |
-			 WIPHY_VENDOR_CMD_NEED_RUNNING,
-		.doit = iwl_vendor_lte_coex_state_cmd,
-	},
-	{
-		.info = {
-			.vendor_id = INTEL_OUI,
-			.subcmd = IWL_MVM_VENDOR_CMD_LTE_COEX_CONFIG_INFO,
-		},
-		.flags = WIPHY_VENDOR_CMD_NEED_NETDEV |
-			 WIPHY_VENDOR_CMD_NEED_RUNNING,
-		.doit = iwl_vendor_lte_coex_config_cmd,
-	},
-	{
-		.info = {
-			.vendor_id = INTEL_OUI,
-			.subcmd = IWL_MVM_VENDOR_CMD_LTE_COEX_DYNAMIC_INFO,
-		},
-		.flags = WIPHY_VENDOR_CMD_NEED_NETDEV |
-			 WIPHY_VENDOR_CMD_NEED_RUNNING,
-		.doit = iwl_vendor_lte_coex_dynamic_info_cmd,
-	},
-	{
-		.info = {
-			.vendor_id = INTEL_OUI,
-			.subcmd = IWL_MVM_VENDOR_CMD_LTE_COEX_SPS_INFO,
-		},
-		.flags = WIPHY_VENDOR_CMD_NEED_NETDEV |
-			 WIPHY_VENDOR_CMD_NEED_RUNNING,
-		.doit = iwl_vendor_lte_sps_cmd,
-	},
-	{
-		.info = {
-			.vendor_id = INTEL_OUI,
-			.subcmd = IWL_MVM_VENDOR_CMD_LTE_COEX_WIFI_RPRTD_CHAN,
-		},
-		.flags = WIPHY_VENDOR_CMD_NEED_NETDEV |
-			 WIPHY_VENDOR_CMD_NEED_RUNNING,
-		.doit = iwl_vendor_lte_coex_wifi_reported_channel_cmd,
-	},
-#endif /* CPTCFG_IWLWIFI_LTE_COEX */
 	{
 		.info = {
 			.vendor_id = INTEL_OUI,
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
index 8b2364a..fee789b 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/drv.c
@@ -65,7 +65,6 @@
 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
 
 #include <linux/module.h>
-#include <linux/pm_runtime.h>
 #include <linux/pci.h>
 #include <linux/acpi.h>
 
@@ -875,25 +874,6 @@ static int iwl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
 	/* register transport layer debugfs here */
 	iwl_trans_pcie_dbgfs_register(iwl_trans);
 
-	/* if RTPM is in use, enable it in our device */
-	if (iwl_trans->runtime_pm_mode != IWL_PLAT_PM_MODE_DISABLED) {
-		/* We explicitly set the device to active here to
-		 * clear contingent errors.
-		 */
-		pm_runtime_set_active(&pdev->dev);
-
-		pm_runtime_set_autosuspend_delay(&pdev->dev,
-					 iwlwifi_mod_params.d0i3_timeout);
-		pm_runtime_use_autosuspend(&pdev->dev);
-
-		/* We are not supposed to call pm_runtime_allow() by
-		 * ourselves, but let userspace enable runtime PM via
-		 * sysfs.  However, since we don't enable this from
-		 * userspace yet, we need to allow/forbid() ourselves.
-		*/
-		pm_runtime_allow(&pdev->dev);
-	}
-
 	/* The PCI device starts with a reference taken and we are
 	 * supposed to release it here.  But to simplify the
 	 * interaction with the opmode, we don't do it now, but let
@@ -911,15 +891,6 @@ static void iwl_pci_remove(struct pci_dev *pdev)
 {
 	struct iwl_trans *trans = pci_get_drvdata(pdev);
 
-	/* if RTPM was in use, restore it to the state before probe */
-	if (trans->runtime_pm_mode != IWL_PLAT_PM_MODE_DISABLED) {
-		/* We should not call forbid here, but we do for now.
-		 * Check the comment to pm_runtime_allow() in
-		 * iwl_pci_probe().
-		 */
-		pm_runtime_forbid(trans->dev);
-	}
-
 	iwl_drv_stop(trans->drv);
 
 	iwl_trans_pcie_free(trans);
@@ -977,76 +948,6 @@ static int iwl_pci_resume(struct device *device)
 	return 0;
 }
 
-int iwl_pci_fw_enter_d0i3(struct iwl_trans *trans)
-{
-	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-	int ret;
-
-	if (test_bit(STATUS_FW_ERROR, &trans->status))
-		return 0;
-
-	set_bit(STATUS_TRANS_GOING_IDLE, &trans->status);
-
-	/* config the fw */
-	ret = iwl_op_mode_enter_d0i3(trans->op_mode);
-	if (ret == 1) {
-		IWL_DEBUG_RPM(trans, "aborting d0i3 entrance\n");
-		clear_bit(STATUS_TRANS_GOING_IDLE, &trans->status);
-		return -EBUSY;
-	}
-	if (ret)
-		goto err;
-
-	ret = wait_event_timeout(trans_pcie->d0i3_waitq,
-				 test_bit(STATUS_TRANS_IDLE, &trans->status),
-				 msecs_to_jiffies(IWL_TRANS_IDLE_TIMEOUT));
-	if (!ret) {
-		IWL_ERR(trans, "Timeout entering D0i3\n");
-		ret = -ETIMEDOUT;
-		goto err;
-	}
-
-	clear_bit(STATUS_TRANS_GOING_IDLE, &trans->status);
-
-	return 0;
-err:
-	clear_bit(STATUS_TRANS_GOING_IDLE, &trans->status);
-	iwl_trans_fw_error(trans);
-	return ret;
-}
-
-int iwl_pci_fw_exit_d0i3(struct iwl_trans *trans)
-{
-	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-	int ret;
-
-	/* sometimes a D0i3 entry is not followed through */
-	if (!test_bit(STATUS_TRANS_IDLE, &trans->status))
-		return 0;
-
-	/* config the fw */
-	ret = iwl_op_mode_exit_d0i3(trans->op_mode);
-	if (ret)
-		goto err;
-
-	/* we clear STATUS_TRANS_IDLE only when D0I3_END command is completed */
-
-	ret = wait_event_timeout(trans_pcie->d0i3_waitq,
-				 !test_bit(STATUS_TRANS_IDLE, &trans->status),
-				 msecs_to_jiffies(IWL_TRANS_IDLE_TIMEOUT));
-	if (!ret) {
-		IWL_ERR(trans, "Timeout exiting D0i3\n");
-		ret = -ETIMEDOUT;
-		goto err;
-	}
-
-	return 0;
-err:
-	clear_bit(STATUS_TRANS_IDLE, &trans->status);
-	iwl_trans_fw_error(trans);
-	return ret;
-}
-
 static const struct dev_pm_ops iwl_dev_pm_ops = {
 	SET_SYSTEM_SLEEP_PM_OPS(iwl_pci_suspend,
 				iwl_pci_resume)
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
index 1f8e9a6..48017cc 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/internal.h
@@ -558,7 +558,6 @@ struct iwl_trans_pcie {
 	bool ucode_write_complete;
 	wait_queue_head_t ucode_write_waitq;
 	wait_queue_head_t wait_command_queue;
-	wait_queue_head_t d0i3_waitq;
 
 	u8 page_offs, dev_cmd_offs;
 
@@ -581,7 +580,6 @@ struct iwl_trans_pcie {
 	/*protect hw register */
 	spinlock_t reg_lock;
 	bool cmd_hold_nic_awake;
-	bool ref_cmd_in_flight;
 
 #ifdef CPTCFG_IWLWIFI_DEBUGFS
 	struct cont_rec fw_mon_data;
@@ -696,6 +694,7 @@ void iwl_pcie_hcmd_complete(struct iwl_trans *trans,
 			    struct iwl_rx_cmd_buffer *rxb);
 void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn,
 			    struct sk_buff_head *skbs);
+void iwl_trans_pcie_set_q_ptrs(struct iwl_trans *trans, int txq_id, int ptr);
 void iwl_trans_pcie_tx_reset(struct iwl_trans *trans);
 void iwl_pcie_gen2_update_byte_tbl(struct iwl_trans_pcie *trans_pcie,
 				   struct iwl_txq *txq, u16 byte_cnt,
@@ -1063,9 +1062,6 @@ void iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans);
 static inline void iwl_trans_pcie_dbgfs_register(struct iwl_trans *trans) { }
 #endif
 
-int iwl_pci_fw_exit_d0i3(struct iwl_trans *trans);
-int iwl_pci_fw_enter_d0i3(struct iwl_trans *trans);
-
 void iwl_pcie_rx_allocator_work(struct work_struct *data);
 
 /* common functions that are used by gen2 transport */
@@ -1119,9 +1115,8 @@ int iwl_trans_pcie_gen2_tx(struct iwl_trans *trans, struct sk_buff *skb,
 			   struct iwl_device_cmd *dev_cmd, int txq_id);
 int iwl_trans_pcie_gen2_send_hcmd(struct iwl_trans *trans,
 				  struct iwl_host_cmd *cmd);
-void iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans,
-				     bool low_power);
-void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans, bool low_power);
+void iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans);
+void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans);
 void iwl_pcie_gen2_txq_unmap(struct iwl_trans *trans, int txq_id);
 void iwl_pcie_gen2_tx_free(struct iwl_trans *trans);
 void iwl_pcie_gen2_tx_stop(struct iwl_trans *trans);
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
index 104b7cc..c099ad8 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans-gen2.c
@@ -136,7 +136,7 @@ static void iwl_pcie_gen2_apm_stop(struct iwl_trans *trans, bool op_mode_leave)
 		      BIT(trans->cfg->csr->flag_init_done));
 }
 
-void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans, bool low_power)
+void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans)
 {
 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
@@ -215,7 +215,7 @@ void _iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans, bool low_power)
 	iwl_pcie_prepare_card_hw(trans);
 }
 
-void iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans, bool low_power)
+void iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans)
 {
 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 	bool was_in_rfkill;
@@ -223,7 +223,7 @@ void iwl_trans_pcie_gen2_stop_device(struct iwl_trans *trans, bool low_power)
 	mutex_lock(&trans_pcie->mutex);
 	trans_pcie->opmode_down = true;
 	was_in_rfkill = test_bit(STATUS_RFKILL_OPMODE, &trans->status);
-	_iwl_trans_pcie_gen2_stop_device(trans, low_power);
+	_iwl_trans_pcie_gen2_stop_device(trans);
 	iwl_trans_pcie_handle_stop_rfkill(trans, was_in_rfkill);
 	mutex_unlock(&trans_pcie->mutex);
 }
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
index 77e740d..1e63a59 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/trans.c
@@ -69,7 +69,6 @@
 #include <linux/bitops.h>
 #include <linux/gfp.h>
 #include <linux/vmalloc.h>
-#include <linux/pm_runtime.h>
 #include <linux/module.h>
 #include <linux/wait.h>
 
@@ -1279,7 +1278,7 @@ static void iwl_pcie_init_msix(struct iwl_trans_pcie *trans_pcie)
 	trans_pcie->hw_mask = trans_pcie->hw_init_mask;
 }
 
-static void _iwl_trans_pcie_stop_device(struct iwl_trans *trans, bool low_power)
+static void _iwl_trans_pcie_stop_device(struct iwl_trans *trans)
 {
 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 
@@ -1495,7 +1494,7 @@ void iwl_trans_pcie_handle_stop_rfkill(struct iwl_trans *trans,
 		iwl_trans_pcie_rf_kill(trans, hw_rfkill);
 }
 
-static void iwl_trans_pcie_stop_device(struct iwl_trans *trans, bool low_power)
+static void iwl_trans_pcie_stop_device(struct iwl_trans *trans)
 {
 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 	bool was_in_rfkill;
@@ -1503,7 +1502,7 @@ static void iwl_trans_pcie_stop_device(struct iwl_trans *trans, bool low_power)
 	mutex_lock(&trans_pcie->mutex);
 	trans_pcie->opmode_down = true;
 	was_in_rfkill = test_bit(STATUS_RFKILL_OPMODE, &trans->status);
-	_iwl_trans_pcie_stop_device(trans, low_power);
+	_iwl_trans_pcie_stop_device(trans);
 	iwl_trans_pcie_handle_stop_rfkill(trans, was_in_rfkill);
 	mutex_unlock(&trans_pcie->mutex);
 }
@@ -1519,9 +1518,9 @@ void iwl_trans_pcie_rf_kill(struct iwl_trans *trans, bool state)
 		 state ? "disabled" : "enabled");
 	if (iwl_op_mode_hw_rf_kill(trans->op_mode, state)) {
 		if (trans->cfg->gen2)
-			_iwl_trans_pcie_gen2_stop_device(trans, true);
+			_iwl_trans_pcie_gen2_stop_device(trans);
 		else
-			_iwl_trans_pcie_stop_device(trans, true);
+			_iwl_trans_pcie_stop_device(trans);
 	}
 }
 
@@ -1780,7 +1779,7 @@ static int iwl_trans_pcie_clear_persistence_bit(struct iwl_trans *trans)
 	return 0;
 }
 
-static int _iwl_trans_pcie_start_hw(struct iwl_trans *trans, bool low_power)
+static int _iwl_trans_pcie_start_hw(struct iwl_trans *trans)
 {
 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 	int err;
@@ -1816,20 +1815,16 @@ static int _iwl_trans_pcie_start_hw(struct iwl_trans *trans, bool low_power)
 	/* ...rfkill can call stop_device and set it false if needed */
 	iwl_pcie_check_hw_rf_kill(trans);
 
-	/* Make sure we sync here, because we'll need full access later */
-	if (low_power)
-		pm_runtime_resume(trans->dev);
-
 	return 0;
 }
 
-static int iwl_trans_pcie_start_hw(struct iwl_trans *trans, bool low_power)
+static int iwl_trans_pcie_start_hw(struct iwl_trans *trans)
 {
 	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
 	int ret;
 
 	mutex_lock(&trans_pcie->mutex);
-	ret = _iwl_trans_pcie_start_hw(trans, low_power);
+	ret = _iwl_trans_pcie_start_hw(trans);
 	mutex_unlock(&trans_pcie->mutex);
 
 	return ret;
@@ -2413,41 +2408,6 @@ static void iwl_trans_pcie_set_bits_mask(struct iwl_trans *trans, u32 reg,
 	spin_unlock_irqrestore(&trans_pcie->reg_lock, flags);
 }
 
-static void iwl_trans_pcie_ref(struct iwl_trans *trans)
-{
-	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-
-	if (iwlwifi_mod_params.d0i3_disable)
-		return;
-
-	pm_runtime_get(&trans_pcie->pci_dev->dev);
-
-#ifdef CONFIG_PM
-#if (defined(CONFIG_PM_RUNTIME) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0))
-	IWL_DEBUG_RPM(trans, "runtime usage count: %d\n",
-		      atomic_read(&trans_pcie->pci_dev->dev.power.usage_count));
-#endif
-#endif /* CONFIG_PM */
-}
-
-static void iwl_trans_pcie_unref(struct iwl_trans *trans)
-{
-	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
-
-	if (iwlwifi_mod_params.d0i3_disable)
-		return;
-
-	pm_runtime_mark_last_busy(&trans_pcie->pci_dev->dev);
-	pm_runtime_put_autosuspend(&trans_pcie->pci_dev->dev);
-
-#ifdef CONFIG_PM
-#if (defined(CONFIG_PM_RUNTIME) || LINUX_VERSION_CODE >= KERNEL_VERSION(3,19,0))
-	IWL_DEBUG_RPM(trans, "runtime usage count: %d\n",
-		      atomic_read(&trans_pcie->pci_dev->dev.power.usage_count));
-#endif
-#endif /* CONFIG_PM */
-}
-
 static const char *get_csr_string(int cmd)
 {
 #define IWL_CMD(x) case x: return #x
@@ -3369,18 +3329,11 @@ static struct iwl_trans_dump_data
 #ifdef CONFIG_PM_SLEEP
 static int iwl_trans_pcie_suspend(struct iwl_trans *trans)
 {
-	if (trans->runtime_pm_mode == IWL_PLAT_PM_MODE_D0I3 &&
-	    (trans->system_pm_mode == IWL_PLAT_PM_MODE_D0I3))
-		return iwl_pci_fw_enter_d0i3(trans);
-
 	return 0;
 }
 
 static void iwl_trans_pcie_resume(struct iwl_trans *trans)
 {
-	if (trans->runtime_pm_mode == IWL_PLAT_PM_MODE_D0I3 &&
-	    (trans->system_pm_mode == IWL_PLAT_PM_MODE_D0I3))
-		iwl_pci_fw_exit_d0i3(trans);
 }
 #endif /* CONFIG_PM_SLEEP */
 
@@ -3399,8 +3352,6 @@ static void iwl_trans_pcie_resume(struct iwl_trans *trans)
 	.grab_nic_access = iwl_trans_pcie_grab_nic_access,		\
 	.release_nic_access = iwl_trans_pcie_release_nic_access,	\
 	.set_bits_mask = iwl_trans_pcie_set_bits_mask,			\
-	.ref = iwl_trans_pcie_ref,					\
-	.unref = iwl_trans_pcie_unref,					\
 	.dump_data = iwl_trans_pcie_dump_data,				\
 	.d3_suspend = iwl_trans_pcie_d3_suspend,			\
 	.d3_resume = iwl_trans_pcie_d3_resume,				\
@@ -3454,6 +3405,8 @@ static const struct iwl_trans_ops trans_ops_pcie_gen2 = {
 	.tx = iwl_trans_pcie_gen2_tx,
 	.reclaim = iwl_trans_pcie_reclaim,
 
+	.set_q_ptrs = iwl_trans_pcie_set_q_ptrs,
+
 	.txq_alloc = iwl_trans_pcie_dyn_txq_alloc,
 	.txq_free = iwl_trans_pcie_dyn_txq_free,
 	.wait_txq_empty = iwl_trans_pcie_wait_txq_empty,
@@ -3722,8 +3675,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
 	/* Initialize the wait queue for commands */
 	init_waitqueue_head(&trans_pcie->wait_command_queue);
 
-	init_waitqueue_head(&trans_pcie->d0i3_waitq);
-
 	if (trans_pcie->msix_enabled) {
 		ret = iwl_pcie_init_msix_handler(pdev, trans_pcie);
 		if (ret)
@@ -3748,8 +3699,6 @@ struct iwl_trans *iwl_trans_pcie_alloc(struct pci_dev *pdev,
 						   WQ_HIGHPRI | WQ_UNBOUND, 1);
 	INIT_WORK(&trans_pcie->rba.rx_alloc, iwl_pcie_rx_allocator_work);
 
-	trans->runtime_pm_mode = IWL_PLAT_PM_MODE_DISABLED;
-
 #ifdef CPTCFG_IWLWIFI_DEBUGFS
 	trans_pcie->fw_mon_data.state = IWL_FW_MON_DBGFS_STATE_CLOSED;
 	mutex_init(&trans_pcie->fw_mon_data.mutex);
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
index af389f0..2740032 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c
@@ -50,7 +50,6 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  *****************************************************************************/
-#include <linux/pm_runtime.h>
 #include <net/tso.h>
 #include <linux/tcp.h>
 
@@ -654,12 +653,8 @@ int iwl_trans_pcie_gen2_tx(struct iwl_trans *trans, struct sk_buff *skb,
 				      iwl_pcie_gen2_get_num_tbs(trans, tfd));
 
 	/* start timer if queue currently empty */
-	if (txq->read_ptr == txq->write_ptr) {
-		if (txq->wd_timeout)
-			mod_timer(&txq->stuck_timer, jiffies + txq->wd_timeout);
-		IWL_DEBUG_RPM(trans, "Q: %d first tx - take ref\n", txq->id);
-		iwl_trans_ref(trans);
-	}
+	if (txq->read_ptr == txq->write_ptr && txq->wd_timeout)
+		mod_timer(&txq->stuck_timer, jiffies + txq->wd_timeout);
 
 	/* Tell device the write index *just past* this latest filled TFD */
 	txq->write_ptr = iwl_queue_inc_wrap(trans, txq->write_ptr);
@@ -904,12 +899,6 @@ static int iwl_pcie_gen2_enqueue_hcmd(struct iwl_trans *trans,
 		mod_timer(&txq->stuck_timer, jiffies + txq->wd_timeout);
 
 	spin_lock_irqsave(&trans_pcie->reg_lock, flags);
-	if (!(cmd->flags & CMD_SEND_IN_IDLE) &&
-	    !trans_pcie->ref_cmd_in_flight) {
-		trans_pcie->ref_cmd_in_flight = true;
-		IWL_DEBUG_RPM(trans, "set ref_cmd_in_flight - ref\n");
-		iwl_trans_ref(trans);
-	}
 	/* Increment and update queue's write index */
 	txq->write_ptr = iwl_queue_inc_wrap(trans, txq->write_ptr);
 	iwl_pcie_gen2_txq_inc_wr_ptr(trans, txq);
@@ -943,16 +932,6 @@ static int iwl_pcie_gen2_send_hcmd_sync(struct iwl_trans *trans,
 
 	IWL_DEBUG_INFO(trans, "Setting HCMD_ACTIVE for command %s\n", cmd_str);
 
-	if (pm_runtime_suspended(&trans_pcie->pci_dev->dev)) {
-		ret = wait_event_timeout(trans_pcie->d0i3_waitq,
-				 pm_runtime_active(&trans_pcie->pci_dev->dev),
-				 msecs_to_jiffies(IWL_TRANS_IDLE_TIMEOUT));
-		if (!ret) {
-			IWL_ERR(trans, "Timeout exiting D0i3 before hcmd\n");
-			return -ETIMEDOUT;
-		}
-	}
-
 	cmd_idx = iwl_pcie_gen2_enqueue_hcmd(trans, cmd);
 	if (cmd_idx < 0) {
 		ret = cmd_idx;
@@ -1077,23 +1056,6 @@ void iwl_pcie_gen2_txq_unmap(struct iwl_trans *trans, int txq_id)
 		}
 		iwl_pcie_gen2_free_tfd(trans, txq);
 		txq->read_ptr = iwl_queue_inc_wrap(trans, txq->read_ptr);
-
-		if (txq->read_ptr == txq->write_ptr) {
-			unsigned long flags;
-
-			spin_lock_irqsave(&trans_pcie->reg_lock, flags);
-			if (txq_id != trans_pcie->cmd_queue) {
-				IWL_DEBUG_RPM(trans, "Q %d - last tx freed\n",
-					      txq->id);
-				iwl_trans_unref(trans);
-			} else if (trans_pcie->ref_cmd_in_flight) {
-				trans_pcie->ref_cmd_in_flight = false;
-				IWL_DEBUG_RPM(trans,
-					      "clear ref_cmd_in_flight\n");
-				iwl_trans_unref(trans);
-			}
-			spin_unlock_irqrestore(&trans_pcie->reg_lock, flags);
-		}
 	}
 
 	while (!skb_queue_empty(&txq->overflow_q)) {
diff --git a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
index 7c601ac..a1e4835 100644
--- a/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
+++ b/drivers/net/wireless/intel/iwlwifi/pcie/tx.c
@@ -65,7 +65,6 @@
 #include <linux/ieee80211.h>
 #include <linux/slab.h>
 #include <linux/sched.h>
-#include <linux/pm_runtime.h>
 #include <net/ip6_checksum.h>
 #include <net/tso.h>
 
@@ -637,12 +636,6 @@ static void iwl_pcie_clear_cmd_in_flight(struct iwl_trans *trans)
 
 	lockdep_assert_held(&trans_pcie->reg_lock);
 
-	if (trans_pcie->ref_cmd_in_flight) {
-		trans_pcie->ref_cmd_in_flight = false;
-		IWL_DEBUG_RPM(trans, "clear ref_cmd_in_flight - unref\n");
-		iwl_trans_unref(trans);
-	}
-
 	if (!trans->cfg->base_params->apmg_wake_up_wa)
 		return;
 	if (WARN_ON(!trans_pcie->cmd_hold_nic_awake))
@@ -681,13 +674,8 @@ static void iwl_pcie_txq_unmap(struct iwl_trans *trans, int txq_id)
 			unsigned long flags;
 
 			spin_lock_irqsave(&trans_pcie->reg_lock, flags);
-			if (txq_id != trans_pcie->cmd_queue) {
-				IWL_DEBUG_RPM(trans, "Q %d - last tx freed\n",
-					      txq->id);
-				iwl_trans_unref(trans);
-			} else {
+			if (txq_id == trans_pcie->cmd_queue)
 				iwl_pcie_clear_cmd_in_flight(trans);
-			}
 			spin_unlock_irqrestore(&trans_pcie->reg_lock, flags);
 		}
 	}
@@ -1223,15 +1211,22 @@ void iwl_trans_pcie_reclaim(struct iwl_trans *trans, int txq_id, int ssn,
 		txq->overflow_tx = false;
 	}
 
-	if (txq->read_ptr == txq->write_ptr) {
-		IWL_DEBUG_RPM(trans, "Q %d - last tx reclaimed\n", txq->id);
-		iwl_trans_unref(trans);
-	}
-
 out:
 	spin_unlock_bh(&txq->lock);
 }
 
+/* Set wr_ptr of specific device and txq  */
+void iwl_trans_pcie_set_q_ptrs(struct iwl_trans *trans, int txq_id, int ptr)
+{
+	struct iwl_trans_pcie *trans_pcie = IWL_TRANS_GET_PCIE_TRANS(trans);
+	struct iwl_txq *txq = trans_pcie->txq[txq_id];
+
+	lockdep_assert_held(&txq->lock);
+
+	txq->write_ptr = ptr;
+	txq->read_ptr = txq->write_ptr;
+}
+
 static int iwl_pcie_set_cmd_in_flight(struct iwl_trans *trans,
 				      const struct iwl_host_cmd *cmd)
 {
@@ -1245,13 +1240,6 @@ static int iwl_pcie_set_cmd_in_flight(struct iwl_trans *trans,
 	if (test_bit(STATUS_TRANS_DEAD, &trans->status))
 		return -ENODEV;
 
-	if (!(cmd->flags & CMD_SEND_IN_IDLE) &&
-	    !trans_pcie->ref_cmd_in_flight) {
-		trans_pcie->ref_cmd_in_flight = true;
-		IWL_DEBUG_RPM(trans, "set ref_cmd_in_flight - ref\n");
-		iwl_trans_ref(trans);
-	}
-
 	/*
 	 * wake up the NIC to make sure that the firmware will see the host
 	 * command - we will let the NIC sleep once all the host commands
@@ -1865,20 +1853,6 @@ void iwl_pcie_hcmd_complete(struct iwl_trans *trans,
 		wake_up(&trans_pcie->wait_command_queue);
 	}
 
-	if (meta->flags & CMD_MAKE_TRANS_IDLE) {
-		IWL_DEBUG_INFO(trans, "complete %s - mark trans as idle\n",
-			       iwl_get_cmd_string(trans, cmd->hdr.cmd));
-		set_bit(STATUS_TRANS_IDLE, &trans->status);
-		wake_up(&trans_pcie->d0i3_waitq);
-	}
-
-	if (meta->flags & CMD_WAKE_UP_TRANS) {
-		IWL_DEBUG_INFO(trans, "complete %s - clear trans idle flag\n",
-			       iwl_get_cmd_string(trans, cmd->hdr.cmd));
-		clear_bit(STATUS_TRANS_IDLE, &trans->status);
-		wake_up(&trans_pcie->d0i3_waitq);
-	}
-
 	meta->flags = 0;
 
 	spin_unlock_bh(&txq->lock);
@@ -1925,16 +1899,6 @@ static int iwl_pcie_send_hcmd_sync(struct iwl_trans *trans,
 	IWL_DEBUG_INFO(trans, "Setting HCMD_ACTIVE for command %s\n",
 		       iwl_get_cmd_string(trans, cmd->id));
 
-	if (pm_runtime_suspended(&trans_pcie->pci_dev->dev)) {
-		ret = wait_event_timeout(trans_pcie->d0i3_waitq,
-				 pm_runtime_active(&trans_pcie->pci_dev->dev),
-				 msecs_to_jiffies(IWL_TRANS_IDLE_TIMEOUT));
-		if (!ret) {
-			IWL_ERR(trans, "Timeout exiting D0i3 before hcmd\n");
-			return -ETIMEDOUT;
-		}
-	}
-
 	cmd_idx = iwl_pcie_enqueue_hcmd(trans, cmd);
 	if (cmd_idx < 0) {
 		ret = cmd_idx;
@@ -2517,22 +2481,18 @@ int iwl_trans_pcie_tx(struct iwl_trans *trans, struct sk_buff *skb,
 	wait_write_ptr = ieee80211_has_morefrags(fc);
 
 	/* start timer if queue currently empty */
-	if (txq->read_ptr == txq->write_ptr) {
-		if (txq->wd_timeout) {
-			/*
-			 * If the TXQ is active, then set the timer, if not,
-			 * set the timer in remainder so that the timer will
-			 * be armed with the right value when the station will
-			 * wake up.
-			 */
-			if (!txq->frozen)
-				mod_timer(&txq->stuck_timer,
-					  jiffies + txq->wd_timeout);
-			else
-				txq->frozen_expiry_remainder = txq->wd_timeout;
-		}
-		IWL_DEBUG_RPM(trans, "Q: %d first tx - take ref\n", txq->id);
-		iwl_trans_ref(trans);
+	if (txq->read_ptr == txq->write_ptr && txq->wd_timeout) {
+		/*
+		 * If the TXQ is active, then set the timer, if not,
+		 * set the timer in remainder so that the timer will
+		 * be armed with the right value when the station will
+		 * wake up.
+		 */
+		if (!txq->frozen)
+			mod_timer(&txq->stuck_timer,
+				  jiffies + txq->wd_timeout);
+		else
+			txq->frozen_expiry_remainder = txq->wd_timeout;
 	}
 
 	/* Tell device the write index *just past* this latest filled TFD */
diff --git a/drivers/net/wireless/intel/iwlwifi/xvt/fw.c b/drivers/net/wireless/intel/iwlwifi/xvt/fw.c
index 95a3eca..6755e7d 100644
--- a/drivers/net/wireless/intel/iwlwifi/xvt/fw.c
+++ b/drivers/net/wireless/intel/iwlwifi/xvt/fw.c
@@ -322,7 +322,7 @@ static int iwl_xvt_config_ltr(struct iwl_xvt *xvt)
 	return iwl_xvt_send_cmd_pdu(xvt, LTR_CONFIG, 0, sizeof(cmd), &cmd);
 }
 
-int iwl_xvt_run_fw(struct iwl_xvt *xvt, u32 ucode_type, bool cont_run)
+int iwl_xvt_run_fw(struct iwl_xvt *xvt, u32 ucode_type)
 {
 	int ret;
 
@@ -338,13 +338,10 @@ int iwl_xvt_run_fw(struct iwl_xvt *xvt, u32 ucode_type, bool cont_run)
 				iwl_xvt_txq_disable(xvt);
 		}
 		iwl_fw_dbg_stop_sync(&xvt->fwrt);
-		_iwl_trans_stop_device(xvt->trans, !cont_run);
+		iwl_trans_stop_device(xvt->trans);
 	}
 
-	if (cont_run)
-		ret = _iwl_trans_start_hw(xvt->trans, false);
-	else
-		ret = iwl_trans_start_hw(xvt->trans);
+	ret = iwl_trans_start_hw(xvt->trans);
 	if (ret) {
 		IWL_ERR(xvt, "Failed to start HW\n");
 		return ret;
diff --git a/drivers/net/wireless/intel/iwlwifi/xvt/user-infc.c b/drivers/net/wireless/intel/iwlwifi/xvt/user-infc.c
index 137fd8c..ee89d9a 100644
--- a/drivers/net/wireless/intel/iwlwifi/xvt/user-infc.c
+++ b/drivers/net/wireless/intel/iwlwifi/xvt/user-infc.c
@@ -482,11 +482,12 @@ init_error:
 	iwl_trans_stop_device(xvt->trans);
 	return err;
 }
-static int iwl_xvt_run_runtime_fw(struct iwl_xvt *xvt, bool cont_run)
+
+static int iwl_xvt_run_runtime_fw(struct iwl_xvt *xvt)
 {
 	int err;
 
-	err = iwl_xvt_run_fw(xvt, IWL_UCODE_REGULAR, cont_run);
+	err = iwl_xvt_run_fw(xvt, IWL_UCODE_REGULAR);
 	if (err)
 		goto fw_error;
 
@@ -557,7 +558,7 @@ static int iwl_xvt_start_op_mode(struct iwl_xvt *xvt)
 	 */
 	if (!(xvt->sw_stack_cfg.load_mask & IWL_XVT_LOAD_MASK_INIT)) {
 		if (xvt->sw_stack_cfg.load_mask & IWL_XVT_LOAD_MASK_RUNTIME) {
-			err = iwl_xvt_run_runtime_fw(xvt, false);
+			err = iwl_xvt_run_runtime_fw(xvt);
 		} else {
 			if (xvt->state != IWL_XVT_STATE_UNINITIALIZED) {
 				xvt->fw_running = false;
@@ -579,7 +580,7 @@ static int iwl_xvt_start_op_mode(struct iwl_xvt *xvt)
 	/* when fw image is unified, only regular ucode is loaded. */
 	if (iwl_xvt_is_unified_fw(xvt))
 		ucode_type = IWL_UCODE_REGULAR;
-	err = iwl_xvt_run_fw(xvt, ucode_type, false);
+	err = iwl_xvt_run_fw(xvt, ucode_type);
 	if (err)
 		return err;
 
@@ -665,7 +666,7 @@ static int iwl_xvt_continue_init(struct iwl_xvt *xvt)
 
 	if (xvt->sw_stack_cfg.load_mask & IWL_XVT_LOAD_MASK_RUNTIME)
 		/* Run runtime FW stops the device by itself if error occurs */
-		err = iwl_xvt_run_runtime_fw(xvt, true);
+		err = iwl_xvt_run_runtime_fw(xvt);
 
 	goto cont_init_end;
 
diff --git a/drivers/net/wireless/intel/iwlwifi/xvt/xvt.h b/drivers/net/wireless/intel/iwlwifi/xvt/xvt.h
index 8ede75f..baae1bf 100644
--- a/drivers/net/wireless/intel/iwlwifi/xvt/xvt.h
+++ b/drivers/net/wireless/intel/iwlwifi/xvt/xvt.h
@@ -7,7 +7,7 @@
  *
  * Copyright(c) 2007 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  *
  * 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
@@ -29,7 +29,7 @@
  *
  * Copyright(c) 2005 - 2014 Intel Corporation. All rights reserved.
  * Copyright(c) 2015 - 2017 Intel Deutschland GmbH
- * Copyright(c) 2018        Intel Corporation
+ * Copyright(c) 2018 - 2019 Intel Corporation
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -443,7 +443,7 @@ int iwl_xvt_user_cmd_execute(struct iwl_testmode *testmode, u32 cmd,
 			     struct iwl_tm_data *data_out, bool *supported_cmd);
 
 /* FW */
-int iwl_xvt_run_fw(struct iwl_xvt *xvt, u32 ucode_type,  bool cont_run);
+int iwl_xvt_run_fw(struct iwl_xvt *xvt, u32 ucode_type);
 
 /* NVM */
 int iwl_xvt_nvm_init(struct iwl_xvt *xvt);
diff --git a/include/linux/fm/iui_fm.h b/include/linux/fm/iui_fm.h
 deleted file mode 100644
index 1411a3b..0000000
--- a/include/linux/fm/iui_fm.h
+++ /dev/null
@@ -1,143 +0,0 @@
-/******************************************************************************
- *
- * This file is provided under a dual BSD/GPLv2 license.  When using or
- * redistributing this file, you may do so under either license.
- *
- * GPL LICENSE SUMMARY
- *
- * Copyright(c) 2012 - 2015 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 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
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110,
- * USA
- *
- * The full GNU General Public License is included in this distribution
- * in the file called COPYING.
- *
- * Contact Information:
- *  Intel Linux Wireless <[e-mail]>
- * Intel Corporation, 5200 N.E. Elam Young Parkway, Hillsboro, OR 97124-6497
- *
- * BSD LICENSE
- *
- * Copyright(c) 2012 - 2015 Intel Corporation. All rights reserved.
- * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- *
- *  * Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in
- *    the documentation and/or other materials provided with the
- *    distribution.
- *  * Neither the name Intel Corporation nor the names of its
- *    contributors may be used to endorse or promote products derived
- *    from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- *
- *****************************************************************************/
-
-#ifndef __FM_TEST_IUI_H
-#define __FM_TEST_IUI_H
-
-#include <linux/errno.h>
-
-#if defined(CONFIG_IUI_FM)  /* Use platform h file - NOT XMM6312/SOFIA-3G */
-#include <linux/fm/iui_fm_lte.h>
-#else /* Platform doesn't have FM - use test h file */
-#include "iui_fm_test.h"
-#endif /* CONFIG_IUI_FM */
-
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR_TEST
-int32_t
-iwl_mvm_fm_test_register_callback(const enum iui_fm_macro_id macro_id,
-				  const iui_fm_mitigation_cb mitigation_cb);
-int32_t
-iwl_mvm_fm_test_notify_frequency(const enum iui_fm_macro_id macro_id,
-				 const struct iui_fm_freq_notification *
-				 const notification);
-#endif /* CPTCFG_IWLWIFI_FRQ_MGR_TEST */
-
-/*
- * If platform has FM then we have 2 modes:
- *	Regular mode: Call the FM register function
- *	Debug mode: Don't call the FM register function & use test mode
- *	implementation.
- * If platform does not have FM then we use test mode implementation.
- */
-static inline
-int32_t iwl_mvm_fm_register_callback(bool dbg_mode,
-				     const enum iui_fm_macro_id macro_id,
-				     const iui_fm_mitigation_cb mitigation_cb)
-{
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR_TEST
-	/* Platform does not have a FM or test mode was requested */
-	if (dbg_mode)
-		return iwl_mvm_fm_test_register_callback(macro_id,
-							 mitigation_cb);
-#endif /* CPTCFG_IWLWIFI_FRQ_MGR_TEST */
-
-#if defined(CONFIG_IUI_FM) /* Not XMM6321/Sofa-3G  - Platform has a FM */
-	return iui_fm_register_mitigation_callback_lte(macro_id,
-						       mitigation_cb);
-#else
-
-	return -EPERM; /* fm_debug_mode was not set */
-#endif /* CONFIG_IUI_FM */
-}
-
-/*
- * If platform has FM then we have 2 modes:
- *	Regular mode: Call the FM notify function
- *	Debug mode: Don't call the FM notify function & use test mode
- *	implementation.
- * If platfom does not have FM then we use test mode implementation.
- */
-static inline
-int32_t iwl_mvm_fm_notify_frequency(bool dbg_mode,
-				    const enum iui_fm_macro_id macro_id,
-				    const struct iui_fm_freq_notification *
-				    const notification)
-{
-#ifdef CPTCFG_IWLWIFI_FRQ_MGR_TEST
-	/* Platform does not have a FM or test mode was requested */
-	if (dbg_mode)
-		return iwl_mvm_fm_test_notify_frequency(macro_id,
-							notification);
-#endif /* CPTCFG_IWLWIFI_FRQ_MGR_TEST */
-
-#if defined(CONFIG_IUI_FM) /* Not XMM6312/Sofia-3G - Platform has a FM */
-	return iui_fm_notify_frequency_lte(macro_id, notification);
-#else
-	return -EPERM; /* fm_debug_mode was not set */
-#endif /*CONFIG_IUI_FM */
-}
-
-#endif /* __FM_IUI_H */
-
diff --git a/include/linux/fm/iui_fm_test.h b/include/linux/fm/iui_fm_test.h
 deleted file mode 100644
index e347a55..0000000
--- a/include/linux/fm/iui_fm_test.h
+++ /dev/null
@@ -1,796 +0,0 @@
-/*
- * Copyright (C) 2013 Intel Mobile Communications GmbH
- *
- * This software is licensed under the terms of the GNU General Public
- * License version 2, as published by the Free Software Foundation, and
- * may be copied, distributed, and modified under those terms.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
-#ifndef _IUI_FM_H
-#define _IUI_FM_H
-
-/**
- * @file iui_fm.h
- * @brief The IUI Frequency Manager interface exposes an RPC-compatible
- *        interface to pass frequency information between macros on the AP and
- *        the Frequency Manager component on the MEX.
- *
- * @addtogroup ISPEC_FREQ_MANAGER Frequency manager
- * @{
- */
-
-#ifdef __cplusplus
-extern "C" {
-#endif /* __cplusplus */
-
-/* Choose whether to use integer types defined in the Linux Kernel (for kernel
-   builds) or C Library (for Userspace/MEX builds). */
-#ifdef __KERNEL__
-#include <linux/types.h>
-#include <linux/kernel.h>
-#define INT32_MAX INT_MAX
-#else /* __KERNEL__ */
-#include <stdint.h>
-#endif /* __KERNEL__ */
-
-/**
- * Zero-based enum of Frequency Manager Macro ID's.
- * Identifies a Frequency Manager Macro in the IuiFm API's.
- *
- * @IUI_FM_MACRO_ID_INVALID:  Invalid Macro ID
- * @IUI_FM_MACRO_ID_EMMC:     SD/eMMC Macro
- * @IUI_FM_MACRO_ID_CLASS_D:  Class D Amplifier Macro
- * @IUI_FM_MACRO_ID_PMU_CP:   PMU Charge Pump Macro
- * @IUI_FM_MACRO_ID_MS_CP:    MS Charge Pump Macro
- * @IUI_FM_MACRO_ID_DCDC:     DC to DC Converter Macro
- * @IUI_FM_MACRO_ID_RESERVED: not in use
- * @IUI_FM_MACRO_ID_WLAN:     Wireless LAN Macro
- * @IUI_FM_MACRO_ID_FMR:      FM Radio Macro
- * @IUI_FM_MACRO_ID_BT:       Bluetooth Macro
- * @IUI_FM_MACRO_ID_GNSS:     Global Navigation Satellite System
- *                            (GPS/GLONASS) Macro
- * @IUI_FM_MACRO_ID_MAX:      Number of Macro's defined, used
- *                            internally for range checking
- * @IUI_FM_MACRO_ID_FIRST:    Point to the first macro ID, used internally
- *                            for iteration and range checking
- */
-enum iui_fm_macro_id {
-	IUI_FM_MACRO_ID_INVALID = -1,
-	IUI_FM_MACRO_ID_EMMC = 0,
-	IUI_FM_MACRO_ID_CLASS_D = 1,
-	IUI_FM_MACRO_ID_PMU_CP = 2,
-	IUI_FM_MACRO_ID_MS_CP = 3,
-	IUI_FM_MACRO_ID_DCDC = 4,
-	IUI_FM_MACRO_ID_RESERVED = 5,
-	IUI_FM_MACRO_ID_WLAN = 6,
-	IUI_FM_MACRO_ID_FMR = 7,
-	IUI_FM_MACRO_ID_BT = 8,
-	IUI_FM_MACRO_ID_GNSS = 9,
-	IUI_FM_MACRO_ID_MAX = 10,
-	IUI_FM_MACRO_ID_FIRST = IUI_FM_MACRO_ID_EMMC
-};
-
-/**
- * Enum used to indicate the priority of a mitigation request.
- *
- * @IUI_FM_MITIGATION_PRIORITY_NORMAL:    The priority value of a mitigation
- *                                        request when not in an emergency call
- *                                        or situation.
- * @IUI_FM_MITIGATION_PRIORITY_EMERGENCY: Can be used during an emergency call
- *                                        to indicate that the mitigation
- *                                        request should be applied with more
- *                                        haste than usual, even if this causes
- *                                        a degredation in currently-running
- *                                        processes.
- */
-enum iui_fm_mitigation_priority {
-	IUI_FM_MITIGATION_PRIORITY_NORMAL    = 0,
-	IUI_FM_MITIGATION_PRIORITY_EMERGENCY = 1
-};
-
-/**
- * Enum used to identify an SD/eMMC device.
- *
- * @IUI_FM_EMMC_DEVICE_ID_0:    SD/eMMC Device 0
- * @IUI_FM_EMMC_DEVICE_ID_1:    SD/eMMC Device 1
- * @IUI_FM_EMMC_DEVICE_ID_2:    SD/eMMC Device 2
- * @IUI_FM_EMMC_DEVICE_ID_MAX:  Number of SD/eMMC Devices Defined, used
- *                              internally for range checking and array sizing
- */
-enum iui_fm_emmc_device_id {
-	IUI_FM_EMMC_DEVICE_ID_0   = 0,
-	IUI_FM_EMMC_DEVICE_ID_1   = 1,
-	IUI_FM_EMMC_DEVICE_ID_2   = 2,
-	IUI_FM_EMMC_DEVICE_ID_MAX = 3
-};
-
-/**
- * Enum used to indicate from which main clock the operating frequency
- *        of an SD/eMMC device is derived.
- *
- * Possible SD/eMMC operating frequencies are derived by dividing the selected
- * main clock frequency by powers of 2.  The largest possible divisor is that
- * which results in the lowest operating frequency greater than 200 KHz.  Hence
- * the possible operating frequencies are:
- *
- * Clock Source: 104 MHz:
- *   2^0: 104 MHz
- *   2^1: 52 MHz
- *   2^2: 26 MHz
- *   2^3: 13 MHz
- *   2^4: 6.5 MHz
- *   2^5: 3.25 MHz
- *   2^6: 1.625 MHz
- *   2^7: 812.5 KHz
- *   2^8: 406.25 KHz
- *   2^9: 203.125 KHz
- *
- * Clock Source: 96 MHz:
- *   2^0: 96 MHz
- *   2^1: 48 MHz
- *   2^2: 24 MHz
- *   2^3: 12 MHz
- *   2^4: 6 MHz
- *   2^5: 3 MHz
- *   2^6: 1.5 MHz
- *   2^7: 750 KHz
- *   2^8: 375 KHz
- *
- * @IUI_FM_EMMC_CLOCK_SRC_104MHZ  104 MHz main clock source for SD/eMMC.
- * @IUI_FM_EMMC_CLOCK_SRC_96MHZ   96 MHz main clock source for SD/eMMC.
- */
-enum iui_fm_emmc_clock_src {
-	IUI_FM_EMMC_CLOCK_SRC_104MHZ = 0,
-	IUI_FM_EMMC_CLOCK_SRC_96MHZ  = 1
-};
-
-/**
- * @brief Bitfield structure of 32-bit width to store the operating frequency
- *        information for one SD/eMMC device.
- *
- * @frequency  SD/eMMC Operating Frequency in KHz.
- * @clk_src    SD/eMMC Clock Source. Values in enum iui_fm_emmc_clock_src.
- */
-struct iui_fm_emmc_freq_bitfield {
-	uint32_t frequency:28;
-	uint32_t clk_src:4;
-};
-
-/**
- * @brief Contains operating frequency information for all of the SD/eMMC
- *        devices.
- *
- * @emmc_frequency  Array of frequency information for each EMMC device.
- */
-struct iui_fm_emmc_freq_info {
-	struct iui_fm_emmc_freq_bitfield
-		emmc_frequency[IUI_FM_EMMC_DEVICE_ID_MAX];
-};
-
-/**
- * @brief Enum representing the possible channel bandwidths used by the WLAN
- *        macro.
- *
- * @IUI_FM_WLAN_BW_INVALID  Used if WLAN channel is in disconnected state.
- * @IUI_FM_WLAN_BW_20MHZ    20 MHz bandwidth.
- * @IUI_FM_WLAN_BW_40MHZ    40 MHz bandwidth (NOT SUPPORTED).
- * @IUI_FM_WLAN_BW_80MHZ    80 MHz bandwidth (NOT SUPPORTED).
- */
-enum iui_fm_wlan_bandwidth {
-	IUI_FM_WLAN_BW_INVALID = -1,
-	IUI_FM_WLAN_BW_20MHZ   = 0,
-	IUI_FM_WLAN_BW_40MHZ   = 1,
-	IUI_FM_WLAN_BW_80MHZ   = 2,
-	IUI_FM_WLAN_BW_160MHZ  = 3
-};
-
-/**
- * Structure used to store the frequency and bandwidth of a WLAN channel.
- *
- * @frequency  Current WLAN channel center frequency in KHz if in
- *             transfer/receive mode, or an invalid value otherwise.
- *             Available values: 2412000-2484000, 3657500-3690000,
- *             4915000-5825000 (KHz).
- * @bandwadth  Channel bandwidth enum. Set to IUI_FM_WLAN_BW_INVALID if WLAN
- *             channel is disconnected.
- */
-struct iui_fm_wlan_channel_info {
-	uint32_t frequency;
-	enum iui_fm_wlan_bandwidth bandwidth;
-};
-
-/**
-  * Maximum number of channels that can be used by the WLAN macro at a time.
-  */
-#define IUI_FM_WLAN_MAX_CHANNELS 4
-#define DCDC_UPDATE    1
-#define WLAN_UPDATE    2
-#define DCDC_MITI      DCDC_UPDATE
-#define WLAN_MITI      WLAN_UPDATE
-
-/**
- * @brief Structure used for Frequency Notification by the WLAN macro.
- *
- * @num_channels  Number of valid elements in the channel_info array, set to
- *                the number of channels currently in use by the WLAN macro, or
- *                0 if WLAN is not in transfer/receive mode.
- * @channel_info  Array of WLAN channel information structures. Only the first
- *                num_channels elements are valid.
- * @wlan_adc_dac_freq   Current WLAN ADC/DAC frequency in KHz. Available
- *                      values: 0 (parameter not yet supported).
- */
-struct iui_fm_wlan_info {
-	uint32_t num_channels;
-	struct iui_fm_wlan_channel_info channel_info[IUI_FM_WLAN_MAX_CHANNELS];
-	uint32_t wlan_adc_dac_freq;
-	uint32_t dcdc_div0;
-	uint32_t dcdc_div1;
-	uint32_t bitmask;
-};
-
-/**
- * Special value for the max_tx_pwr field of struct
- * iui_fm_wlan_channel_tx_power to clear a previously-set TX power limit.
- */
-#define IUI_FM_WLAN_NO_TX_PWR_LIMIT INT32_MAX
-
-/**
- * @brief Structure to store the maximum allowed transmit power for one WLAN
- *        channel.
- *
- * @frequency   WLAN Channel Frequency in KHz.
- * @max_tx_pwr  Maximum allowed transmit power for the given channel frequency
- *              in dBm within the range 0 to +30, or
- *              IUI_FM_WLAN_NO_TX_PWR_LIMIT to cancel a previously-set transmit
- *              power limit.
- */
-struct iui_fm_wlan_channel_tx_power {
-	uint32_t frequency;
-	int32_t max_tx_pwr;
-};
-
-/**
- * @brief Enum defining mitigation actions for WLAN macro to implement for the
- *        WLAN RX Gain Stage behavior.
- *
- * @IUI_FM_WLAN_RX_GAIN_NORMAL            RX Gain Stage should behave as
- *                                        normal with no reduction in gain.
- * @IUI_FM_WLAN_RX_GAIN_REDUCE_AUTO       RX Gain should be reduced by an
- *                                        unspecified amount. The WLAN macro
- *                                        is to determine the appropriate gain
- *                                        reduction amount internally.
- * @IUI_FM_WLAN_RX_GAIN_REDUCE_SPECIFIED  RX Gain should be reduced by the
- *                                        specified amount (NOT SUPPORTED).
- */
-enum iui_fm_wlan_rx_gain_behavior {
-	IUI_FM_WLAN_RX_GAIN_NORMAL      = 0,
-	IUI_FM_WLAN_RX_GAIN_REDUCE_AUTO = 1
-/*	IUI_FM_WLAN_RX_GAIN_REDUCE_SPECIFIED = 2 */
-};
-
-/**
- * @brief Mitigation information structure for the WLAN macro.
- *
- * @num_channels       Number of valid elements in the channel_tx_pwr array,
- *                     set to the number of channels for which the maximum
- *                     allowed transmit power is being set.
- * @channel_tx_pwr     Array of maximum allowed transmit power for zero or more
- *                     WLAN channels. Only the first num_channels elements are
- *                     valid.
- * @wlan_adc_dac_freq  Requested WLAN ADC/DAC frequency in KHz. Available
- *                     values: 0 (parameter not yet supported).
- * @rx_gain_behavior   Indicates the requested behavior of the WLAN RX Gain
- *                     Stage (NOT SUPPORTED).
- * @rx_gain_reduction  Amount by which to reduce the WLAN RX Gain (in dB) if
- *                     the rx_gain_bahavior field is set to
- *                     IUI_FM_WLAN_RX_GAIN_REDUCE_SPECIFIED (NOT SUPPORTED).
- */
-struct iui_fm_wlan_mitigation {
-	uint32_t num_channels;
-	struct iui_fm_wlan_channel_tx_power
-		channel_tx_pwr[IUI_FM_WLAN_MAX_CHANNELS];
-	uint32_t wlan_adc_dac_freq;
-	enum iui_fm_wlan_rx_gain_behavior rx_gain_behavior;
-/*	uint32_t rx_gain_reduction; */
-	uint32_t wlan_2g_coex_enable;
-	uint32_t dcdc_div0;
-	uint32_t dcdc_div1;
-	uint32_t bitmask;
-};
-
-/**
- * @brief Enum representing the injection side indicated by the FM Radio
- *        macro.
- *
- * @IUI_FM_FMR_INJECTION_SIDE_LOW   FM Radio Low Side Injection.
- * @IUI_FM_FMR_INJECTION_SIDE_HIGH  FM Radio High Side Injection.
- */
-enum iui_fm_fmr_injection_side {
-	IUI_FM_FMR_INJECTION_SIDE_LOW = 0,
-	IUI_FM_FMR_INJECTION_SIDE_HIGH = 1
-};
-
-/**
- * @brief Structure containing the operating information for the FM Radio
- *        macro.
- *
- * @rx_freq   Tuned frequency in KHz, or 0 if FM Radio is not in use.
- * @inj_side  Injection Side currently in use.
- */
-struct iui_fm_fmr_info {
-	uint32_t rx_freq;
-	enum iui_fm_fmr_injection_side inj_side;
-};
-
-/**
- * @brief Indicates the status of the Bluetooth module.
- *
- * @IUI_FM_BT_STATE_OFF  Bluetooth module is turned off.
- * @IUI_FM_BT_STATE_ON   Bluetooth module is turned on.
- */
-enum iui_fm_bt_state {
-	IUI_FM_BT_STATE_OFF = 0,  /**< Bluetooth module is turned off. */
-	IUI_FM_BT_STATE_ON  = 1   /**< Bluetooth module is turned on. */
-};
-
-/**
- * @brief Structure containing the operating information for the Bluetooth
- *        macro.
- *
- * Passed by the Bluetooth macro to Frequency Manager as a Frequency
- * Notification.
- *
- * @bt_state  Current state of the Bluetooth macro.
- */
-struct iui_fm_bt_info {
-	enum iui_fm_bt_state bt_state;
-};
-
-/**
- * @brief Define the number of Bluetooth hopping channels available.
- */
-#define IUI_FM_BT_NUM_CHANNELS 79
-
-/**
- * @brief Number of bits in one word of the Bluetooth Channel Mask.
- */
-#define IUI_FM_BT_CHANNEL_MASK_WORD_BITS 32
-
-/**
- * @brief Number of words needed to contain the full Bluetooth Channel
- *        Bitmask.
- *
- * For 79 hopping channels, 3 32-bit words are needed.
- */
-#define IUI_FM_BT_CHANNEL_MASK_WORDS 3
-
-/**
- * @brief Bitfield structure representing a hopping channel mask for the
- *        Bluetooth Macro.
- *
- * A set bit indicates a Bluetooth hopping frequency that should be avoided in
- * order to mitigate crosstalk with another macro.
- *
- * @bt_ch_mask  Array of words containing the Bluetooth Channel Mask. Each bit
- *              represents one Bluetooth hopping frequency, with the least of
- *              the first word representing the lowest frequency Bluetooth
- *              Hopping Frequency. If the number of hopping frequencies
- *              available is not a multiple of the word width (in bits), then
- *              the remaining unused bits in the last word are ignored. If a
- *              bit is set, the Bluetooth Hopping Frequency corresponding to
- *              that bit should be avoided by the Bluetooth Macro in order to
- *              avoid crosstalk with another macro.
- */
-struct iui_fm_bt_channel_mask {
-	uint32_t bt_ch_mask[IUI_FM_BT_CHANNEL_MASK_WORDS];
-};
-
-/**
- * @brief GNSS Macro State enum indicating which (if any) of the GNSS
- *        technologies are being used.
- *
- * @IUI_FM_GNSS_STATE_OFF                 GNSS macro is switched off.
- * @IUI_FM_GNSS_STATE_GPS_ACTIVE          GNSS macro is on and in GPS mode.
- * @IUI_FM_GNSS_STATE_GLONASS_ACTIVE      GNSS macro is on and in GLONASS
- *                                        mode.
- * @IUI_FM_GNSS_STATE_GPS_GLONASS_ACTIVE  GNSS macro is on and in GPS+GLONASS
- *                                        mode.
- */
-enum iui_fm_gnss_state {
-	IUI_FM_GNSS_STATE_OFF                = 0,
-	IUI_FM_GNSS_STATE_GPS_ACTIVE         = 1,
-	IUI_FM_GNSS_STATE_GLONASS_ACTIVE     = 2,
-	IUI_FM_GNSS_STATE_GPS_GLONASS_ACTIVE = 3
-};
-
-/**
- * @brief GNSS Frequency Information structure passed from GNSS macro to the FM
- *        module during a Frequency Indication.
- *
- * @state          State of the GNSS module.
- * @snr            Current RX signal to noise ratio for the active GNSS
- *                 technology (GPS or GLONASS), or the stronger of the two if
- *                 both GPS and GLONASS are active. Valid range: 0..55 dB, or
- *                 -1 if not available.
- * @bus_frequency  Bus Frequency used by the GNSS module in KHz, or 0 if GNSS
- *                 is inactive/off.  Available frequencies:
- *                   78000 KHz (currently not supported)
- *                   83200 KHz
- *                   96000 KHz
- * @pll_frequency  Current operating frequency of the GNSS PLL in KHz, or 0
- *                 if the GNSS PLL is disabled.  Available frequencies:
- *                   124800 KHz
- *                   104000 KHz
- *                   96000 KHz
- *                   89000 KHz(currently not supported)
- * @adc_frequency  Current operating frequency of the GNSS ADC output clock
- *                 in KHz, or 0 if the GNSS ADC is disabled.  Available
- *                 frequencies:
- *                   44131 KHz
- *                   52957 KHz
- *                   66196 KHz
- */
-struct iui_fm_gnss_info {
-	enum iui_fm_gnss_state state;
-	int32_t snr;
-	uint32_t bus_frequency;
-	uint32_t pll_frequency;
-	uint32_t adc_frequency;
-};
-
-/**
- * @brief Mitigation information structure for the GNSS macro.
- *
- * @priority       Indicates whether the ongoing processing of a previous
- *                 mitigation request should be interrupted to fulfil this new
- *                 request. Based on whether the phone is currently in an
- *                 emergency call or other situation.
- * @bus_frequency  Requested GNSS bus clock frequency in KHz, or 0 if the
- *                 GNSS bus is disabled. Available frequencies:
- *                   78000 KHz (currently not supported)
- *                   83200 KHz
- *                   96000 KHz