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

Commit 6a4d05dc authored by Felix Fietkau's avatar Felix Fietkau Committed by John W. Linville
Browse files

ath9k: move ath9k_debug_sync_cause out of ath9k_hw 



ath9k_hw should not depend on any ath9k data structures like ath_softc

Signed-off-by: default avatarFelix Fietkau <nbd@openwrt.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 08f336b8

drivers/net/wireless/ath/ath9k/ar9002_mac.c

+4 −2
Original line number Diff line number Diff line
@@ -29,7 +29,8 @@ static void ar9002_hw_set_desc_link(void *ds, u32 ds_link) 
	((struct ath_desc*) ds)->ds_link = ds_link;

}



static bool ar9002_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked)

static bool ar9002_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked,

			      u32 *sync_cause_p)

{

	u32 isr = 0;

	u32 mask2 = 0;
@@ -136,7 +137,8 @@ static bool ar9002_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked) 
	}



	if (sync_cause) {

		ath9k_debug_sync_cause(common, sync_cause);

		if (sync_cause_p)

			*sync_cause_p = sync_cause;

		fatal_int =

			(sync_cause &

			 (AR_INTR_SYNC_HOST1_FATAL | AR_INTR_SYNC_HOST1_PERR))

drivers/net/wireless/ath/ath9k/ar9003_mac.c

+4 −2
Original line number Diff line number Diff line
@@ -175,7 +175,8 @@ static void ar9003_hw_set_desc_link(void *ds, u32 ds_link) 
	ads->ctl10 |= ar9003_calc_ptr_chksum(ads);

}



static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked)

static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked,

			      u32 *sync_cause_p)

{

	u32 isr = 0;

	u32 mask2 = 0;
@@ -310,7 +311,8 @@ static bool ar9003_hw_get_isr(struct ath_hw *ah, enum ath9k_int *masked) 
		ar9003_mci_get_isr(ah, masked);



	if (sync_cause) {

		ath9k_debug_sync_cause(common, sync_cause);

		if (sync_cause_p)

			*sync_cause_p = sync_cause;

		fatal_int =

			(sync_cause &

			 (AR_INTR_SYNC_HOST1_FATAL | AR_INTR_SYNC_HOST1_PERR))

drivers/net/wireless/ath/ath9k/debug.c

+41 −0
Original line number Diff line number Diff line
@@ -26,6 +26,47 @@ 
#define REG_READ_D(_ah, _reg) \

	ath9k_hw_common(_ah)->ops->read((_ah), (_reg))



void ath9k_debug_sync_cause(struct ath_softc *sc, u32 sync_cause)

{

	if (sync_cause)

		sc->debug.stats.istats.sync_cause_all++;

	if (sync_cause & AR_INTR_SYNC_RTC_IRQ)

		sc->debug.stats.istats.sync_rtc_irq++;

	if (sync_cause & AR_INTR_SYNC_MAC_IRQ)

		sc->debug.stats.istats.sync_mac_irq++;

	if (sync_cause & AR_INTR_SYNC_EEPROM_ILLEGAL_ACCESS)

		sc->debug.stats.istats.eeprom_illegal_access++;

	if (sync_cause & AR_INTR_SYNC_APB_TIMEOUT)

		sc->debug.stats.istats.apb_timeout++;

	if (sync_cause & AR_INTR_SYNC_PCI_MODE_CONFLICT)

		sc->debug.stats.istats.pci_mode_conflict++;

	if (sync_cause & AR_INTR_SYNC_HOST1_FATAL)

		sc->debug.stats.istats.host1_fatal++;

	if (sync_cause & AR_INTR_SYNC_HOST1_PERR)

		sc->debug.stats.istats.host1_perr++;

	if (sync_cause & AR_INTR_SYNC_TRCV_FIFO_PERR)

		sc->debug.stats.istats.trcv_fifo_perr++;

	if (sync_cause & AR_INTR_SYNC_RADM_CPL_EP)

		sc->debug.stats.istats.radm_cpl_ep++;

	if (sync_cause & AR_INTR_SYNC_RADM_CPL_DLLP_ABORT)

		sc->debug.stats.istats.radm_cpl_dllp_abort++;

	if (sync_cause & AR_INTR_SYNC_RADM_CPL_TLP_ABORT)

		sc->debug.stats.istats.radm_cpl_tlp_abort++;

	if (sync_cause & AR_INTR_SYNC_RADM_CPL_ECRC_ERR)

		sc->debug.stats.istats.radm_cpl_ecrc_err++;

	if (sync_cause & AR_INTR_SYNC_RADM_CPL_TIMEOUT)

		sc->debug.stats.istats.radm_cpl_timeout++;

	if (sync_cause & AR_INTR_SYNC_LOCAL_TIMEOUT)

		sc->debug.stats.istats.local_timeout++;

	if (sync_cause & AR_INTR_SYNC_PM_ACCESS)

		sc->debug.stats.istats.pm_access++;

	if (sync_cause & AR_INTR_SYNC_MAC_AWAKE)

		sc->debug.stats.istats.mac_awake++;

	if (sync_cause & AR_INTR_SYNC_MAC_ASLEEP)

		sc->debug.stats.istats.mac_asleep++;

	if (sync_cause & AR_INTR_SYNC_MAC_SLEEP_ACCESS)

		sc->debug.stats.istats.mac_sleep_access++;

}



static ssize_t ath9k_debugfs_read_buf(struct file *file, char __user *user_buf,

				      size_t count, loff_t *ppos)

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

+7 −0
Original line number Diff line number Diff line
@@ -295,6 +295,8 @@ void ath9k_sta_add_debugfs(struct ieee80211_hw *hw, 
void ath9k_debug_stat_ant(struct ath_softc *sc,

			  struct ath_hw_antcomb_conf *div_ant_conf,

			  int main_rssi_avg, int alt_rssi_avg);

void ath9k_debug_sync_cause(struct ath_softc *sc, u32 sync_cause);



#else



#define RX_STAT_INC(c) /* NOP */
@@ -329,6 +331,11 @@ static inline void ath9k_debug_stat_ant(struct ath_softc *sc, 


}



static inline void

ath9k_debug_sync_cause(struct ath_softc *sc, u32 sync_cause)

{

}



#endif /* CONFIG_ATH9K_DEBUGFS */



#endif /* DEBUG_H */

drivers/net/wireless/ath/ath9k/hw-ops.h

+3 −2
Original line number Diff line number Diff line
@@ -49,9 +49,10 @@ static inline bool ath9k_hw_calibrate(struct ath_hw *ah, 
	return ath9k_hw_ops(ah)->calibrate(ah, chan, rxchainmask, longcal);

}



static inline bool ath9k_hw_getisr(struct ath_hw *ah, enum ath9k_int *masked)

static inline bool ath9k_hw_getisr(struct ath_hw *ah, enum ath9k_int *masked,

				   u32 *sync_cause_p)

{

	return ath9k_hw_ops(ah)->get_isr(ah, masked);

	return ath9k_hw_ops(ah)->get_isr(ah, masked, sync_cause_p);

}



static inline void ath9k_hw_set_txdesc(struct ath_hw *ah, void *ds,