Commit f5f58a0b authored by Kalle Valo's avatar Kalle Valo
Browse files

Merge ath-next from git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/ath.git 

ath.git patches for v5.9. Major changes:

ath11k

* add 6G band support

* add spectral scan support
parents b3a9e3b9 01e34233

drivers/net/wireless/ath/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -15,11 +15,11 @@ config WLAN_VENDOR_ATH 


	  For more information and documentation on this module you can visit:



	  http://wireless.kernel.org/en/users/Drivers/ath

	  https://wireless.wiki.kernel.org/en/users/Drivers/ath



	  For information on all Atheros wireless drivers visit:



	  http://wireless.kernel.org/en/users/Drivers/Atheros

	  https://wireless.wiki.kernel.org/en/users/Drivers/Atheros



if WLAN_VENDOR_ATH

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

+4 −0
Original line number Diff line number Diff line
@@ -1591,7 +1591,9 @@ static int ath10k_htt_tx_32(struct ath10k_htt *htt, 
err_unmap_msdu:

	dma_unmap_single(dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE);

err_free_msdu_id:

	spin_lock_bh(&htt->tx_lock);

	ath10k_htt_tx_free_msdu_id(htt, msdu_id);

	spin_unlock_bh(&htt->tx_lock);

err:

	return res;

}
@@ -1798,7 +1800,9 @@ static int ath10k_htt_tx_64(struct ath10k_htt *htt, 
err_unmap_msdu:

	dma_unmap_single(dev, skb_cb->paddr, msdu->len, DMA_TO_DEVICE);

err_free_msdu_id:

	spin_lock_bh(&htt->tx_lock);

	ath10k_htt_tx_free_msdu_id(htt, msdu_id);

	spin_unlock_bh(&htt->tx_lock);

err:

	return res;

}

drivers/net/wireless/ath/ath11k/Kconfig

+9 −0
Original line number Diff line number Diff line
@@ -34,3 +34,12 @@ config ATH11K_TRACING 
	depends on ATH11K && EVENT_TRACING

	help

	  Select this to use ath11k tracing infrastructure.



config ATH11K_SPECTRAL

	bool "QCA ath11k spectral scan support"

	depends on ATH11K_DEBUGFS

	depends on RELAY

	help

	  Enable ath11k spectral scan support



	  Say Y to enable access to the FFT/spectral data via debugfs.

drivers/net/wireless/ath/ath11k/Makefile

+3 −1
Original line number Diff line number Diff line
@@ -15,12 +15,14 @@ ath11k-y += core.o \ 
	    dp_rx.o \

	    debug.o \

	    ce.o \

	    peer.o

	    peer.o \

	    dbring.o



ath11k-$(CONFIG_ATH11K_DEBUGFS) += debug_htt_stats.o debugfs_sta.o

ath11k-$(CONFIG_NL80211_TESTMODE) += testmode.o

ath11k-$(CONFIG_ATH11K_TRACING) += trace.o

ath11k-$(CONFIG_THERMAL) += thermal.o

ath11k-$(CONFIG_ATH11K_SPECTRAL) += spectral.o



# for tracing framework to find trace.h

CFLAGS_trace.o := -I$(src)

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

+10 −0
Original line number Diff line number Diff line
@@ -400,8 +400,16 @@ static int ath11k_core_pdev_create(struct ath11k_base *ab) 
		goto err_dp_pdev_free;

	}



	ret = ath11k_spectral_init(ab);

	if (ret) {

		ath11k_err(ab, "failed to init spectral %d\n", ret);

		goto err_thermal_unregister;

	}



	return 0;



err_thermal_unregister:

	ath11k_thermal_unregister(ab);

err_dp_pdev_free:

	ath11k_dp_pdev_free(ab);

err_mac_unregister:
@@ -414,6 +422,7 @@ static int ath11k_core_pdev_create(struct ath11k_base *ab) 


static void ath11k_core_pdev_destroy(struct ath11k_base *ab)

{

	ath11k_spectral_deinit(ab);

	ath11k_thermal_unregister(ab);

	ath11k_mac_unregister(ab);

	ath11k_hif_irq_disable(ab);
@@ -582,6 +591,7 @@ static int ath11k_core_reconfigure_on_crash(struct ath11k_base *ab) 
	ath11k_thermal_unregister(ab);

	ath11k_hif_irq_disable(ab);

	ath11k_dp_pdev_free(ab);

	ath11k_spectral_deinit(ab);

	ath11k_hif_stop(ab);

	ath11k_wmi_detach(ab);

	ath11k_dp_pdev_reo_cleanup(ab);