فهرست منبع

ath10k: move spectral scan support under a separate config symbol

At the moment, spectral scan support, and with it RELAY, is always enabled
with ATH10K_DEBUGFS. Spectral scan support is currently the only user of
RELAY in ath10k, and it unconditionally reserves a relay channel.

Having debugfs support in ath10k is often useful even on very small
embedded routers, where we'd rather like to avoid the code size and RAM
usage of the relay support. While ath10k-based devices usually have more
resources than ath9k-based ones, it makes sense to keep the configuration
symmetric to ath9k, so the same base kernel without RELAY can be used for
both ath9k and ath10k hardware.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
Matthias Schiffer 7 سال پیش
والد
کامیت
42e01cb9cb
3فایلهای تغییر یافته به همراه11 افزوده شده و 4 حذف شده
  1. 8 1
      drivers/net/wireless/ath/ath10k/Kconfig
  2. 1 1
      drivers/net/wireless/ath/ath10k/Makefile
  3. 2 2
      drivers/net/wireless/ath/ath10k/spectral.h

+ 8 - 1
drivers/net/wireless/ath/ath10k/Kconfig

@@ -47,12 +47,19 @@ config ATH10K_DEBUG
 config ATH10K_DEBUGFS
 config ATH10K_DEBUGFS
 	bool "Atheros ath10k debugfs support"
 	bool "Atheros ath10k debugfs support"
 	depends on ATH10K && DEBUG_FS
 	depends on ATH10K && DEBUG_FS
-	select RELAY
 	---help---
 	---help---
 	  Enabled debugfs support
 	  Enabled debugfs support
 
 
 	  If unsure, say Y to make it easier to debug problems.
 	  If unsure, say Y to make it easier to debug problems.
 
 
+config ATH10K_SPECTRAL
+	bool "Atheros ath10k spectral scan support"
+	depends on ATH10K_DEBUGFS
+	select RELAY
+	default n
+	---help---
+	  Say Y to enable access to the FFT/spectral data via debugfs.
+
 config ATH10K_TRACING
 config ATH10K_TRACING
 	bool "Atheros ath10k tracing support"
 	bool "Atheros ath10k tracing support"
 	depends on ATH10K
 	depends on ATH10K

+ 1 - 1
drivers/net/wireless/ath/ath10k/Makefile

@@ -15,7 +15,7 @@ ath10k_core-y += mac.o \
 		 p2p.o \
 		 p2p.o \
 		 swap.o
 		 swap.o
 
 
-ath10k_core-$(CONFIG_ATH10K_DEBUGFS) += spectral.o
+ath10k_core-$(CONFIG_ATH10K_SPECTRAL) += spectral.o
 ath10k_core-$(CONFIG_NL80211_TESTMODE) += testmode.o
 ath10k_core-$(CONFIG_NL80211_TESTMODE) += testmode.o
 ath10k_core-$(CONFIG_ATH10K_TRACING) += trace.o
 ath10k_core-$(CONFIG_ATH10K_TRACING) += trace.o
 ath10k_core-$(CONFIG_THERMAL) += thermal.o
 ath10k_core-$(CONFIG_THERMAL) += thermal.o

+ 2 - 2
drivers/net/wireless/ath/ath10k/spectral.h

@@ -44,7 +44,7 @@ enum ath10k_spectral_mode {
 	SPECTRAL_MANUAL,
 	SPECTRAL_MANUAL,
 };
 };
 
 
-#ifdef CONFIG_ATH10K_DEBUGFS
+#ifdef CONFIG_ATH10K_SPECTRAL
 
 
 int ath10k_spectral_process_fft(struct ath10k *ar,
 int ath10k_spectral_process_fft(struct ath10k *ar,
 				struct wmi_phyerr_ev_arg *phyerr,
 				struct wmi_phyerr_ev_arg *phyerr,
@@ -85,6 +85,6 @@ static inline void ath10k_spectral_destroy(struct ath10k *ar)
 {
 {
 }
 }
 
 
-#endif /* CONFIG_ATH10K_DEBUGFS */
+#endif /* CONFIG_ATH10K_SPECTRAL */
 
 
 #endif /* SPECTRAL_H */
 #endif /* SPECTRAL_H */