iwlwifi: mvm: don't use hardcoded num of scan channels (762533ba) · Commits · e / devices / android_kernel_teracube_emerald

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

+9 −0

Original line number	Diff line number	Diff line
		@@ -155,6 +155,8 @@ static struct iwlwifi_opmode_table {
		[MVM_OP_MODE] = { .name = "iwlmvm", .ops = NULL },
		};

		#define IWL_DEFAULT_SCAN_CHANNELS 40

		/*
		* struct fw_sec: Just for the image parsing proccess.
		* For the fw storage we are using struct fw_desc.
		@@ -819,6 +821,12 @@ static int iwl_parse_tlv_firmware(struct iwl_drv *drv,
		if (iwl_store_cscheme(&drv->fw, tlv_data, tlv_len))
		goto invalid_tlv_len;
		break;
		case IWL_UCODE_TLV_N_SCAN_CHANNELS:
		if (tlv_len != sizeof(u32))
		goto invalid_tlv_len;
		capa->n_scan_channels =
		le32_to_cpup((__le32 *)tlv_data);
		break;
		default:
		IWL_DEBUG_INFO(drv, "unknown TLV: %d\n", tlv_type);
		break;
		@@ -973,6 +981,7 @@ static void iwl_req_fw_callback(const struct firmware ucode_raw, void context)
		fw->ucode_capa.max_probe_length = IWL_DEFAULT_MAX_PROBE_LENGTH;
		fw->ucode_capa.standard_phy_calibration_size =
		IWL_DEFAULT_STANDARD_PHY_CALIBRATE_TBL_SIZE;
		fw->ucode_capa.n_scan_channels = IWL_DEFAULT_SCAN_CHANNELS;

		if (!api_ok)
		api_ok = api_max;

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -128,6 +128,7 @@ enum iwl_ucode_tlv_type {
		IWL_UCODE_TLV_CSCHEME = 28,
		IWL_UCODE_TLV_API_CHANGES_SET = 29,
		IWL_UCODE_TLV_ENABLED_CAPABILITIES = 30,
		IWL_UCODE_TLV_N_SCAN_CHANNELS = 31,
		};

		struct iwl_ucode_tlv {

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -178,6 +178,7 @@ enum iwl_ucode_sec {

		struct iwl_ucode_capabilities {
		u32 max_probe_length;
		u32 n_scan_channels;
		u32 standard_phy_calibration_size;
		u32 flags;
		u32 api[IWL_API_ARRAY_SIZE];

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

+14 −33

Original line number	Diff line number	Diff line
		@@ -169,19 +169,13 @@ enum iwl_scan_type {
		SCAN_TYPE_DISCOVERY_FORCED = 6,
		}; /* SCAN_ACTIVITY_TYPE_E_VER_1 */

		/**
		* Maximal number of channels to scan
		* it should be equal to:
		* max(IWL_NUM_CHANNELS, IWL_NUM_CHANNELS_FAMILY_8000)
		*/
		#define MAX_NUM_SCAN_CHANNELS 50

		/**
		* 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 - MAX_NUM_SCAN_CHANNELS)
		* @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)
		@@ -345,7 +339,7 @@ struct iwl_scan_results_notif {
		* @last_channel: last channel that was scanned
		* @tsf_low: TSF timer (lower half) in usecs
		* @tsf_high: TSF timer (higher half) in usecs
		* @results: all scan results, only "scanned_channels" of them are valid
		* @results: array of scan results, only "scanned_channels" of them are valid
		*/
		struct iwl_scan_complete_notif {
		u8 scanned_channels;
		@@ -354,11 +348,10 @@ struct iwl_scan_complete_notif {
		u8 last_channel;
		__le32 tsf_low;
		__le32 tsf_high;
		struct iwl_scan_results_notif results[MAX_NUM_SCAN_CHANNELS];
		struct iwl_scan_results_notif results[];
		} __packed; /* SCAN_COMPLETE_NTF_API_S_VER_2 */

		/* scan offload */
		#define IWL_MAX_SCAN_CHANNELS 40
		#define IWL_SCAN_MAX_BLACKLIST_LEN 64
		#define IWL_SCAN_SHORT_BLACKLIST_LEN 16
		#define IWL_SCAN_MAX_PROFILES 11
		@@ -423,36 +416,24 @@ enum iwl_scan_offload_channel_flags {
		IWL_SCAN_OFFLOAD_CHANNEL_PARTIAL = BIT(25),
		};

		/**
		* iwl_scan_channel_cfg - SCAN_CHANNEL_CFG_S
		* @type: bitmap - see enum iwl_scan_offload_channel_flags.
		* 0: passive (0) or active (1) scan.
		* 1-20: directed scan to i'th ssid.
		* 22: channel width configuation - 1 for narrow.
		* 24: full scan.
		* 25: partial scan.
		* @channel_number: channel number 1-13 etc.
		* @iter_count: repetition count for the channel.
		* @iter_interval: interval between two innteration on one channel.
		* @dwell_time: entry 0 - active scan, entry 1 - passive scan.
		/* channel configuration for struct iwl_scan_offload_cfg. Each channels needs:
		* __le32 type: bitmap; bits 1-20 are for directed scan to i'th ssid and
		* see enum iwl_scan_offload_channel_flags.
		* __le16 channel_number: channel number 1-13 etc.
		* __le16 iter_count: repetition count for the channel.
		* __le32 iter_interval: interval between two innteration on one channel.
		* u8 active_dwell.
		* u8 passive_dwell.
		*/
		struct iwl_scan_channel_cfg {
		__le32 type[IWL_MAX_SCAN_CHANNELS];
		__le16 channel_number[IWL_MAX_SCAN_CHANNELS];
		__le16 iter_count[IWL_MAX_SCAN_CHANNELS];
		__le32 iter_interval[IWL_MAX_SCAN_CHANNELS];
		u8 dwell_time[IWL_MAX_SCAN_CHANNELS][2];
		} __packed;
		#define IWL_SCAN_CHAN_SIZE 14

		/**
		* iwl_scan_offload_cfg - SCAN_OFFLOAD_CONFIG_API_S
		* @scan_cmd: scan command fixed part
		* @channel_cfg: scan channel configuration
		* @data: probe request frames (one per band)
		* @data: scan channel configuration and probe request frames
		*/
		struct iwl_scan_offload_cfg {
		struct iwl_scan_offload_cmd scan_cmd;
		struct iwl_scan_channel_cfg channel_cfg;
		u8 data[0];
		} __packed;

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -1543,7 +1543,8 @@ static int iwl_mvm_mac_hw_scan(struct ieee80211_hw *hw,
		struct iwl_mvm *mvm = IWL_MAC80211_GET_MVM(hw);
		int ret;

		if (req->n_channels == 0 \|\| req->n_channels > MAX_NUM_SCAN_CHANNELS)
		if (req->n_channels == 0 \|\|
		req->n_channels > mvm->fw->ucode_capa.n_scan_channels)
		return -EINVAL;

		mutex_lock(&mvm->mutex);