Commit 2a455012 authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge tag 'iwlwifi-next-for-kalle-2018-10-06' of... 

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

Third set of iwlwifi patches for 4.20

* Fix for a race condition that caused the FW to crash;
* HE radiotap cleanup and improvements;
* Reorder channel optimization for scans;
* Bumped the FW API version supported after the last API change for
  this release;
* Debugging improvements;
* A few bug fixes;
* Some cleanups in preparation for a new implementation;
* Other small improvements, cleanups and fixes.
parents e1c02eb1 ea7cb829

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

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



/* Highest firmware API version supported */

#define IWL_22000_UCODE_API_MAX	38

#define IWL_22000_UCODE_API_MAX	41



/* Lowest firmware API version supported */

#define IWL_22000_UCODE_API_MIN	39

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

+1 −1
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
#include "fw/file.h"



/* Highest firmware API version supported */

#define IWL9000_UCODE_API_MAX	38

#define IWL9000_UCODE_API_MAX	41



/* Lowest firmware API version supported */

#define IWL9000_UCODE_API_MIN	30

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

+35 −46
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ struct iwl_nvm_access_resp { 
 */

struct iwl_nvm_get_info {

	__le32 reserved;

} __packed; /* GRP_REGULATORY_NVM_GET_INFO_CMD_S_VER_1 */

} __packed; /* REGULATORY_NVM_GET_INFO_CMD_API_S_VER_1 */



/**

 * enum iwl_nvm_info_general_flags - flags in NVM_GET_INFO resp
@@ -180,14 +180,14 @@ enum iwl_nvm_info_general_flags { 
 * @flags: bit 0: 1 - empty, 0 - non-empty

 * @nvm_version: nvm version

 * @board_type: board type

 * @reserved: reserved

 * @n_hw_addrs: number of reserved MAC addresses

 */

struct iwl_nvm_get_info_general {

	__le32 flags;

	__le16 nvm_version;

	u8 board_type;

	u8 reserved;

} __packed; /* GRP_REGULATORY_NVM_GET_INFO_GENERAL_S_VER_1 */

	u8 n_hw_addrs;

} __packed; /* REGULATORY_NVM_GET_INFO_GENERAL_S_VER_2 */



/**

 * enum iwl_nvm_mac_sku_flags - flags in &iwl_nvm_get_info_sku
@@ -231,7 +231,7 @@ struct iwl_nvm_get_info_sku { 
struct iwl_nvm_get_info_phy {

	__le32 tx_chains;

	__le32 rx_chains;

} __packed; /* GRP_REGULATORY_NVM_GET_INFO_PHY_SKU_SECTION_S_VER_1 */

} __packed; /* REGULATORY_NVM_GET_INFO_PHY_SKU_SECTION_S_VER_1 */



#define IWL_NUM_CHANNELS (51)
@@ -245,7 +245,7 @@ struct iwl_nvm_get_info_regulatory { 
	__le32 lar_enabled;

	__le16 channel_profile[IWL_NUM_CHANNELS];

	__le16 reserved;

} __packed; /* GRP_REGULATORY_NVM_GET_INFO_REGULATORY_S_VER_1 */

} __packed; /* REGULATORY_NVM_GET_INFO_REGULATORY_S_VER_1 */



/**

 * struct iwl_nvm_get_info_rsp - response to get NVM data
@@ -259,7 +259,7 @@ struct iwl_nvm_get_info_rsp { 
	struct iwl_nvm_get_info_sku mac_sku;

	struct iwl_nvm_get_info_phy phy_sku;

	struct iwl_nvm_get_info_regulatory regulatory;

} __packed; /* GRP_REGULATORY_NVM_GET_INFO_CMD_RSP_S_VER_2 */

} __packed; /* REGULATORY_NVM_GET_INFO_RSP_API_S_VER_3 */



/**

 * struct iwl_nvm_access_complete_cmd - NVM_ACCESS commands are completed
@@ -269,22 +269,6 @@ struct iwl_nvm_access_complete_cmd { 
	__le32 reserved;

} __packed; /* NVM_ACCESS_COMPLETE_CMD_API_S_VER_1 */



/**

 * struct iwl_mcc_update_cmd_v1 - Request the device to update geographic

 * regulatory profile according to the given MCC (Mobile Country Code).

 * The MCC is two letter-code, ascii upper case[A-Z] or '00' for world domain.

 * 'ZZ' MCC will be used to switch to NVM default profile; in this case, the

 * MCC in the cmd response will be the relevant MCC in the NVM.

 * @mcc: given mobile country code

 * @source_id: the source from where we got the MCC, see iwl_mcc_source

 * @reserved: reserved for alignment

 */

struct iwl_mcc_update_cmd_v1 {

	__le16 mcc;

	u8 source_id;

	u8 reserved;

} __packed; /* LAR_UPDATE_MCC_CMD_API_S_VER_1 */



/**

 * struct iwl_mcc_update_cmd - Request the device to update geographic

 * regulatory profile according to the given MCC (Mobile Country Code).
@@ -306,7 +290,18 @@ struct iwl_mcc_update_cmd { 
} __packed; /* LAR_UPDATE_MCC_CMD_API_S_VER_2 */



/**

 * struct iwl_mcc_update_resp_v1  - response to MCC_UPDATE_CMD.

 * enum iwl_geo_information - geographic information.

 * @GEO_NO_INFO: no special info for this geo profile.

 * @GEO_WMM_ETSI_5GHZ_INFO: this geo profile limits the WMM params

 *	for the 5 GHz band.

 */

enum iwl_geo_information {

	GEO_NO_INFO =			0,

	GEO_WMM_ETSI_5GHZ_INFO =	BIT(0),

};



