iwlwifi: mvm: remove deprecated scan API code (1f940386) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/net/wireless/iwlwifi/iwl-fw-file.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -237,7 +237,6 @@ enum iwl_ucode_tlv_flag {
		* enum iwl_ucode_tlv_api - ucode api
		* @IWL_UCODE_TLV_API_BT_COEX_SPLIT: new API for BT Coex
		* @IWL_UCODE_TLV_API_DISABLE_STA_TX: ucode supports tx_disable bit.
		* @IWL_UCODE_TLV_API_LMAC_SCAN: This ucode uses LMAC unified scan API.
		* @IWL_UCODE_TLV_API_SF_NO_DUMMY_NOTIF: ucode supports disabling dummy notif.
		* @IWL_UCODE_TLV_API_FRAGMENTED_SCAN: This ucode supports active dwell time
		* longer than the passive one, which is essential for fragmented scan.
		@@ -255,7 +254,6 @@ enum iwl_ucode_tlv_flag {
		enum iwl_ucode_tlv_api {
		IWL_UCODE_TLV_API_BT_COEX_SPLIT = BIT(3),
		IWL_UCODE_TLV_API_DISABLE_STA_TX = BIT(5),
		IWL_UCODE_TLV_API_LMAC_SCAN = BIT(6),
		IWL_UCODE_TLV_API_SF_NO_DUMMY_NOTIF = BIT(7),
		IWL_UCODE_TLV_API_FRAGMENTED_SCAN = BIT(8),
		IWL_UCODE_TLV_API_HDC_PHASE_0 = BIT(10),

drivers/net/wireless/iwlwifi/mvm/fw-api-scan.h

+0 −191

Original line number	Diff line number	Diff line
		@@ -70,54 +70,9 @@

		/* Scan Commands, Responses, Notifications */

		/* Masks for iwl_scan_channel.type flags */
		#define SCAN_CHANNEL_TYPE_ACTIVE BIT(0)
		#define SCAN_CHANNEL_NARROW_BAND BIT(22)

		/* Max number of IEs for direct SSID scans in a command */
		#define PROBE_OPTION_MAX 20

		/**
		* struct iwl_scan_channel - entry in REPLY_SCAN_CMD channel table
		* @channel: band is selected by iwl_scan_cmd "flags" field
		* @tx_gain: gain for analog radio
		* @dsp_atten: gain for DSP
		* @active_dwell: dwell time for active scan in TU, typically 5-50
		* @passive_dwell: dwell time for passive scan in TU, typically 20-500
		* @type: type is broken down to these bits:
		* bit 0: 0 = passive, 1 = active
		* bits 1-20: SSID direct bit map. If any of these bits is set then
		* the corresponding SSID IE is transmitted in probe request
		* (bit i adds IE in position i to the probe request)
		* bit 22: channel width, 0 = regular, 1 = TGj narrow channel
		*
		* @iteration_count:
		* @iteration_interval:
		* This struct is used once for each channel in the scan list.
		* Each channel can independently select:
		* 1) SSID for directed active scans
		* 2) Txpower setting (for rate specified within Tx command)
		* 3) How long to stay on-channel (behavior may be modified by quiet_time,
		* quiet_plcp_th, good_CRC_th)
		*
		* To avoid uCode errors, make sure the following are true (see comments
		* under struct iwl_scan_cmd about max_out_time and quiet_time):
		* 1) If using passive_dwell (i.e. passive_dwell != 0):
		* active_dwell <= passive_dwell (< max_out_time if max_out_time != 0)
		* 2) quiet_time <= active_dwell
		* 3) If restricting off-channel time (i.e. max_out_time !=0):
		* passive_dwell < max_out_time
		* active_dwell < max_out_time
		*/
		struct iwl_scan_channel {
		__le32 type;
		__le16 channel;
		__le16 iteration_count;
		__le32 iteration_interval;
		__le16 active_dwell;
		__le16 passive_dwell;
		} __packed; /* SCAN_CHANNEL_CONTROL_API_S_VER_1 */

		/**
		* struct iwl_ssid_ie - directed scan network information element
		*
		@@ -132,152 +87,6 @@ struct iwl_ssid_ie {
		u8 ssid[IEEE80211_MAX_SSID_LEN];
		} __packed; /* SCAN_DIRECT_SSID_IE_API_S_VER_1 */

		/**
		* iwl_scan_flags - masks for scan command flags
		*@SCAN_FLAGS_PERIODIC_SCAN:
		*@SCAN_FLAGS_P2P_PUBLIC_ACTION_FRAME_TX:
		*@SCAN_FLAGS_DELAYED_SCAN_LOWBAND:
		*@SCAN_FLAGS_DELAYED_SCAN_HIGHBAND:
		*@SCAN_FLAGS_FRAGMENTED_SCAN:
		*@SCAN_FLAGS_PASSIVE2ACTIVE: use active scan on channels that was active
		* in the past hour, even if they are marked as passive.
		*/
		enum iwl_scan_flags {
		SCAN_FLAGS_PERIODIC_SCAN = BIT(0),
		SCAN_FLAGS_P2P_PUBLIC_ACTION_FRAME_TX = BIT(1),
		SCAN_FLAGS_DELAYED_SCAN_LOWBAND = BIT(2),
		SCAN_FLAGS_DELAYED_SCAN_HIGHBAND = BIT(3),
		SCAN_FLAGS_FRAGMENTED_SCAN = BIT(4),
		SCAN_FLAGS_PASSIVE2ACTIVE = BIT(5),
		};

		/**
		* enum iwl_scan_type - Scan types for scan command
		* @SCAN_TYPE_FORCED:
		* @SCAN_TYPE_BACKGROUND:
		* @SCAN_TYPE_OS:
		* @SCAN_TYPE_ROAMING:
		* @SCAN_TYPE_ACTION:
		* @SCAN_TYPE_DISCOVERY:
		* @SCAN_TYPE_DISCOVERY_FORCED:
		*/
		enum iwl_scan_type {
		SCAN_TYPE_FORCED = 0,
		SCAN_TYPE_BACKGROUND = 1,
		SCAN_TYPE_OS = 2,
		SCAN_TYPE_ROAMING = 3,
		SCAN_TYPE_ACTION = 4,
		SCAN_TYPE_DISCOVERY = 5,
		SCAN_TYPE_DISCOVERY_FORCED = 6,
		}; /* SCAN_ACTIVITY_TYPE_E_VER_1 */

		/**
		* struct iwl_scan_cmd - scan request command
		* ( SCAN_REQUEST_CMD = 0x80 )
		* @len: command length in bytes
		* @scan_flags: scan flags from SCAN_FLAGS_*
		* @channel_count: num of channels in channel list
		* (1 - ucode_capa.n_scan_channels)
		* @quiet_time: in msecs, dwell this time for active scan on quiet channels
		* @quiet_plcp_th: quiet PLCP threshold (channel is quiet if less than
		* this number of packets were received (typically 1)
		* @passive2active: is auto switching from passive to active during scan allowed
		* @rxchain_sel_flags: RXON_RX_CHAIN_*
		* @max_out_time: in TUs, max out of serving channel time
		* @suspend_time: how long to pause scan when returning to service channel:
		* bits 0-19: beacon interal in TUs (suspend before executing)
		* bits 20-23: reserved
		* bits 24-31: number of beacons (suspend between channels)
		* @rxon_flags: RXON_FLG_*
		* @filter_flags: RXON_FILTER_*
		* @tx_cmd: for active scans (zero for passive), w/o payload,
		* no RS so specify TX rate
		* @direct_scan: direct scan SSIDs
		* @type: one of SCAN_TYPE_*
		* @repeats: how many time to repeat the scan
		*/
		struct iwl_scan_cmd {
		__le16 len;
		u8 scan_flags;
		u8 channel_count;
		__le16 quiet_time;
		__le16 quiet_plcp_th;
		__le16 passive2active;
		__le16 rxchain_sel_flags;
		__le32 max_out_time;
		__le32 suspend_time;
		/* RX_ON_FLAGS_API_S_VER_1 */
		__le32 rxon_flags;
		__le32 filter_flags;
		struct iwl_tx_cmd tx_cmd;
		struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];
		__le32 type;
		__le32 repeats;

		/*
		* Probe request frame, followed by channel list.
		*
		* Size of probe request frame is specified by byte count in tx_cmd.
		* Channel list follows immediately after probe request frame.
		* Number of channels in list is specified by channel_count.
		* Each channel in list is of type:
		*
		* struct iwl_scan_channel channels[0];
		*
		* NOTE: Only one band of channels can be scanned per pass. You
		* must not mix 2.4GHz channels and 5.2GHz channels, and you must wait
		* for one scan to complete (i.e. receive SCAN_COMPLETE_NOTIFICATION)
		* before requesting another scan.
		*/
		u8 data[0];
		} __packed; /* SCAN_REQUEST_FIXED_PART_API_S_VER_5 */

		/* Response to scan request contains only status with one of these values */
		#define SCAN_RESPONSE_OK 0x1
		#define SCAN_RESPONSE_ERROR 0x2

		/*
		* SCAN_ABORT_CMD = 0x81
		* When scan abort is requested, the command has no fields except the common
		* header. The response contains only a status with one of these values.
		*/
		#define SCAN_ABORT_POSSIBLE 0x1
		#define SCAN_ABORT_IGNORED 0x2 /* no pending scans */

		/* TODO: complete documentation */
		#define SCAN_OWNER_STATUS 0x1
		#define MEASURE_OWNER_STATUS 0x2

		/**
		* struct iwl_scan_start_notif - notifies start of scan in the device
		* ( SCAN_START_NOTIFICATION = 0x82 )
		* @tsf_low: TSF timer (lower half) in usecs
		* @tsf_high: TSF timer (higher half) in usecs
		* @beacon_timer: structured as follows:
		* bits 0:19 - beacon interval in usecs
		* bits 20:23 - reserved (0)
		* bits 24:31 - number of beacons
		* @channel: which channel is scanned
		* @band: 0 for 5.2 GHz, 1 for 2.4 GHz
		* @status: one of *_OWNER_STATUS
		*/
		struct iwl_scan_start_notif {
		__le32 tsf_low;
		__le32 tsf_high;
		__le32 beacon_timer;
		u8 channel;
		u8 band;
		u8 reserved[2];
		__le32 status;
		} __packed; /* SCAN_START_NTF_API_S_VER_1 */

		/* scan results probe_status first bit indicates success */
		#define SCAN_PROBE_STATUS_OK 0
		#define SCAN_PROBE_STATUS_TX_FAILED BIT(0)
		/* error statuses combined with TX_FAILED */
		#define SCAN_PROBE_STATUS_FAIL_TTL BIT(1)
		#define SCAN_PROBE_STATUS_FAIL_BT BIT(2)

		/* How many statistics are gathered for each channel */
		#define SCAN_RESULTS_STATISTICS 1

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

+6 −17

Original line number	Diff line number	Diff line
		@@ -339,13 +339,10 @@ int iwl_mvm_mac_setup_register(struct iwl_mvm *mvm)
		!iwlwifi_mod_params.sw_crypto)
		hw->flags \|= IEEE80211_HW_MFP_CAPABLE;

		if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN \|\|
		mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN) {
		hw->flags \|= IEEE80211_SINGLE_HW_SCAN_ON_ALL_BANDS;
		hw->wiphy->features \|=
		NL80211_FEATURE_SCHED_SCAN_RANDOM_MAC_ADDR \|
		NL80211_FEATURE_SCAN_RANDOM_MAC_ADDR;
		}

		hw->sta_data_size = sizeof(struct iwl_mvm_sta);
		hw->vif_data_size = sizeof(struct iwl_mvm_vif);
		@@ -2204,10 +2201,8 @@ static int iwl_mvm_mac_hw_scan(struct ieee80211_hw *hw,

		if (mvm->fw->ucode_capa.capa[0] & IWL_UCODE_TLV_CAPA_UMAC_SCAN)
		ret = iwl_mvm_scan_umac(mvm, vif, hw_req);
		else if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN)
		ret = iwl_mvm_unified_scan_lmac(mvm, vif, hw_req);
		else
		ret = iwl_mvm_scan_request(mvm, vif, req);
		ret = iwl_mvm_unified_scan_lmac(mvm, vif, hw_req);

		if (ret)
		iwl_mvm_unref(mvm, IWL_MVM_REF_SCAN);
		@@ -2535,16 +2530,10 @@ static int iwl_mvm_mac_sched_scan_start(struct ieee80211_hw *hw,

		mutex_lock(&mvm->mutex);

		/* Newest FW fixes sched scan while connected on another interface */
		if (mvm->fw->ucode_capa.api[0] & IWL_UCODE_TLV_API_LMAC_SCAN) {
		if (!vif->bss_conf.idle) {
		ret = -EBUSY;
		goto out;
		}
		} else if (!iwl_mvm_is_idle(mvm)) {
		ret = -EBUSY;
		goto out;
		}

		if (mvm->scan_status != IWL_MVM_SCAN_NONE) {
		ret = -EBUSY;

drivers/net/wireless/iwlwifi/mvm/mvm.h

+0 −16

Original line number	Diff line number	Diff line
		@@ -1080,13 +1080,6 @@ int iwl_mvm_update_quotas(struct iwl_mvm *mvm,

		/* Scanning */
		int iwl_mvm_scan_size(struct iwl_mvm *mvm);
		int iwl_mvm_scan_request(struct iwl_mvm *mvm,
		struct ieee80211_vif *vif,
		struct cfg80211_scan_request *req);
		int iwl_mvm_rx_scan_response(struct iwl_mvm mvm, struct iwl_rx_cmd_buffer rxb,
		struct iwl_device_cmd *cmd);
		int iwl_mvm_rx_scan_complete(struct iwl_mvm mvm, struct iwl_rx_cmd_buffer rxb,
		struct iwl_device_cmd *cmd);
		int iwl_mvm_cancel_scan(struct iwl_mvm *mvm);
		int iwl_mvm_max_scan_ie_len(struct iwl_mvm *mvm, bool is_sched_scan);

		@@ -1097,14 +1090,8 @@ int iwl_mvm_rx_scan_offload_complete_notif(struct iwl_mvm *mvm,
		int iwl_mvm_rx_scan_offload_iter_complete_notif(struct iwl_mvm *mvm,
		struct iwl_rx_cmd_buffer *rxb,
		struct iwl_device_cmd *cmd);
		int iwl_mvm_config_sched_scan(struct iwl_mvm *mvm,
		struct ieee80211_vif *vif,
		struct cfg80211_sched_scan_request *req,
		struct ieee80211_scan_ies *ies);
		int iwl_mvm_config_sched_scan_profiles(struct iwl_mvm *mvm,
		struct cfg80211_sched_scan_request *req);
		int iwl_mvm_sched_scan_start(struct iwl_mvm *mvm,
		struct cfg80211_sched_scan_request *req);
		int iwl_mvm_scan_offload_start(struct iwl_mvm *mvm,
		struct ieee80211_vif *vif,
		struct cfg80211_sched_scan_request *req,
		@@ -1359,9 +1346,6 @@ static inline void iwl_mvm_enable_agg_txq(struct iwl_mvm *mvm, int queue,
		iwl_mvm_enable_txq(mvm, queue, ssn, &cfg, wdg_timeout);
		}

		/* Assoc status */
		bool iwl_mvm_is_idle(struct iwl_mvm *mvm);

		/* Thermal management and CT-kill */
		void iwl_mvm_tt_tx_backoff(struct iwl_mvm *mvm, u32 backoff);
		void iwl_mvm_tt_temp_changed(struct iwl_mvm *mvm, u32 temp);

drivers/net/wireless/iwlwifi/mvm/ops.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -237,8 +237,6 @@ static const struct iwl_rx_handlers iwl_mvm_rx_handlers[] = {

		RX_HANDLER(EOSP_NOTIFICATION, iwl_mvm_rx_eosp_notif, false),

		RX_HANDLER(SCAN_REQUEST_CMD, iwl_mvm_rx_scan_response, false),
		RX_HANDLER(SCAN_COMPLETE_NOTIFICATION, iwl_mvm_rx_scan_complete, true),
		RX_HANDLER(SCAN_ITERATION_COMPLETE,
		iwl_mvm_rx_scan_offload_iter_complete_notif, false),
		RX_HANDLER(SCAN_OFFLOAD_COMPLETE,