Commit 1eae77bf authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-drivers-2020-11-23' of... 

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

Kalle Valo says:

====================
wireless-drivers fixes for v5.10

First set of fixes for v5.10. One fix for iwlwifi kernel panic, others
less notable.

rtw88

* fix a bogus test found by clang

iwlwifi

* fix long memory reads causing soft lockup warnings

* fix kernel panic during Channel Switch Announcement (CSA)

* other smaller fixes

MAINTAINERS

* email address updates

* tag 'wireless-drivers-2020-11-23' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers:
  iwlwifi: mvm: fix kernel panic in case of assert during CSA
  iwlwifi: pcie: set LTR to avoid completion timeout
  iwlwifi: mvm: write queue_sync_state only for sync
  iwlwifi: mvm: properly cancel a session protection for P2P
  iwlwifi: mvm: use the HOT_SPOT_CMD to cancel an AUX ROC
  iwlwifi: sta: set max HE max A-MPDU according to HE capa
  MAINTAINERS: update maintainers list for Cypress
  MAINTAINERS: update Yan-Hsuan's email address
  iwlwifi: pcie: limit memory read spin time
  rtw88: fix fw_fifo_addr check
====================

Link: https://lore.kernel.org/r/20201123161037.C11D1C43460@smtp.codeaurora.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents f9b03653 fe56d05e

MAINTAINERS

+5 −4
Original line number Diff line number Diff line
@@ -3528,11 +3528,12 @@ BROADCOM BRCM80211 IEEE802.11n WIRELESS DRIVER 
M:	Arend van Spriel <arend.vanspriel@broadcom.com>

M:	Franky Lin <franky.lin@broadcom.com>

M:	Hante Meuleman <hante.meuleman@broadcom.com>

M:	Chi-Hsien Lin <chi-hsien.lin@cypress.com>

M:	Wright Feng <wright.feng@cypress.com>

M:	Chi-hsien Lin <chi-hsien.lin@infineon.com>

M:	Wright Feng <wright.feng@infineon.com>

M:	Chung-hsien Hsu <chung-hsien.hsu@infineon.com>

L:	linux-wireless@vger.kernel.org

L:	brcm80211-dev-list.pdl@broadcom.com

L:	brcm80211-dev-list@cypress.com

L:	SHA-cyfmac-dev-list@infineon.com

S:	Supported

F:	drivers/net/wireless/broadcom/brcm80211/








@@ -14802,7 +14803,7 @@ T:	git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.g







F:	drivers/net/wireless/realtek/rtlwifi/

















REALTEK WIRELESS DRIVER (rtw88)









M:	Yan-Hsuan Chuang <yhchuang@realtek.com>









M:	Yan-Hsuan Chuang <tony0620emma@gmail.com>









L:	linux-wireless@vger.kernel.org









S:	Maintained









F:	drivers/net/wireless/realtek/rtw88/
































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



+5
−5






























Original line number
Diff line number
Diff line







@@ -5,10 +5,9 @@







 *









 * GPL LICENSE SUMMARY









 *









 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.









 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH









 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH









 * Copyright(c) 2018 - 2019 Intel Corporation









 * Copyright(c) 2012-2014, 2018 - 2020 Intel Corporation









 *









 * This program is free software; you can redistribute it and/or modify









 * it under the terms of version 2 of the GNU General Public License as








@@ -28,10 +27,9 @@







 *









 * BSD LICENSE









 *









 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.









 * Copyright(c) 2013 - 2014 Intel Mobile Communications GmbH









 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH









 * Copyright(c) 2018 - 2019 Intel Corporation









 * Copyright(c) 2012-2014, 2018 - 2020 Intel Corporation









 * All rights reserved.









 *









 * Redistribution and use in source and binary forms, with or without