/**

 * struct iwl_mcc_update_resp_v3 - response to MCC_UPDATE_CMD.

 * Contains the new channel control profile map, if changed, and the new MCC

 * (mobile country code).

 * The new MCC may be different than what was requested in MCC_UPDATE_CMD.
@@ -314,30 +309,23 @@ struct iwl_mcc_update_cmd { 
 * @mcc: the new applied MCC

 * @cap: capabilities for all channels which matches the MCC

 * @source_id: the MCC source, see iwl_mcc_source

 * @n_channels: number of channels in @channels_data (may be 14, 39, 50 or 51

 *		channels, depending on platform)

 * @time: time elapsed from the MCC test start (in units of 30 seconds)

 * @geo_info: geographic specific profile information

 *	see &enum iwl_geo_information.

 * @n_channels: number of channels in @channels_data.

 * @channels: channel control data map, DWORD for each channel. Only the first

 *	16bits are used.

 */

struct iwl_mcc_update_resp_v1  {

struct iwl_mcc_update_resp_v3 {

	__le32 status;

	__le16 mcc;

	u8 cap;

	u8 source_id;

	__le16 time;

	__le16 geo_info;

	__le32 n_channels;

	__le32 channels[0];

} __packed; /* LAR_UPDATE_MCC_CMD_RESP_S_VER_1 */



/**

 * enum iwl_geo_information - geographic information.

 * @GEO_NO_INFO: no special info for this geo profile.

 * @GEO_WMM_ETSI_5GHZ_INFO: this geo profile limits the WMM params

 *	for the 5 GHz band.

 */

enum iwl_geo_information {

	GEO_NO_INFO =			0,

	GEO_WMM_ETSI_5GHZ_INFO =	BIT(0),

};

} __packed; /* LAR_UPDATE_MCC_CMD_RESP_S_VER_3 */



/**

 * struct iwl_mcc_update_resp - response to MCC_UPDATE_CMD.
@@ -347,25 +335,26 @@ enum iwl_geo_information { 
 * @status: see &enum iwl_mcc_update_status

 * @mcc: the new applied MCC

 * @cap: capabilities for all channels which matches the MCC

 * @source_id: the MCC source, see iwl_mcc_source

 * @time: time elapsed from the MCC test start (in 30 seconds TU)

 * @time: time elapsed from the MCC test start (in units of 30 seconds)

 * @geo_info: geographic specific profile information

 *	see &enum iwl_geo_information.

 * @n_channels: number of channels in @channels_data (may be 14, 39, 50 or 51

 *		channels, depending on platform)

 * @source_id: the MCC source, see iwl_mcc_source

 * @reserved: for four bytes alignment.

 * @n_channels: number of channels in @channels_data.

 * @channels: channel control data map, DWORD for each channel. Only the first

 *	16bits are used.

 */

struct iwl_mcc_update_resp {

	__le32 status;

	__le16 mcc;

	u8 cap;

	u8 source_id;

	__le16 cap;

	__le16 time;

	__le16 geo_info;

	u8 source_id;

	u8 reserved[3];

	__le32 n_channels;

	__le32 channels[0];

} __packed; /* LAR_UPDATE_MCC_CMD_RESP_S_VER_3 */

} __packed; /* LAR_UPDATE_MCC_CMD_RESP_S_VER_4 */



/**

 * struct iwl_mcc_chub_notif - chub notifies of mcc change

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

+4 −4
Original line number Diff line number Diff line
@@ -368,10 +368,10 @@ enum iwl_rx_he_phy { 
	/* trigger encoded */

	IWL_RX_HE_PHY_RU_ALLOC_MASK		= 0xfe0000000000ULL,

	IWL_RX_HE_PHY_INFO_TYPE_MASK		= 0xf000000000000000ULL,

	IWL_RX_HE_PHY_INFO_TYPE_SU		= 0x0,

	IWL_RX_HE_PHY_INFO_TYPE_MU		= 0x1,

	IWL_RX_HE_PHY_INFO_TYPE_MU_EXT_INFO	= 0x2,

	IWL_RX_HE_PHY_INFO_TYPE_TB_EXT_INFO	= 0x3,

	IWL_RX_HE_PHY_INFO_TYPE_SU		= 0x0, /* TSF low valid (first DW) */

	IWL_RX_HE_PHY_INFO_TYPE_MU		= 0x1, /* TSF low/high valid (both DWs) */

	IWL_RX_HE_PHY_INFO_TYPE_MU_EXT_INFO	= 0x2, /* same + SIGB-common0/1/2 valid */

	IWL_RX_HE_PHY_INFO_TYPE_TB		= 0x3, /* TSF low/high valid (both DWs) */



	/* second dword - MU data */

	IWL_RX_HE_PHY_MU_SIGB_COMPRESSION		= BIT_ULL(32 + 0),

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

+4 −1
Original line number Diff line number Diff line
@@ -596,9 +596,12 @@ enum iwl_umac_scan_general_flags { 
 * enum iwl_umac_scan_general_flags2 - UMAC scan general flags #2

 * @IWL_UMAC_SCAN_GEN_FLAGS2_NOTIF_PER_CHNL: Whether to send a complete

 *	notification per channel or not.

 * @IWL_UMAC_SCAN_GEN_FLAGS2_ALLOW_CHNL_REORDER: Whether to allow channel

 *	reorder optimization or not.

 */

enum iwl_umac_scan_general_flags2 {

	IWL_UMAC_SCAN_GEN_FLAGS2_NOTIF_PER_CHNL		= BIT(0),

	IWL_UMAC_SCAN_GEN_FLAGS2_ALLOW_CHNL_REORDER	= BIT(1),

};



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE