Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 33e49805 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'wireless-drivers-2019-11-01' of... 

Merge tag 'wireless-drivers-2019-11-01' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers



Kalle Valo says:

====================
wireless-drivers fixes for 5.4

Third set of fixes for 5.4. Most of them are for iwlwifi but important
fixes also for rtlwifi and mt76, the overflow fix for rtlwifi being
most important.

iwlwifi

* fix merge damage on earlier patch

* various fixes to device id handling

* fix scan config command handling which caused firmware asserts

rtlwifi

* fix overflow on P2P IE handling

* don't deliver too small frames to mac80211

mt76

* disable PCIE_ASPM

* fix buffer DMA unmap on certain cases
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4202e219 3d206e68

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

+20 −2
Original line number Diff line number Diff line
@@ -520,7 +520,7 @@ struct iwl_scan_dwell { 
} __packed;



/**

 * struct iwl_scan_config

 * struct iwl_scan_config_v1

 * @flags:			enum scan_config_flags

 * @tx_chains:			valid_tx antenna - ANT_* definitions

 * @rx_chains:			valid_rx antenna - ANT_* definitions
@@ -552,7 +552,7 @@ struct iwl_scan_config_v1 { 
#define SCAN_LB_LMAC_IDX 0

#define SCAN_HB_LMAC_IDX 1



struct iwl_scan_config {

struct iwl_scan_config_v2 {

	__le32 flags;

	__le32 tx_chains;

	__le32 rx_chains;
@@ -564,6 +564,24 @@ struct iwl_scan_config { 
	u8 bcast_sta_id;

	u8 channel_flags;

	u8 channel_array[];

} __packed; /* SCAN_CONFIG_DB_CMD_API_S_2 */



/**

 * struct iwl_scan_config

 * @enable_cam_mode: whether to enable CAM mode.

 * @enable_promiscouos_mode: whether to enable promiscouos mode

 * @bcast_sta_id: the index of the station in the fw

 * @reserved: reserved

 * @tx_chains: valid_tx antenna - ANT_* definitions

 * @rx_chains: valid_rx antenna - ANT_* definitions

 */

struct iwl_scan_config {

	u8 enable_cam_mode;

	u8 enable_promiscouos_mode;

	u8 bcast_sta_id;

	u8 reserved;

	__le32 tx_chains;

	__le32 rx_chains;

} __packed; /* SCAN_CONFIG_DB_CMD_API_S_3 */



/**

drivers/net/wireless/intel/iwlwifi/fw/file.h

+3 −0
Original line number Diff line number Diff line
@@ -288,6 +288,8 @@ typedef unsigned int __bitwise iwl_ucode_tlv_api_t; 
 *	STA_CONTEXT_DOT11AX_API_S

 * @IWL_UCODE_TLV_CAPA_SAR_TABLE_VER: This ucode supports different sar

 *	version tables.

 * @IWL_UCODE_TLV_API_REDUCED_SCAN_CONFIG: This ucode supports v3 of

 *  SCAN_CONFIG_DB_CMD_API_S.

 *

 * @NUM_IWL_UCODE_TLV_API: number of bits used

 */
@@ -321,6 +323,7 @@ enum iwl_ucode_tlv_api { 
	IWL_UCODE_TLV_API_WOWLAN_TCP_SYN_WAKE	= (__force iwl_ucode_tlv_api_t)53,

	IWL_UCODE_TLV_API_FTM_RTT_ACCURACY      = (__force iwl_ucode_tlv_api_t)54,

	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,

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

+1 −0
Original line number Diff line number Diff line
@@ -279,6 +279,7 @@ 
 *         Indicates MAC is entering a power-saving sleep power-down.

 *         Not a good time to access device-internal resources.

 */

#define CSR_GP_CNTRL_REG_FLAG_INIT_DONE		     (0x00000004)

#define CSR_GP_CNTRL_REG_FLAG_GOING_TO_SLEEP         (0x00000010)

#define CSR_GP_CNTRL_REG_FLAG_XTAL_ON		     (0x00000400)

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

+5 −0
Original line number Diff line number Diff line
@@ -449,6 +449,11 @@ enum { 
#define PERSISTENCE_BIT			BIT(12)

#define PREG_WFPM_ACCESS		BIT(12)



#define HPM_HIPM_GEN_CFG			0xA03458

#define HPM_HIPM_GEN_CFG_CR_PG_EN		BIT(0)

#define HPM_HIPM_GEN_CFG_CR_SLP_EN		BIT(1)

#define HPM_HIPM_GEN_CFG_CR_FORCE_ACTIVE	BIT(10)



#define UREG_DOORBELL_TO_ISR6		0xA05C04

#define UREG_DOORBELL_TO_ISR6_NMI_BIT	BIT(0)

#define UREG_DOORBELL_TO_ISR6_SUSPEND	BIT(18)

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

+6 −0
Original line number Diff line number Diff line
@@ -1405,6 +1405,12 @@ static inline bool iwl_mvm_is_scan_ext_chan_supported(struct iwl_mvm *mvm) 
			  IWL_UCODE_TLV_API_SCAN_EXT_CHAN_VER);

}



static inline bool iwl_mvm_is_reduced_config_scan_supported(struct iwl_mvm *mvm)

{

	return fw_has_api(&mvm->fw->ucode_capa,

			  IWL_UCODE_TLV_API_REDUCED_SCAN_CONFIG);

}



static inline bool iwl_mvm_has_new_rx_stats_api(struct iwl_mvm *mvm)

{

	return fw_has_api(&mvm->fw->ucode_capa,