@@ -128,7 +126,9 @@ enum iwl_sta_flags {







	STA_FLG_MAX_AGG_SIZE_256K	= (5 << STA_FLG_MAX_AGG_SIZE_SHIFT),









	STA_FLG_MAX_AGG_SIZE_512K	= (6 << STA_FLG_MAX_AGG_SIZE_SHIFT),









	STA_FLG_MAX_AGG_SIZE_1024K	= (7 << STA_FLG_MAX_AGG_SIZE_SHIFT),









	STA_FLG_MAX_AGG_SIZE_MSK	= (7 << STA_FLG_MAX_AGG_SIZE_SHIFT),









	STA_FLG_MAX_AGG_SIZE_2M		= (8 << STA_FLG_MAX_AGG_SIZE_SHIFT),









	STA_FLG_MAX_AGG_SIZE_4M		= (9 << STA_FLG_MAX_AGG_SIZE_SHIFT),









	STA_FLG_MAX_AGG_SIZE_MSK	= (0xf << STA_FLG_MAX_AGG_SIZE_SHIFT),



















	STA_FLG_AGG_MPDU_DENS_SHIFT	= 23,









	STA_FLG_AGG_MPDU_DENS_2US	= (4 << STA_FLG_AGG_MPDU_DENS_SHIFT),
































drivers/net/wireless/intel/iwlwifi/fw/api/time-event.h



+5
−3






























Original line number
Diff line number
Diff line







@@ -8,7 +8,7 @@







 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.









 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH









 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH









 * Copyright(c) 2018 - 2019 Intel Corporation









 * Copyright(c) 2018 - 2020 Intel Corporation









 *









 * This program is free software; you can redistribute it and/or modify









 * it under the terms of version 2 of the GNU General Public License as








@@ -31,7 +31,7 @@







 * Copyright(c) 2012 - 2014 Intel Corporation. All rights reserved.









 * Copyright(c) 2013 - 2015 Intel Mobile Communications GmbH









 * Copyright(c) 2016 - 2017 Intel Deutschland GmbH









 * Copyright(c) 2018 - 2019 Intel Corporation









 * Copyright(c) 2018 - 2020 Intel Corporation









 * All rights reserved.









 *









 * Redistribution and use in source and binary forms, with or without








@@ -421,12 +421,14 @@ struct iwl_hs20_roc_res {







 *	able to run the GO Negotiation. Will not be fragmented and not









 *	repetitive. Valid only on the P2P Device MAC. Only the duration will









 *	be taken into account.









 * @SESSION_PROTECT_CONF_MAX_ID: not used









 */









enum iwl_mvm_session_prot_conf_id {









	SESSION_PROTECT_CONF_ASSOC,









	SESSION_PROTECT_CONF_GO_CLIENT_ASSOC,









	SESSION_PROTECT_CONF_P2P_DEVICE_DISCOV,









	SESSION_PROTECT_CONF_P2P_GO_NEGOTIATION,









	SESSION_PROTECT_CONF_MAX_ID,









}; /* SESSION_PROTECTION_CONF_ID_E_VER_1 */



















/**








@@ -459,7 +461,7 @@ struct iwl_mvm_session_prot_cmd {







 * @mac_id: the mac id for which the session protection started / ended









 * @status: 1 means success, 0 means failure









 * @start: 1 means the session protection started, 0 means it ended









 * @conf_id: the configuration id of the session that started / eneded









 * @conf_id: see &enum iwl_mvm_session_prot_conf_id









 *









 * Note that any session protection will always get two notifications: start









 * and end even the firmware could not schedule it.
































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



+10
−0






























Original line number
Diff line number
Diff line







@@ -147,6 +147,16 @@







#define CSR_MAC_SHADOW_REG_CTL2		(CSR_BASE + 0x0AC)









#define CSR_MAC_SHADOW_REG_CTL2_RX_WAKE	0xFFFF



















/* LTR control (since IWL_DEVICE_FAMILY_22000) */









#define CSR_LTR_LONG_VAL_AD			(CSR_BASE + 0x0D4)









#define CSR_LTR_LONG_VAL_AD_NO_SNOOP_REQ	0x80000000









#define CSR_LTR_LONG_VAL_AD_NO_SNOOP_SCALE	0x1c000000









#define CSR_LTR_LONG_VAL_AD_NO_SNOOP_VAL	0x03ff0000









#define CSR_LTR_LONG_VAL_AD_SNOOP_REQ		0x00008000









#define CSR_LTR_LONG_VAL_AD_SNOOP_SCALE		0x00001c00









#define CSR_LTR_LONG_VAL_AD_SNOOP_VAL		0x000003ff









#define CSR_LTR_LONG_VAL_AD_SCALE_USEC		2



















/* GIO Chicken Bits (PCI Express bus link power management) */









#define CSR_GIO_CHICKEN_BITS    (CSR_BASE+0x100)










































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



+4
−1






























Original line number
Diff line number
Diff line







@@ -3080,7 +3080,7 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,

















	/* this would be a mac80211 bug ... but don't crash */









	if (WARN_ON_ONCE(!mvmvif->phy_ctxt))









		return -EINVAL;









		return test_bit(IWL_MVM_STATUS_HW_RESTART_REQUESTED, &mvm->status) ? 0 : -EINVAL;



















	/*









	 * If we are in a STA removal flow and in DQA mode:








@@ -3127,6 +3127,9 @@ static int iwl_mvm_mac_sta_state(struct ieee80211_hw *hw,







			goto out_unlock;









		}



















		if (vif->type == NL80211_IFTYPE_STATION)









			vif->bss_conf.he_support = sta->he_cap.has_he;



















		if (sta->tdls &&









		    (vif->p2p ||









		     iwl_mvm_tdls_sta_count(mvm, NULL) ==