Commit 6392b5b2 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-drivers-2020-12-03' of... 

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

Kalle Valo says:

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

Second, and most likely final, set of fixes for v5.10. Small fixes and
PCI id addtions.

iwlwifi
 * PCI id additions
mt76
 * fix a kernel crash during device removal
rtw88
 * fix uninitialized memory in debugfs code

* tag 'wireless-drivers-2020-12-03' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers:
  rtw88: debug: Fix uninitialized memory in debugfs code
  mt76: usb: fix crash on device removal
  iwlwifi: pcie: add some missing entries for AX210
  iwlwifi: pcie: invert values of NO_160 device config entries
  iwlwifi: pcie: add one missing entry for AX210
  iwlwifi: update MAINTAINERS entry
====================

Link: https://lore.kernel.org/r/20201203183408.EE88AC43461@smtp.codeaurora.org


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 82a10dc7 74a8c816

MAINTAINERS

+0 −3
Original line number Diff line number Diff line
@@ -9078,10 +9078,7 @@ S: Supported 
F:	drivers/net/wireless/intel/iwlegacy/









INTEL WIRELESS WIFI LINK (iwlwifi)









M:	Johannes Berg <johannes.berg@intel.com>









M:	Emmanuel Grumbach <emmanuel.grumbach@intel.com>









M:	Luca Coelho <luciano.coelho@intel.com>









M:	Intel Linux Wireless <linuxwifi@intel.com>









L:	linux-wireless@vger.kernel.org









S:	Supported









W:	https://wireless.wiki.kernel.org/en/users/drivers/iwlwifi
































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



+2
−2






























Original line number
Diff line number
Diff line







@@ -491,8 +491,8 @@ struct iwl_cfg {







#define IWL_CFG_RF_ID_HR		0x7









#define IWL_CFG_RF_ID_HR1		0x4



















#define IWL_CFG_NO_160			0x0









#define IWL_CFG_160			0x1









#define IWL_CFG_NO_160			0x1









#define IWL_CFG_160			0x0



















#define IWL_CFG_CORES_BT		0x0









#define IWL_CFG_CORES_BT_GNSS		0x5
































drivers/net/wireless/intel/iwlwifi/pcie/drv.c



+6
−0






























Original line number
Diff line number
Diff line







@@ -536,9 +536,15 @@ static const struct pci_device_id iwl_hw_card_ids[] = {

















	{IWL_PCI_DEVICE(0x2725, 0x0090, iwlax211_2ax_cfg_so_gf_a0)},









	{IWL_PCI_DEVICE(0x2725, 0x0020, iwlax210_2ax_cfg_ty_gf_a0)},









	{IWL_PCI_DEVICE(0x2725, 0x0024, iwlax210_2ax_cfg_ty_gf_a0)},









	{IWL_PCI_DEVICE(0x2725, 0x0310, iwlax210_2ax_cfg_ty_gf_a0)},









	{IWL_PCI_DEVICE(0x2725, 0x0510, iwlax210_2ax_cfg_ty_gf_a0)},









	{IWL_PCI_DEVICE(0x2725, 0x0A10, iwlax210_2ax_cfg_ty_gf_a0)},









	{IWL_PCI_DEVICE(0x2725, 0xE020, iwlax210_2ax_cfg_ty_gf_a0)},









	{IWL_PCI_DEVICE(0x2725, 0xE024, iwlax210_2ax_cfg_ty_gf_a0)},









	{IWL_PCI_DEVICE(0x2725, 0x4020, iwlax210_2ax_cfg_ty_gf_a0)},









	{IWL_PCI_DEVICE(0x2725, 0x6020, iwlax210_2ax_cfg_ty_gf_a0)},









	{IWL_PCI_DEVICE(0x2725, 0x6024, iwlax210_2ax_cfg_ty_gf_a0)},









	{IWL_PCI_DEVICE(0x2725, 0x00B0, iwlax411_2ax_cfg_sosnj_gf4_a0)},









	{IWL_PCI_DEVICE(0x2726, 0x0070, iwlax201_cfg_snj_hr_b0)},









	{IWL_PCI_DEVICE(0x2726, 0x0074, iwlax201_cfg_snj_hr_b0)},
































drivers/net/wireless/mediatek/mt76/usb.c



+9
−8






























Original line number
Diff line number
Diff line







@@ -1020,8 +1020,6 @@ void mt76u_stop_tx(struct mt76_dev *dev)







{









	int ret;



















	mt76_worker_disable(&dev->tx_worker);



















	ret = wait_event_timeout(dev->tx_wait, !mt76_has_tx_pending(&dev->phy),









				 HZ / 5);









	if (!ret) {








@@ -1040,6 +1038,8 @@ void mt76u_stop_tx(struct mt76_dev *dev)







				usb_kill_urb(q->entry[j].urb);









		}



















		mt76_worker_disable(&dev->tx_worker);



















		/* On device removal we maight queue skb's, but mt76u_tx_kick()









		 * will fail to submit urb, cleanup those skb's manually.









		 */








@@ -1048,18 +1048,19 @@ void mt76u_stop_tx(struct mt76_dev *dev)







			if (!q)









				continue;



















			while (q->queued > 0) {









				entry = q->entry[q->tail];









				q->entry[q->tail].done = false;



















				mt76_queue_tx_complete(dev, q, &entry);









			}









		}



















		mt76_worker_enable(&dev->tx_worker);









	}



















	cancel_work_sync(&dev->usb.stat_work);









	clear_bit(MT76_READING_STATS, &dev->phy.state);



















	mt76_worker_enable(&dev->tx_worker);



















	mt76_tx_status_check(dev, NULL, true);









}









EXPORT_SYMBOL_GPL(mt76u_stop_tx);
































drivers/net/wireless/realtek/rtw88/debug.c



+2
−0






























Original line number
Diff line number
Diff line







@@ -147,6 +147,8 @@ static int rtw_debugfs_copy_from_user(char tmp[], int size,







{









	int tmp_len;



















	memset(tmp, 0, size);



















	if (count < num)









		return -EFAULT;