Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1077ec47 authored by Christian Lamparter's avatar Christian Lamparter Committed by Kalle Valo
Browse files

ath9k: move RELAY and DEBUG_FS to ATH9K[_HTC]_DEBUGFS 



Currently, the common ath9k_common module needs to have a
dependency on RELAY and DEBUG_FS in order to built. This
is usually not a problem. But for RAM and FLASH starved
AR71XX devices, every little bit counts.

This patch adds a new symbol CONFIG_ATH9K_COMMON_DEBUG
which makes it possible to drop the RELAY and DEBUG_FS
dependency there and move it to ATH_(HTC)_DEBUGFS.

Note: The shared FFT/spectral code (which is the only user
of the relayfs in ath9k*) needs DEBUG_FS to export the relayfs
interface to dump the data to userspace. So it makes no sense
to have the functions compiled in, if DEBUG_FS is not there.

Signed-off-by: default avatarChristian Lamparter <chunkeey@googlemail.com>
Signed-off-by: default avatarKalle Valo <kvalo@qca.qualcomm.com>
parent c1e3330f

drivers/net/wireless/ath/ath9k/Kconfig

+7 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ config ATH9K_HW 
config ATH9K_COMMON

	tristate

	select ATH_COMMON

	select DEBUG_FS

	select RELAY

config ATH9K_COMMON_DEBUG

	bool

config ATH9K_DFS_DEBUGFS

	def_bool y

	depends on ATH9K_DEBUGFS && ATH9K_DFS_CERTIFIED
@@ -60,12 +60,14 @@ config ATH9K_DEBUGFS 
	bool "Atheros ath9k debugging"

	depends on ATH9K && DEBUG_FS

	select MAC80211_DEBUGFS

	select ATH9K_COMMON_DEBUG

	select RELAY

	---help---

	  Say Y, if you need access to ath9k's statistics for

	  interrupts, rate control, etc.



	  Also required for changing debug message flags at run time.

	  As well as access to the FFT/spectral data and TX99.



config ATH9K_STATION_STATISTICS

	bool "Detailed station statistics"
@@ -174,8 +176,11 @@ config ATH9K_HTC 
config ATH9K_HTC_DEBUGFS

	bool "Atheros ath9k_htc debugging"

	depends on ATH9K_HTC && DEBUG_FS

	select ATH9K_COMMON_DEBUG

	select RELAY

	---help---

	  Say Y, if you need access to ath9k_htc's statistics.

	  As well as access to the FFT/spectral data.



config ATH9K_HWRNG

	bool "Random number generator support"

drivers/net/wireless/ath/ath9k/Makefile

+3 −2
Original line number Diff line number Diff line
@@ -60,7 +60,8 @@ obj-$(CONFIG_ATH9K_COMMON) += ath9k_common.o 
ath9k_common-y:=	common.o \

			common-init.o \

			common-beacon.o \

			common-debug.o \



ath9k_common-$(CONFIG_ATH9K_COMMON_DEBUG) += common-debug.o \

					     common-spectral.o



ath9k_htc-y +=	htc_hst.o \

drivers/net/wireless/ath/ath9k/common-debug.h

+27 −0
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ struct ath_rx_stats { 
	u32 rx_spectral;

};



#ifdef CONFIG_ATH9K_COMMON_DEBUG

void ath9k_cmn_debug_modal_eeprom(struct dentry *debugfs_phy,

				  struct ath_hw *ah);

void ath9k_cmn_debug_base_eeprom(struct dentry *debugfs_phy,
@@ -70,3 +71,29 @@ void ath9k_cmn_debug_recv(struct dentry *debugfs_phy, 
			  struct ath_rx_stats *rxstats);

void ath9k_cmn_debug_phy_err(struct dentry *debugfs_phy,

			     struct ath_rx_stats *rxstats);

#else

static inline void ath9k_cmn_debug_modal_eeprom(struct dentry *debugfs_phy,

						struct ath_hw *ah)

{

}



static inline void ath9k_cmn_debug_base_eeprom(struct dentry *debugfs_phy,

					       struct ath_hw *ah)

{

}



static inline void ath9k_cmn_debug_stat_rx(struct ath_rx_stats *rxstats,

					   struct ath_rx_status *rs)

{

}



static inline void ath9k_cmn_debug_recv(struct dentry *debugfs_phy,

					struct ath_rx_stats *rxstats)

{

}



static inline void ath9k_cmn_debug_phy_err(struct dentry *debugfs_phy,

					   struct ath_rx_stats *rxstats)

{

}

#endif /* CONFIG_ATH9K_COMMON_DEBUG */

drivers/net/wireless/ath/ath9k/common-spectral.c

+1 −1
Original line number Diff line number Diff line
@@ -1075,7 +1075,7 @@ static struct rchan_callbacks rfs_spec_scan_cb = { 


void ath9k_cmn_spectral_deinit_debug(struct ath_spec_scan_priv *spec_priv)

{

	if (IS_ENABLED(CONFIG_ATH9K_DEBUGFS) && spec_priv->rfs_chan_spec_scan) {

	if (spec_priv->rfs_chan_spec_scan) {

		relay_close(spec_priv->rfs_chan_spec_scan);

		spec_priv->rfs_chan_spec_scan = NULL;

	}

drivers/net/wireless/ath/ath9k/common-spectral.h

+23 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ static inline u8 spectral_bitmap_weight(u8 *bins) 
	return bins[0] & 0x3f;

}



#ifdef CONFIG_ATH9K_COMMON_DEBUG

void ath9k_cmn_spectral_init_debug(struct ath_spec_scan_priv *spec_priv, struct dentry *debugfs_phy);

void ath9k_cmn_spectral_deinit_debug(struct ath_spec_scan_priv *spec_priv);
@@ -161,5 +162,27 @@ int ath9k_cmn_spectral_scan_config(struct ath_common *common, 
			       enum spectral_mode spectral_mode);

int ath_cmn_process_fft(struct ath_spec_scan_priv *spec_priv, struct ieee80211_hdr *hdr,

		    struct ath_rx_status *rs, u64 tsf);

#else

static inline void ath9k_cmn_spectral_init_debug(struct ath_spec_scan_priv *spec_priv,

						 struct dentry *debugfs_phy)

{

}



static inline void ath9k_cmn_spectral_deinit_debug(struct ath_spec_scan_priv *spec_priv)

{

}



static inline void ath9k_cmn_spectral_scan_trigger(struct ath_common *common,

						   struct ath_spec_scan_priv *spec_priv)

{

}



static inline int ath_cmn_process_fft(struct ath_spec_scan_priv *spec_priv,

				      struct ieee80211_hdr *hdr,

				      struct ath_rx_status *rs, u64 tsf)

{

	return 0;

}

#endif /* CONFIG_ATH9K_COMMON_DEBUG */



#endif /* SPECTRAL_H */