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

Merge tag 'wireless-drivers-next-2021-08-22' of... 

Merge tag 'wireless-drivers-next-2021-08-22' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for v5.15

First set of patches for v5.15. This got delayed as I have been mostly
offline for the last few weeks. The biggest change is removal of
prism54 driver, otherwise just smaller changes.

Major changes:

ath5k, ath9k, ath10k, ath11k:

* switch from 'pci_' to 'dma_' API

brcmfmac

* allow per-board firmware binaries

* add support 43752 SDIO device

prism54

* remove the obsoleted driver, everyone should be using p54 driver instead
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 056b29ae 0dc62413

MAINTAINERS

+0 −7
Original line number Diff line number Diff line
@@ -14953,13 +14953,6 @@ S: Maintained 
F:	include/linux/printk.h

F:	kernel/printk/









PRISM54 WIRELESS DRIVER









M:	Luis Chamberlain <mcgrof@kernel.org>









L:	linux-wireless@vger.kernel.org









S:	Obsolete









W:	https://wireless.wiki.kernel.org/en/users/Drivers/p54









F:	drivers/net/wireless/intersil/prism54/

















PROC FILESYSTEM









L:	linux-kernel@vger.kernel.org









L:	linux-fsdevel@vger.kernel.org
































drivers/net/wireless/ath/ath10k/pci.c



+1
−8






























Original line number
Diff line number
Diff line







@@ -3393,19 +3393,12 @@ static int ath10k_pci_claim(struct ath10k *ar)







	}



















	/* Target expects 32 bit DMA. Enforce it. */









	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));









	ret = dma_set_mask_and_coherent(&pdev->dev, DMA_BIT_MASK(32));









	if (ret) {









		ath10k_err(ar, "failed to set dma mask to 32-bit: %d\n", ret);









		goto err_region;









	}



















	ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(32));









	if (ret) {









		ath10k_err(ar, "failed to set consistent dma mask to 32-bit: %d\n",









			   ret);









		goto err_region;









	}



















	pci_set_master(pdev);



















	/* Arrange for access to Target SoC registers. */
































drivers/net/wireless/ath/ath11k/dp_rx.c



+0
−5






























Original line number
Diff line number
Diff line







@@ -1406,11 +1406,6 @@ ath11k_update_per_peer_tx_stats(struct ath11k *ar,







	 * Firmware rate's control to be skipped for this?









	 */



















	if (flags == WMI_RATE_PREAMBLE_HE && mcs > 11) {









		ath11k_warn(ab, "Invalid HE mcs %d peer stats",  mcs);









		return;









	}



















	if (flags == WMI_RATE_PREAMBLE_HE && mcs > ATH11K_HE_MCS_MAX) {









		ath11k_warn(ab, "Invalid HE mcs %d peer stats",  mcs);









		return;
































drivers/net/wireless/ath/ath11k/pci.c



+2
−8






























Original line number
Diff line number
Diff line







@@ -933,20 +933,14 @@ static int ath11k_pci_claim(struct ath11k_pci *ab_pci, struct pci_dev *pdev)







		goto disable_device;









	}



















	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(ATH11K_PCI_DMA_MASK));









	ret = dma_set_mask_and_coherent(&pdev->dev,









					DMA_BIT_MASK(ATH11K_PCI_DMA_MASK));









	if (ret) {









		ath11k_err(ab, "failed to set pci dma mask to %d: %d\n",









			   ATH11K_PCI_DMA_MASK, ret);









		goto release_region;









	}



















	ret = pci_set_consistent_dma_mask(pdev, DMA_BIT_MASK(ATH11K_PCI_DMA_MASK));









	if (ret) {









		ath11k_err(ab, "failed to set pci consistent dma mask to %d: %d\n",









			   ATH11K_PCI_DMA_MASK, ret);









		goto release_region;









	}



















	pci_set_master(pdev);



















	ab->mem_len = pci_resource_len(pdev, ATH11K_PCI_BAR_NUM);
































drivers/net/wireless/ath/ath5k/pci.c



+1
−1






























Original line number
Diff line number
Diff line







@@ -191,7 +191,7 @@ ath5k_pci_probe(struct pci_dev *pdev,







	}



















	/* XXX 32-bit addressing only */









	ret = pci_set_dma_mask(pdev, DMA_BIT_MASK(32));









	ret = dma_set_mask(&pdev->dev, DMA_BIT_MASK(32));









	if (ret) {









		dev_err(&pdev->dev, "32-bit DMA not available\n");









		goto err_dis;