Commit 54b6416e authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2019-11-20' of... 

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

Patches intended for v5.5

* Fix a merge damage that causes issues with high-throuput on AX200+;
* Support TX/RX antennas reporting;
* Small fix in DVM's BT link-quality code;
* Bump supported FW API version to 52;
* Yet another scan FW API update;
* Some clean-ups;
parents eac08515 54fae6e3

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
#include "iwl-prph.h"



/* Highest firmware API version supported */

#define IWL_22000_UCODE_API_MAX	51

#define IWL_22000_UCODE_API_MAX	52



/* Lowest firmware API version supported */

#define IWL_22000_UCODE_API_MIN	39

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

+3 −0
Original line number Diff line number Diff line
@@ -171,6 +171,9 @@ void iwl_leds_init(struct iwl_priv *priv) 


	priv->led.name = kasprintf(GFP_KERNEL, "%s-led",

				   wiphy_name(priv->hw->wiphy));

	if (!priv->led.name)

		return;



	priv->led.brightness_set = iwl_led_brightness_set;

	priv->led.blink_set = iwl_led_blink_set;

	priv->led.max_brightness = 1;

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

+1 −1
Original line number Diff line number Diff line
@@ -851,7 +851,7 @@ static void rs_bt_update_lq(struct iwl_priv *priv, struct iwl_rxon_context *ctx, 
		 * Is there a need to switch between

		 * full concurrency and 3-wire?

		 */

		if (priv->bt_ci_compliance && priv->bt_ant_couple_ok)

		if (priv->bt_ci_compliance)

			full_concurrent = true;

		else

			full_concurrent = false;

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

+53 −3
Original line number Diff line number Diff line
@@ -664,6 +664,9 @@ enum iwl_umac_scan_general_flags2 { 
 * @IWL_UMAC_SCAN_GEN_FLAGS_V2_MULTI_SSID: matching on multiple SSIDs

 * @IWL_UMAC_SCAN_GEN_FLAGS_V2_FORCE_PASSIVE: all the channels scanned

 *                                           as passive

 * @IWL_UMAC_SCAN_GEN_FLAGS_V2_TRIGGER_UHB_SCAN: at the end of 2.4GHz and

 *		5.2Ghz bands scan, trigger scan on 6GHz band to discover

 *		the reported collocated APs

 */

enum iwl_umac_scan_general_flags_v2 {

	IWL_UMAC_SCAN_GEN_FLAGS_V2_PERIODIC             = BIT(0),
@@ -678,6 +681,7 @@ enum iwl_umac_scan_general_flags_v2 { 
	IWL_UMAC_SCAN_GEN_FLAGS_V2_NTF_START            = BIT(9),

	IWL_UMAC_SCAN_GEN_FLAGS_V2_MULTI_SSID           = BIT(10),

	IWL_UMAC_SCAN_GEN_FLAGS_V2_FORCE_PASSIVE        = BIT(11),

	IWL_UMAC_SCAN_GEN_FLAGS_V2_TRIGGER_UHB_SCAN     = BIT(12),

};



/**
@@ -893,7 +897,27 @@ struct iwl_scan_probe_params_v3 { 
	struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];

	__le32 short_ssid[SCAN_SHORT_SSID_MAX_SIZE];

	u8 bssid_array[ETH_ALEN][SCAN_BSSID_MAX_SIZE];

} __packed;

} __packed; /* SCAN_PROBE_PARAMS_API_S_VER_3 */



/**

 * struct iwl_scan_probe_params_v4

 * @preq: scan probe request params

 * @short_ssid_num: number of valid short SSIDs in short ssid array

 * @bssid_num: number of valid bssid in bssids array

 * @reserved: reserved

 * @direct_scan: list of ssids

 * @short_ssid: array of short ssids

 * @bssid_array: array of bssids

 */

struct iwl_scan_probe_params_v4 {

	struct iwl_scan_probe_req preq;

	u8 short_ssid_num;

	u8 bssid_num;

	__le16 reserved;

	struct iwl_ssid_ie direct_scan[PROBE_OPTION_MAX];

	__le32 short_ssid[SCAN_SHORT_SSID_MAX_SIZE];

	u8 bssid_array[ETH_ALEN][SCAN_BSSID_MAX_SIZE];

} __packed; /* SCAN_PROBE_PARAMS_API_S_VER_4 */



#define SCAN_MAX_NUM_CHANS_V3 67
@@ -932,8 +956,8 @@ struct iwl_scan_channel_params_v4 { 
	u8 reserved;

	struct iwl_scan_channel_cfg_umac channel_config[SCAN_MAX_NUM_CHANS_V3];

	u8 adwell_ch_override_bitmap[16];

} __packed; /* SCAN_CHANNEL_PARAMS_API_S_VER_4 */



} __packed; /* SCAN_CHANNEL_PARAMS_API_S_VER_4 also

	       SCAN_CHANNEL_PARAMS_API_S_VER_5 */

/**

 * struct iwl_scan_general_params_v10

 * @flags: &enum iwl_umac_scan_flags
@@ -1014,6 +1038,20 @@ struct iwl_scan_req_params_v12 { 
	struct iwl_scan_probe_params_v3 probe_params;

} __packed; /* SCAN_REQUEST_PARAMS_API_S_VER_12 */



/**

 * struct iwl_scan_req_params_v13

 * @general_params: &struct iwl_scan_general_params_v10

 * @channel_params: &struct iwl_scan_channel_params_v4

 * @periodic_params: &struct iwl_scan_periodic_parms_v1

 * @probe_params: &struct iwl_scan_probe_params_v4

 */

struct iwl_scan_req_params_v13 {

	struct iwl_scan_general_params_v10 general_params;

	struct iwl_scan_channel_params_v4 channel_params;

	struct iwl_scan_periodic_parms_v1 periodic_params;

	struct iwl_scan_probe_params_v4 probe_params;

} __packed; /* SCAN_REQUEST_PARAMS_API_S_VER_13 */



/**

 * struct iwl_scan_req_umac_v11

 * @uid: scan id, &enum iwl_umac_scan_uid_offsets
@@ -1038,6 +1076,18 @@ struct iwl_scan_req_umac_v12 { 
	struct iwl_scan_req_params_v12 scan_params;

} __packed; /* SCAN_REQUEST_CMD_UMAC_API_S_VER_12 */



/**

 * struct iwl_scan_req_umac_v13

 * @uid: scan id, &enum iwl_umac_scan_uid_offsets

 * @ooc_priority: out of channel priority - &enum iwl_scan_priority

 * @scan_params: scan parameters

 */

struct iwl_scan_req_umac_v13 {

	__le32 uid;

	__le32 ooc_priority;

	struct iwl_scan_req_params_v13 scan_params;

} __packed; /* SCAN_REQUEST_CMD_UMAC_API_S_VER_13 */



/**

 * struct iwl_umac_scan_abort

 * @uid: scan id, &enum iwl_umac_scan_uid_offsets

drivers/net/wireless/intel/iwlwifi/iwl-config.h

+0 −2
Original line number Diff line number Diff line
@@ -409,7 +409,6 @@ struct iwl_fw_mon_regs { 
 * @mac_addr_from_csr: read HW address from CSR registers

 * @features: hw features, any combination of feature_whitelist

 * @pwr_tx_backoffs: translation table between power limits and backoffs

 * @max_rx_agg_size: max RX aggregation size of the ADDBA request/response

 * @max_tx_agg_size: max TX aggregation size of the ADDBA request/response

 * @max_ht_ampdu_factor: the exponent of the max length of A-MPDU that the

 *	station can receive in HT
@@ -481,7 +480,6 @@ struct iwl_cfg { 
	u8 valid_rx_ant;

	u8 non_shared_ant;

	u8 nvm_hw_section_num;

	u8 max_rx_agg_size;

	u8 max_tx_agg_size;

	u8 max_ht_ampdu_exponent;

	u8 max_vht_ampdu_exponent;