2007/11/30, Bruno Randolf <bruno@xxxxxxxxxxxxx>:
> * move all debugging functions to new files debug.c and debug.h.
>
> * consistently use ATH5K_DEBUG instead of AR_DEBUG and AR5K_DEBUG defines.
> ATH5K_DEBUG can be set from outside the Makefile via KCFLAGS.
>
> * rename DPRINTF to ATH5K_DBG to be consistent with the other logging
> functions. ATH5K_DBG honors the debug level set on module load or by debugfs
> and is limited by net_ratelimit(). another define ATH5K_DBG_UNLIMIT can be
> used specifically when we do not want the output to be rate limited.
>
> * move all instances where the debugging output was controlled by additional
> defines (ATH_DEBUG_MODES, ATH_DUMP_SKB) to use the debug level too.
>
> * make ATH5K_TRACE honor the debug level as well.
>
> * remove ath5k_hw_dump_state().
>
> * rename all debugging functions to ath5k_debug_xxx. these are static inline {}
> when ATH5K_DEBUG is 0.
>
> * make ath5k_debug_dump_skb distinguish between RX and TX, so we can choose
> wether we want to see RX or TX packets. also prepend the "phyX" name.
>
> * added debugfs entry (ath5k/phyX/debug) to control the debug level for each
> device.
>
> * add kerneldoc for debugging levels.
>
> base.[ch]:
> Changes-licensed-under: 3-clause-BSD
>
> hw.c, ath5k.h, phy.c:
> Changes-licensed-under: ISC
>
> debug.[ch]:
> Changes-licensed-under: GPL
>
> Signed-off-by: Bruno Randolf <bruno@xxxxxxxxxxxxx>
> ---
> drivers/net/wireless/ath5k/Makefile | 2 +-
> drivers/net/wireless/ath5k/ath5k.h | 10 --
> drivers/net/wireless/ath5k/base.c | 226 +++++++++------------------------
> drivers/net/wireless/ath5k/base.h | 5 +-
> drivers/net/wireless/ath5k/debug.c | 200 +++++++++++++++++++++++++++++
> drivers/net/wireless/ath5k/debug.h | 212 +++++++++++++++++++++++++++++++
> drivers/net/wireless/ath5k/hw.c | 239 ++++++++++-------------------------
> drivers/net/wireless/ath5k/phy.c | 29 +++--
> 8 files changed, 558 insertions(+), 365 deletions(-)
>
> diff --git a/drivers/net/wireless/ath5k/Makefile b/drivers/net/wireless/ath5k/Makefile
> index f27560b..321641f 100644
> --- a/drivers/net/wireless/ath5k/Makefile
> +++ b/drivers/net/wireless/ath5k/Makefile
> @@ -1,2 +1,2 @@
> -ath5k-objs = base.o hw.o regdom.o initvals.o phy.o
> +ath5k-objs = base.o hw.o regdom.o initvals.o phy.o debug.o
> obj-$(CONFIG_ATH5K) += ath5k.o
> diff --git a/drivers/net/wireless/ath5k/ath5k.h b/drivers/net/wireless/ath5k/ath5k.h
> index 1b542f9..1b8ddd9 100644
> --- a/drivers/net/wireless/ath5k/ath5k.h
> +++ b/drivers/net/wireless/ath5k/ath5k.h
> @@ -25,9 +25,6 @@
> * you've been warned. */
> #define CHAN_DEBUG 0
>
> -/* Uncomment this for debuging (warning that it results in TOO much output) */
> -/* #define AR5K_DEBUG 1 */
> -
> #include <linux/io.h>
> #include <linux/types.h>
> #include <net/mac80211.h>
> @@ -90,12 +87,6 @@
> #define ATH5K_ERR(_sc, _fmt, ...) \
> ATH5K_PRINTK_LIMIT(_sc, KERN_ERR, _fmt, ##__VA_ARGS__)
>
> -#ifdef AR5K_DEBUG
> -#define AR5K_TRACE printk(KERN_DEBUG "%s:%d\n", __func__, __LINE__)
> -#else
> -#define AR5K_TRACE
> -#endif
> -
> /*
> * Some tuneable values (these should be changeable by the user)
> */
> @@ -1114,7 +1105,6 @@ extern void ath5k_hw_set_gpio_intr(struct ath5k_hw *ah, unsigned int gpio, u32 i
> /* Regulatory Domain/Channels Setup */
> extern u16 ath5k_get_regdomain(struct ath5k_hw *ah);
> /* Misc functions */
> -extern void ath5k_hw_dump_state(struct ath5k_hw *ah);
> extern int ath5k_hw_get_capability(struct ath5k_hw *ah, enum ath5k_capability_type cap_type, u32 capability, u32 *result);
>
>
> diff --git a/drivers/net/wireless/ath5k/base.c b/drivers/net/wireless/ath5k/base.c
> index 31197a3..444e4a7 100644
> --- a/drivers/net/wireless/ath5k/base.c
> +++ b/drivers/net/wireless/ath5k/base.c
> @@ -56,40 +56,12 @@
>
> #include "base.h"
> #include "reg.h"
> -
> -#define ATH_DEBUG_MODES 0 /* Show found modes in the log? */
> -#define ATH_DUMP_SKB 0 /* show skb contents */
> -#define AR_DEBUG 1
> +#include "debug.h"
>
> /* unaligned little endian access */
> #define LE_READ_2(_p) (le16_to_cpu(get_unaligned((__le16 *)(_p))))
> #define LE_READ_4(_p) (le32_to_cpu(get_unaligned((__le32 *)(_p))))
>
> -#if AR_DEBUG
> -#define DPRINTF(sc, _m, _fmt...) do { \
> - if (unlikely(((sc)->debug & (_m)) && net_ratelimit())) \
> - printk(KERN_DEBUG _fmt); \
> -} while (0)
> -#else
> -static inline int __attribute__ ((format (printf, 3, 4)))
> -DPRINTF(struct ath5k_softc *sc, unsigned int m, const char *fmt, ...)
> -{
> - return 0;
> -}
> -#endif
> -enum {
> - ATH_DEBUG_XMIT = 0x00000001, /* basic xmit operation */
> - ATH_DEBUG_RESET = 0x00000020, /* reset processing */
> - ATH_DEBUG_MODE = 0x00000040, /* mode init/setup */
> - ATH_DEBUG_BEACON = 0x00000080, /* beacon handling */
> - ATH_DEBUG_INTR = 0x00001000, /* ISR */
> - ATH_DEBUG_BEACON_PROC = 0x00008000, /* beacon ISR proc */
> - ATH_DEBUG_CALIBRATE = 0x00010000, /* periodic calibration */
> - ATH_DEBUG_LED = 0x00100000, /* led management */
> - ATH_DEBUG_FATAL = 0x80000000, /* fatal errors */
> - ATH_DEBUG_ANY = 0xffffffff
> -};
> -
> enum {
> ATH_LED_TX,
> ATH_LED_RX,
> @@ -97,73 +69,6 @@ enum {
>
> static int ath5k_calinterval = 10; /* Calibrate PHY every 10 secs (TODO: Fixme) */
>
> -#if AR_DEBUG
> -static unsigned int ath5k_debug;
> -module_param_named(debug, ath5k_debug, uint, 0);
> -#endif
> -
> -#if AR_DEBUG
> -static void ath5k_printrxbuf(struct ath5k_buf *bf, int done)
> -{
> - struct ath5k_desc *ds = bf->desc;
> -
> - printk(KERN_DEBUG "R (%p %llx) %08x %08x %08x %08x %08x %08x %c\n",
> - ds, (unsigned long long)bf->daddr,
> - ds->ds_link, ds->ds_data, ds->ds_ctl0, ds->ds_ctl1,
> - ds->ds_hw[0], ds->ds_hw[1],
> - !done ? ' ' : (ds->ds_rxstat.rs_status == 0) ? '*' : '!');
> -}
> -
> -static void ath5k_printtxbuf(struct ath5k_buf *bf, int done)
> -{
> - struct ath5k_desc *ds = bf->desc;
> -
> - printk(KERN_DEBUG "T (%p %llx) %08x %08x %08x %08x %08x %08x %08x "
> - "%08x %c\n", ds, (unsigned long long)bf->daddr, ds->ds_link,
> - ds->ds_data, ds->ds_ctl0, ds->ds_ctl1,
> - ds->ds_hw[0], ds->ds_hw[1], ds->ds_hw[2], ds->ds_hw[3],
> - !done ? ' ' : (ds->ds_txstat.ts_status == 0) ? '*' : '!');
> -}
> -#endif
> -
> -#if ATH_DUMP_SKB
> -static inline void ath5k_dump_skb(struct sk_buff *skb, const char *prefix)
> -{
> - print_hex_dump_bytes(prefix, DUMP_PREFIX_NONE, skb->data,
> - min(200U, skb->len));
> -}
> -#else
> -static inline void ath5k_dump_skb(struct sk_buff *skb, const char *prefix) {}
> -#endif
> -
> -#if ATH_DEBUG_MODES
> -static void ath5k_dump_modes(struct ieee80211_hw_mode *modes)
> -{
> - unsigned int m, i;
> -
> - for (m = 0; m < NUM_DRIVER_MODES; m++) {
> - printk(KERN_DEBUG "Mode %u: channels %d, rates %d\n", m,
> - modes[m].num_channels, modes[m].num_rates);
> - printk(KERN_DEBUG " channels:\n");
> - for (i = 0; i < modes[m].num_channels; i++)
> - printk(KERN_DEBUG " %3d %d %.4x %.4x\n",
> - modes[m].channels[i].chan,
> - modes[m].channels[i].freq,
> - modes[m].channels[i].val,
> - modes[m].channels[i].flag);
> - printk(KERN_DEBUG " rates:\n");
> - for (i = 0; i < modes[m].num_rates; i++)
> - printk(KERN_DEBUG " %4d %.4x %.4x %.4x\n",
> - modes[m].rates[i].rate,
> - modes[m].rates[i].val,
> - modes[m].rates[i].flags,
> - modes[m].rates[i].val2);
> - }
> -}
> -#else
> -static inline void ath5k_dump_modes(struct ieee80211_hw_mode *modes) {}
> -#endif
> -
>
> /******************\
> * Internal defines *
> @@ -399,6 +304,8 @@ init_ath5k_pci(void)
> {
> int ret;
>
> + ath5k_debug_init();
> +
> ret = pci_register_driver(&ath5k_pci_drv_id);
> if (ret) {
> printk(KERN_ERR "ath5k_pci: can't register pci driver\n");
> @@ -412,6 +319,8 @@ static void __exit
> exit_ath5k_pci(void)
> {
> pci_unregister_driver(&ath5k_pci_drv_id);
> +
> + ath5k_debug_finish();
> }
>
> module_init(init_ath5k_pci);
> @@ -531,13 +440,12 @@ ath5k_pci_probe(struct pci_dev *pdev,
> sc->hw = hw;
> sc->pdev = pdev;
>
> + ath5k_debug_init_device(sc);
> +
> /*
> * Mark the device as detached to avoid processing
> * interrupts until setup is complete.
> */
> -#if AR_DEBUG
> - sc->debug = ath5k_debug;
> -#endif
> __set_bit(ATH_STAT_INVALID, sc->status);
>
> sc->iobase = mem; /* So we can unmap it on detach */
> @@ -637,6 +545,7 @@ ath5k_pci_remove(struct pci_dev *pdev)
> struct ieee80211_hw *hw = pci_get_drvdata(pdev);
> struct ath5k_softc *sc = hw->priv;
>
> + ath5k_debug_finish_device(sc);
> ath5k_detach(pdev, hw);
> ath5k_hw_detach(sc->ah);
> free_irq(pdev->irq, sc);
> @@ -713,7 +622,7 @@ ath5k_attach(struct pci_dev *pdev, struct ieee80211_hw *hw)
> unsigned int i;
> int ret;
>
> - DPRINTF(sc, ATH_DEBUG_ANY, "%s: devid 0x%x\n", __func__, pdev->device);
> + ATH5K_DBG(sc, ATH5K_DEBUG_ANY, "devid 0x%x\n", pdev->device);
>
> /*
> * Check if the MAC has multi-rate retry support.
> @@ -1064,7 +973,7 @@ ath5k_getchannels(struct ieee80211_hw *hw)
> REGISTER_MODE(MODE_IEEE80211B);
> REGISTER_MODE(MODE_IEEE80211A);
>
> - ath5k_dump_modes(modes);
> + ath5k_debug_dump_modes(sc, modes);
>
> return ret;
> }
> @@ -1081,8 +990,8 @@ ath5k_chan_set(struct ath5k_softc *sc, struct ieee80211_channel *chan)
> struct ath5k_hw *ah = sc->ah;
> int ret;
>
> - DPRINTF(sc, ATH_DEBUG_RESET, "%s: %u (%u MHz) -> %u (%u MHz)\n",
> - __func__, sc->curchan->chan, sc->curchan->freq,
> + ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "%u (%u MHz) -> %u (%u MHz)\n",
> + sc->curchan->chan, sc->curchan->freq,
> chan->chan, chan->freq);
>
> if (chan->freq != sc->curchan->freq || chan->val != sc->curchan->val) {
> @@ -1211,7 +1120,7 @@ ath5k_mode_setup(struct ath5k_softc *sc)
> ath5k_hw_set_opmode(ah);
>
> ath5k_hw_set_mcast_filter(ah, 0, 0);
> - DPRINTF(sc, ATH_DEBUG_MODE, "%s: RX filter 0x%x\n", __func__, rfilt);
> + ATH5K_DBG(sc, ATH5K_DEBUG_MODE, "RX filter 0x%x\n", rfilt);
> }
>
>
> @@ -1241,8 +1150,8 @@ ath5k_desc_alloc(struct ath5k_softc *sc, struct pci_dev *pdev)
> }
> ds = sc->desc;
> da = sc->desc_daddr;
> - DPRINTF(sc, ATH_DEBUG_ANY, "%s: DMA map: %p (%zu) -> %llx\n",
> - __func__, ds, sc->desc_len, (unsigned long long)sc->desc_daddr);
> + ATH5K_DBG(sc, ATH5K_DEBUG_ANY, "DMA map: %p (%zu) -> %llx\n",
> + ds, sc->desc_len, (unsigned long long)sc->desc_daddr);
>
> bf = kcalloc(1 + ATH_TXBUF + ATH_RXBUF + ATH_BCBUF,
> sizeof(struct ath5k_buf), GFP_KERNEL);
> @@ -1557,11 +1466,9 @@ ath5k_txq_drainq(struct ath5k_softc *sc, struct ath5k_txq *txq)
> */
> spin_lock_bh(&txq->lock);
> list_for_each_entry_safe(bf, bf0, &txq->q, list) {
> -#if AR_DEBUG
> - if (sc->debug & ATH_DEBUG_RESET)
> - ath5k_printtxbuf(bf, !sc->ah->ah_proc_tx_desc(sc->ah,
> - bf->desc));
> -#endif
> + ath5k_debug_printtxbuf(sc, bf, !sc->ah->ah_proc_tx_desc(sc->ah,
> + bf->desc));
> +
> ath5k_txbuf_free(sc, bf);
>
> spin_lock_bh(&sc->txbuflock);
> @@ -1587,13 +1494,13 @@ ath5k_txq_cleanup(struct ath5k_softc *sc)
> if (likely(!test_bit(ATH_STAT_INVALID, sc->status))) {
> /* don't touch the hardware if marked invalid */
> (void)ath5k_hw_stop_tx_dma(ah, sc->bhalq);
> - DPRINTF(sc, ATH_DEBUG_RESET, "%s: beacon queue %x\n", __func__,
> + ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "beacon queue %x\n",
> ath5k_hw_get_tx_buf(ah, sc->bhalq));
> for (i = 0; i < ARRAY_SIZE(sc->txqs); i++)
> if (sc->txqs[i].setup) {
> ath5k_hw_stop_tx_dma(ah, sc->txqs[i].qnum);
> - DPRINTF(sc, ATH_DEBUG_RESET, "%s: txq [%u] %x, "
> - "link %p\n", __func__,
> + ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "txq [%u] %x, "
> + "link %p\n",
> sc->txqs[i].qnum,
> ath5k_hw_get_tx_buf(ah,
> sc->txqs[i].qnum),
> @@ -1639,8 +1546,8 @@ ath5k_rx_start(struct ath5k_softc *sc)
>
> sc->rxbufsize = roundup(IEEE80211_MAX_LEN, sc->cachelsz);
>
> - DPRINTF(sc, ATH_DEBUG_RESET, "%s: cachelsz %u rxbufsize %u\n",
> - __func__, sc->cachelsz, sc->rxbufsize);
> + ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "cachelsz %u rxbufsize %u\n",
> + sc->cachelsz, sc->rxbufsize);
>
> sc->rxlink = NULL;
>
> @@ -1677,25 +1584,9 @@ ath5k_rx_stop(struct ath5k_softc *sc)
> ath5k_hw_set_rx_filter(ah, 0); /* clear recv filter */
> ath5k_hw_stop_rx_dma(ah); /* disable DMA engine */
> mdelay(3); /* 3ms is long enough for 1 frame */
> -#if AR_DEBUG
> - if (unlikely(sc->debug & (ATH_DEBUG_RESET | ATH_DEBUG_FATAL))) {
> - struct ath5k_desc *ds;
> - struct ath5k_buf *bf;
> - int status;
> -
> - printk(KERN_DEBUG "%s: rx queue %x, link %p\n", __func__,
> - ath5k_hw_get_rx_buf(ah), sc->rxlink);
> -
> - spin_lock_bh(&sc->rxbuflock);
> - list_for_each_entry(bf, &sc->rxbuf, list) {
> - ds = bf->desc;
> - status = ah->ah_proc_rx_desc(ah, ds);
> - if (!status || (sc->debug & ATH_DEBUG_FATAL))
> - ath5k_printrxbuf(bf, status == 0);
> - }
> - spin_unlock_bh(&sc->rxbuflock);
> - }
> -#endif
> +
> + ath5k_debug_printrxbuffs(sc, ah);
> +
> sc->rxlink = NULL; /* just in case */
> }
>
> @@ -1835,7 +1726,7 @@ accept:
> rxs.rate = ds->ds_rxstat.rs_rate;
> rxs.flag |= ath5k_rx_decrypted(sc, ds, skb);
>
> - ath5k_dump_skb(skb, "RX ");
> + ath5k_debug_dump_skb(sc, skb, "RX ", 0);
>
> __ieee80211_rx(sc->hw, skb, &rxs);
> sc->led_rxrate = ds->ds_rxstat.rs_rate;
> @@ -1945,8 +1836,8 @@ ath5k_beacon_setup(struct ath5k_softc *sc, struct ath5k_buf *bf,
>
> bf->skbaddr = pci_map_single(sc->pdev, skb->data, skb->len,
> PCI_DMA_TODEVICE);
> - DPRINTF(sc, ATH_DEBUG_BEACON, "%s: skb %p [data %p len %u] "
> - "skbaddr %llx\n", __func__, skb, skb->data, skb->len,
> + ATH5K_DBG(sc, ATH5K_DEBUG_BEACON, "skb %p [data %p len %u] "
> + "skbaddr %llx\n", skb, skb->data, skb->len,
> (unsigned long long)bf->skbaddr);
> if (pci_dma_mapping_error(bf->skbaddr)) {
> ATH5K_ERR(sc, "beacon DMA mapping failed\n");
> @@ -2001,7 +1892,7 @@ ath5k_beacon_send(struct ath5k_softc *sc)
> struct ath5k_buf *bf = sc->bbuf;
> struct ath5k_hw *ah = sc->ah;
>
> - DPRINTF(sc, ATH_DEBUG_BEACON_PROC, "%s\n", __func__);
> + ATH5K_DBG(sc, ATH5K_DEBUG_BEACON_PROC, "in beacon_send\n");
>
> if (unlikely(bf->skb == NULL || sc->opmode == IEEE80211_IF_TYPE_STA ||
> sc->opmode == IEEE80211_IF_TYPE_MNTR)) {
> @@ -2017,21 +1908,20 @@ ath5k_beacon_send(struct ath5k_softc *sc)
> */
> if (unlikely(ath5k_hw_num_tx_pending(ah, sc->bhalq) != 0)) {
> sc->bmisscount++;
> - DPRINTF(sc, ATH_DEBUG_BEACON_PROC,
> - "%s: missed %u consecutive beacons\n",
> - __func__, sc->bmisscount);
> + ATH5K_DBG(sc, ATH5K_DEBUG_BEACON_PROC,
> + "missed %u consecutive beacons\n", sc->bmisscount);
> if (sc->bmisscount > 3) { /* NB: 3 is a guess */
> - DPRINTF(sc, ATH_DEBUG_BEACON_PROC,
> - "%s: stuck beacon time (%u missed)\n",
> - __func__, sc->bmisscount);
> + ATH5K_DBG(sc, ATH5K_DEBUG_BEACON_PROC,
> + "stuck beacon time (%u missed)\n",
> + sc->bmisscount);
> tasklet_schedule(&sc->restq);
> }
> return;
> }
> if (unlikely(sc->bmisscount != 0)) {
> - DPRINTF(sc, ATH_DEBUG_BEACON_PROC,
> - "%s: resume beacon xmit after %u misses\n",
> - __func__, sc->bmisscount);
> + ATH5K_DBG(sc, ATH5K_DEBUG_BEACON_PROC,
> + "resume beacon xmit after %u misses\n",
> + sc->bmisscount);
> sc->bmisscount = 0;
> }
>
> @@ -2049,8 +1939,8 @@ ath5k_beacon_send(struct ath5k_softc *sc)
>
> ath5k_hw_put_tx_buf(ah, sc->bhalq, bf->daddr);
> ath5k_hw_tx_start(ah, sc->bhalq);
> - DPRINTF(sc, ATH_DEBUG_BEACON_PROC, "%s: TXDP[%u] = %llx (%p)\n",
> - __func__, sc->bhalq, (unsigned long long)bf->daddr, bf->desc);
> + ATH5K_DBG(sc, ATH5K_DEBUG_BEACON_PROC, "TXDP[%u] = %llx (%p)\n",
> + sc->bhalq, (unsigned long long)bf->daddr, bf->desc);
>
> sc->bsent++;
> }
> @@ -2086,8 +1976,8 @@ ath5k_beacon_config(struct ath5k_softc *sc)
> tsf = ath5k_hw_get_tsf64(ah);
> tsftu = TSF_TO_TU((u32)(tsf >> 32), (u32)tsf);
>
> - DPRINTF(sc, ATH_DEBUG_BEACON, "%s: intval %u hw tsftu %u\n", __func__,
> - intval, tsftu);
> + ATH5K_DBG(sc, ATH5K_DEBUG_BEACON, "intval %u hw tsftu %u\n",
> + intval, tsftu);
>
> if (sc->opmode == IEEE80211_IF_TYPE_STA ||
> (sc->opmode == IEEE80211_IF_TYPE_IBSS &&
> @@ -2106,8 +1996,8 @@ ath5k_beacon_config(struct ath5k_softc *sc)
> */
> nexttbtt = tsftu + 2 * intval;
>
> - DPRINTF(sc, ATH_DEBUG_BEACON, "%s: nexttbtt %u "
> - "intval %u\n", __func__, nexttbtt, intval);
> + ATH5K_DBG(sc, ATH5K_DEBUG_BEACON, "nexttbtt %u "
> + "intval %u\n", nexttbtt, intval);
>
> /*
> * In IBSS mode enable the beacon timers but only
> @@ -2163,7 +2053,7 @@ ath5k_init(struct ath5k_softc *sc)
>
> mutex_lock(&sc->lock);
>
> - DPRINTF(sc, ATH_DEBUG_RESET, "%s: mode %d\n", __func__, sc->opmode);
> + ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "mode %d\n", sc->opmode);
>
> /*
> * Stop anything previously setup. This is safe
> @@ -2225,7 +2115,7 @@ ath5k_stop_locked(struct ath5k_softc *sc)
> {
> struct ath5k_hw *ah = sc->ah;
>
> - DPRINTF(sc, ATH_DEBUG_RESET, "%s: invalid %u\n", __func__,
> + ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "invalid %u\n",
> test_bit(ATH_STAT_INVALID, sc->status));
>
> /*
> @@ -2292,11 +2182,11 @@ ath5k_stop_hw(struct ath5k_softc *sc)
> * don't put newer MAC revisions > 7.8 to sleep because
> * of the above mentioned problems
> */
> - DPRINTF(sc, ATH_DEBUG_RESET, "%s: mac version > 7.8, "
> - "not putting device to sleep\n", __func__);
> + ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "mac version > 7.8, "
> + "not putting device to sleep\n");
> } else {
> - DPRINTF(sc, ATH_DEBUG_RESET,
> - "%s: putting device to full sleep\n", __func__);
> + ATH5K_DBG(sc, ATH5K_DEBUG_RESET,
> + "putting device to full sleep\n");
> ath5k_hw_set_power(sc->ah, AR5K_PM_FULL_SLEEP, true, 0);
> }
> }
> @@ -2328,7 +2218,7 @@ ath5k_intr(int irq, void *dev_id)
> * value to insure we only process bits we requested.
> */
> ath5k_hw_get_isr(ah, &status); /* NB: clears IRQ too */
> - DPRINTF(sc, ATH_DEBUG_INTR, "%s: status 0x%x/0x%x\n", __func__,
> + ATH5K_DBG(sc, ATH5K_DEBUG_INTR, "status 0x%x/0x%x\n",
> status, sc->imask);
> status &= sc->imask; /* discard unasked for bits */
> if (unlikely(status & AR5K_INT_FATAL)) {
> @@ -2403,7 +2293,7 @@ ath5k_calibrate(unsigned long data)
> struct ath5k_softc *sc = (void *)data;
> struct ath5k_hw *ah = sc->ah;
>
> - DPRINTF(sc, ATH_DEBUG_CALIBRATE, "ath: channel %u/%x\n",
> + ATH5K_DBG(sc, ATH5K_DEBUG_CALIBRATE, "channel %u/%x\n",
> sc->curchan->chan, sc->curchan->val);
>
> if (ath5k_hw_get_rf_gain(ah) == AR5K_RFGAIN_NEED_CHANGE) {
> @@ -2411,7 +2301,7 @@ ath5k_calibrate(unsigned long data)
> * Rfgain is out of bounds, reset the chip
> * to load new gain values.
> */
> - DPRINTF(sc, ATH_DEBUG_RESET, "calibration, resetting\n");
> + ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "calibration, resetting\n");
> ath5k_reset(sc->hw);
> }
> if (ath5k_hw_phy_calibrate(ah, sc->curchan))
> @@ -2449,7 +2339,7 @@ static void
> ath5k_led_blink(struct ath5k_softc *sc, unsigned int on,
> unsigned int off)
> {
> - DPRINTF(sc, ATH_DEBUG_LED, "%s: on %u off %u\n", __func__, on, off);
> + ATH5K_DBG(sc, ATH5K_DEBUG_LED, "on %u off %u\n", on, off);
> ath5k_hw_set_gpio(sc->ah, sc->led_pin, sc->led_on);
> __set_bit(ATH_STAT_LEDBLINKING, sc->status);
> __clear_bit(ATH_STAT_LEDENDBLINK, sc->status);
> @@ -2493,10 +2383,10 @@ ath5k_tx(struct ieee80211_hw *hw, struct sk_buff *skb,
> int hdrlen;
> int pad;
>
> - ath5k_dump_skb(skb, "TX ");
> + ath5k_debug_dump_skb(sc, skb, "TX ", 1);
>
> if (sc->opmode == IEEE80211_IF_TYPE_MNTR)
> - DPRINTF(sc, ATH_DEBUG_XMIT, "tx in monitor (scan?)\n");
> + ATH5K_DBG(sc, ATH5K_DEBUG_XMIT, "tx in monitor (scan?)\n");
>
> /*
> * the hardware expects the header padded to 4 byte boundaries
> @@ -2552,7 +2442,7 @@ ath5k_reset(struct ieee80211_hw *hw)
> struct ath5k_hw *ah = sc->ah;
> int ret;
>
> - DPRINTF(sc, ATH_DEBUG_RESET, "resetting\n");
> + ATH5K_DBG(sc, ATH5K_DEBUG_RESET, "resetting\n");
> /*
> * Convert to a hw channel description with the flags
> * constrained to reflect the current operating mode.
> @@ -2902,7 +2792,7 @@ ath5k_beacon_update(struct ieee80211_hw *hw, struct sk_buff *skb,
> struct ath5k_softc *sc = hw->priv;
> int ret;
>
> - ath5k_dump_skb(skb, "BC ");
> + ath5k_debug_dump_skb(sc, skb, "BC ", 1);
>
> mutex_lock(&sc->lock);
>
> diff --git a/drivers/net/wireless/ath5k/base.h b/drivers/net/wireless/ath5k/base.h
> index c13e54b..39a2fda 100644
> --- a/drivers/net/wireless/ath5k/base.h
> +++ b/drivers/net/wireless/ath5k/base.h
> @@ -47,6 +47,7 @@
> #include <linux/if_ether.h>
>
> #include "ath5k.h"
> +#include "debug.h"
>
> #define ATH_RXBUF 40 /* number of RX buffers */
> #define ATH_TXBUF 200 /* number of TX buffers */
> @@ -100,7 +101,9 @@ struct ath5k_softc {
> enum ieee80211_if_types opmode;
> struct ath5k_hw *ah; /* Atheros HW */
>
> - int debug;
> +#if ATH5K_DEBUG
> + struct ath5k_dbg_info debug; /* debug info */
> +#endif
>
> struct ath5k_buf *bufptr; /* allocated buffer ptr */
> struct ath5k_desc *desc; /* TX/RX descriptors */
> diff --git a/drivers/net/wireless/ath5k/debug.c b/drivers/net/wireless/ath5k/debug.c
> new file mode 100644
> index 0000000..7427506
> --- /dev/null
> +++ b/drivers/net/wireless/ath5k/debug.c
> @@ -0,0 +1,200 @@
> +/*
> + * Copyright (c) 2007 Bruno Randolf <bruno@xxxxxxxxxxxxx>
> + *
> + * This file is free software: you may copy, redistribute and/or modify it
> + * under the terms of the GNU General Public License as published by the
> + * Free Software Foundation, either version 2 of the License, or (at your
> + * option) any later version.
> + *
> + * This file is distributed in the hope that it will be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program. If not, see <http://www.gnu.org/licenses/>.
> + *
> + *
> + * This file incorporates work covered by the following copyright and
> + * permission notice:
> + *
> + * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
> + * Copyright (c) 2004-2005 Atheros Communications, Inc.
> + * Copyright (c) 2006 Devicescape Software, Inc.
> + * Copyright (c) 2007 Jiri Slaby <jirislaby@xxxxxxxxx>
> + * Copyright (c) 2007 Luis R. Rodriguez <mcgrof@xxxxxxxxxxxxxxxxxx>
> + *
> + * All rights reserved.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + * 1. Redistributions of source code must retain the above copyright
> + * notice, this list of conditions and the following disclaimer,
> + * without modification.
> + * 2. Redistributions in binary form must reproduce at minimum a disclaimer
> + * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
> + * redistribution must be conditioned upon including a substantially
> + * similar Disclaimer requirement for further binary redistribution.
> + * 3. Neither the names of the above-listed copyright holders nor the names
> + * of any contributors may be used to endorse or promote products derived
> + * from this software without specific prior written permission.
> + *
> + * Alternatively, this software may be distributed under the terms of the
> + * GNU General Public License ("GPL") version 2 as published by the Free
> + * Software Foundation.
> + *
> + * NO WARRANTY
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> + * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY
> + * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY,
> + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
> + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
> + * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
> + * THE POSSIBILITY OF SUCH DAMAGES.
> + */
> +
> +#include "debug.h"
> +#include "base.h"
> +
> +static unsigned int ath5k_debug;
> +module_param_named(debug, ath5k_debug, uint, 0);
> +
> +#if ATH5K_DEBUG
> +
> +#include "reg.h"
> +
> +static struct dentry *ath5k_global_debugfs;
> +
> +void
> +ath5k_debug_init(void)
> +{
> + ath5k_global_debugfs = debugfs_create_dir("ath5k", NULL);
> +}
> +
> +void
> +ath5k_debug_init_device(struct ath5k_softc *sc)
> +{
> + sc->debug.level = ath5k_debug;
> + sc->debug.debugfs_phydir = debugfs_create_dir(wiphy_name(sc->hw->wiphy),
> + ath5k_global_debugfs);
> + sc->debug.debugfs_debug = debugfs_create_u32("debug",
> + 0666, sc->debug.debugfs_phydir, &sc->debug.level);
> +}
> +
> +void
> +ath5k_debug_finish(void)
> +{
> + debugfs_remove(ath5k_global_debugfs);
> +}
> +
> +void
> +ath5k_debug_finish_device(struct ath5k_softc *sc)
> +{
> + debugfs_remove(sc->debug.debugfs_debug);
> + debugfs_remove(sc->debug.debugfs_phydir);
> +}
> +
> +void
> +ath5k_debug_dump_modes(struct ath5k_softc *sc, struct ieee80211_hw_mode *modes)
> +{
> + unsigned int m, i;
> +
> + if (likely(!(sc->debug.level & ATH5K_DEBUG_DUMPMODES)))
> + return;
> +
> + for (m = 0; m < NUM_DRIVER_MODES; m++) {
> + printk(KERN_DEBUG "Mode %u: channels %d, rates %d\n", m,
> + modes[m].num_channels, modes[m].num_rates);
> + printk(KERN_DEBUG " channels:\n");
> + for (i = 0; i < modes[m].num_channels; i++)
> + printk(KERN_DEBUG " %3d %d %.4x %.4x\n",
> + modes[m].channels[i].chan,
> + modes[m].channels[i].freq,
> + modes[m].channels[i].val,
> + modes[m].channels[i].flag);
> + printk(KERN_DEBUG " rates:\n");
> + for (i = 0; i < modes[m].num_rates; i++)
> + printk(KERN_DEBUG " %4d %.4x %.4x %.4x\n",
> + modes[m].rates[i].rate,
> + modes[m].rates[i].val,
> + modes[m].rates[i].flags,
> + modes[m].rates[i].val2);
> + }
> +}
> +
> +static inline void
> +ath5k_debug_printrxbuf(struct ath5k_buf *bf, int done)
> +{
> + struct ath5k_desc *ds = bf->desc;
> +
> + printk(KERN_DEBUG "R (%p %llx) %08x %08x %08x %08x %08x %08x %c\n",
> + ds, (unsigned long long)bf->daddr,
> + ds->ds_link, ds->ds_data, ds->ds_ctl0, ds->ds_ctl1,
> + ds->ds_hw[0], ds->ds_hw[1],
> + !done ? ' ' : (ds->ds_rxstat.rs_status == 0) ? '*' : '!');
> +}
> +
> +void
> +ath5k_debug_printrxbuffs(struct ath5k_softc *sc, struct ath5k_hw *ah)
> +{
> + struct ath5k_desc *ds;
> + struct ath5k_buf *bf;
> + int status;
> +
> + if (likely(!(sc->debug.level &
> + (ATH5K_DEBUG_RESET | ATH5K_DEBUG_FATAL))))
> + return;
> +
> + printk(KERN_DEBUG "rx queue %x, link %p\n",
> + ath5k_hw_get_rx_buf(ah), sc->rxlink);
> +
> + spin_lock_bh(&sc->rxbuflock);
> + list_for_each_entry(bf, &sc->rxbuf, list) {
> + ds = bf->desc;
> + status = ah->ah_proc_rx_desc(ah, ds);
> + if (!status || (sc->debug.level & ATH5K_DEBUG_FATAL))
> + ath5k_debug_printrxbuf(bf, status == 0);
> + }
> + spin_unlock_bh(&sc->rxbuflock);
> +}
> +
> +void
> +ath5k_debug_dump_skb(struct ath5k_softc *sc,
> + struct sk_buff *skb, const char *prefix, int tx)
> +{
> + char buf[16];
> +
> + if (likely(!((tx && (sc->debug.level & ATH5K_DEBUG_DUMP_TX)) ||
> + (!tx && (sc->debug.level & ATH5K_DEBUG_DUMP_RX)))))
> + return;
> +
> + snprintf(buf, sizeof(buf), "%s %s", wiphy_name(sc->hw->wiphy), prefix);
> +
> + print_hex_dump_bytes(buf, DUMP_PREFIX_NONE, skb->data,
> + min(200U, skb->len));
> +
> + printk(KERN_DEBUG "\n");
> +}
> +
> +void
> +ath5k_debug_printtxbuf(struct ath5k_softc *sc,
> + struct ath5k_buf *bf, int done)
> +{
> + struct ath5k_desc *ds = bf->desc;
> +
> + if (likely(!(sc->debug.level & ATH5K_DEBUG_RESET)))
> + return;
> +
> + printk(KERN_DEBUG "T (%p %llx) %08x %08x %08x %08x %08x %08x %08x "
> + "%08x %c\n", ds, (unsigned long long)bf->daddr, ds->ds_link,
> + ds->ds_data, ds->ds_ctl0, ds->ds_ctl1,
> + ds->ds_hw[0], ds->ds_hw[1], ds->ds_hw[2], ds->ds_hw[3],
> + !done ? ' ' : (ds->ds_txstat.ts_status == 0) ? '*' : '!');
> +}
> +
> +#endif /* if ATH5K_DEBUG */
> diff --git a/drivers/net/wireless/ath5k/debug.h b/drivers/net/wireless/ath5k/debug.h
> new file mode 100644
> index 0000000..115073f
> --- /dev/null
> +++ b/drivers/net/wireless/ath5k/debug.h
> @@ -0,0 +1,212 @@
> +/*
> + * Copyright (c) 2007 Bruno Randolf <bruno@xxxxxxxxxxxxx>
> + *
> + * This file is free software: you may copy, redistribute and/or modify it
> + * under the terms of the GNU General Public License as published by the
> + * Free Software Foundation, either version 2 of the License, or (at your
> + * option) any later version.
> + *
> + * This file is distributed in the hope that it will be useful, but
> + * WITHOUT ANY WARRANTY; without even the implied warranty of
> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + * General Public License for more details.
> + *
> + * You should have received a copy of the GNU General Public License
> + * along with this program. If not, see <http://www.gnu.org/licenses/>.
> + *
> + *
> + * This file incorporates work covered by the following copyright and
> + * permission notice:
> + *
> + * Copyright (c) 2002-2005 Sam Leffler, Errno Consulting
> + * Copyright (c) 2004-2005 Atheros Communications, Inc.
> + * Copyright (c) 2006 Devicescape Software, Inc.
> + * Copyright (c) 2007 Jiri Slaby <jirislaby@xxxxxxxxx>
> + * Copyright (c) 2007 Luis R. Rodriguez <mcgrof@xxxxxxxxxxxxxxxxxx>
> + *
> + * All rights reserved.
> + *
> + * Redistribution and use in source and binary forms, with or without
> + * modification, are permitted provided that the following conditions
> + * are met:
> + * 1. Redistributions of source code must retain the above copyright
> + * notice, this list of conditions and the following disclaimer,
> + * without modification.
> + * 2. Redistributions in binary form must reproduce at minimum a disclaimer
> + * similar to the "NO WARRANTY" disclaimer below ("Disclaimer") and any
> + * redistribution must be conditioned upon including a substantially
> + * similar Disclaimer requirement for further binary redistribution.
> + * 3. Neither the names of the above-listed copyright holders nor the names
> + * of any contributors may be used to endorse or promote products derived
> + * from this software without specific prior written permission.
> + *
> + * Alternatively, this software may be distributed under the terms of the
> + * GNU General Public License ("GPL") version 2 as published by the Free
> + * Software Foundation.
> + *
> + * NO WARRANTY
> + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
> + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
> + * LIMITED TO, THE IMPLIED WARRANTIES OF NONINFRINGEMENT, MERCHANTIBILITY
> + * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL
> + * THE COPYRIGHT HOLDERS OR CONTRIBUTORS BE LIABLE FOR SPECIAL, EXEMPLARY,
> + * OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
> + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
> + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
> + * IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
> + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
> + * THE POSSIBILITY OF SUCH DAMAGES.
> + */
> +
> +#ifndef _ATH5K_DEBUG_H
> +#define _ATH5K_DEBUG_H
> +
> +/* set this to 1 for debugging output */
> +#ifndef ATH5K_DEBUG
> +#define ATH5K_DEBUG 0
> +#endif
> +
> +struct ath5k_softc;
> +struct ath5k_hw;
> +struct ieee80211_hw_mode;
> +struct sk_buff;
> +struct ath5k_buf;
> +
> +struct ath5k_dbg_info {
> + unsigned int level; /* debug level */
> + /* debugfs entries */
> + struct dentry *debugfs_phydir;
> + struct dentry *debugfs_debug;
> +};
> +
> +/**
> + * enum ath5k_debug_level - ath5k debug level
> + *
> + * @ATH5K_DEBUG_RESET: reset processing
> + * @ATH5K_DEBUG_INTR: interrupt handling
> + * @ATH5K_DEBUG_MODE: mode init/setup
> + * @ATH5K_DEBUG_XMIT: basic xmit operation
> + * @ATH5K_DEBUG_BEACON: beacon handling
> + * @ATH5K_DEBUG_BEACON_PROC: beacon ISR proc
> + * @ATH5K_DEBUG_CALIBRATE: periodic calibration
> + * @ATH5K_DEBUG_TXPOWER: transmit power setting
> + * @ATH5K_DEBUG_LED: led management
> + * @ATH5K_DEBUG_DUMP_RX: print received skb content
> + * @ATH5K_DEBUG_DUMP_TX: print transmit skb content
> + * @ATH5K_DEBUG_DUMPMODES: dump modes
> + * @ATH5K_DEBUG_TRACE: trace function calls
> + * @ATH5K_DEBUG_FATAL: fatal errors
> + * @ATH5K_DEBUG_ANY: show at any debug level
> + *
> + * The debug level is used to control the amount and type of debugging output
> + * we want to see. The debug level is given in calls to ATH5K_DBG to specify
> + * where the message should appear, and the user can control the debugging
> + * messages he wants to see, either by the module parameter 'debug' on module
> + * load, or dynamically by using debugfs 'ath5k/phyX/debug'. these levels can
> + * be combined together by bitwise OR.
> + */
> +enum ath5k_debug_level {
> + ATH5K_DEBUG_RESET = 0x00000001,
> + ATH5K_DEBUG_INTR = 0x00000002,
> + ATH5K_DEBUG_MODE = 0x00000004,
> + ATH5K_DEBUG_XMIT = 0x00000008,
> + ATH5K_DEBUG_BEACON = 0x00000010,
> + ATH5K_DEBUG_BEACON_PROC = 0x00000020,
> + ATH5K_DEBUG_CALIBRATE = 0x00000100,
> + ATH5K_DEBUG_TXPOWER = 0x00000200,
> + ATH5K_DEBUG_LED = 0x00000400,
> + ATH5K_DEBUG_DUMP_RX = 0x00001000,
> + ATH5K_DEBUG_DUMP_TX = 0x00002000,
> + ATH5K_DEBUG_DUMPMODES = 0x00004000,
> + ATH5K_DEBUG_TRACE = 0x00010000,
> + ATH5K_DEBUG_FATAL = 0x80000000,
> + ATH5K_DEBUG_ANY = 0xffffffff
> +};
> +
> +#if ATH5K_DEBUG
> +
> +#define ATH5K_TRACE(_sc) do { \
> + if (unlikely((_sc)->debug.level & ATH5K_DEBUG_TRACE)) \
> + printk(KERN_DEBUG "ath5k trace %s:%d\n", __func__, __LINE__); \
> + } while (0)
> +
> +#define ATH5K_DBG(_sc, _m, _fmt, ...) do { \
> + if (unlikely((_sc)->debug.level & (_m) && net_ratelimit())) \
> + ATH5K_PRINTK(_sc, KERN_DEBUG, "(%s:%d): " _fmt, \
> + __func__, __LINE__, ##__VA_ARGS__); \
> + } while (0)
> +
> +#define ATH5K_DBG_UNLIMIT(_sc, _m, _fmt, ...) do { \
> + if (unlikely((_sc)->debug.level & (_m))) \
> + ATH5K_PRINTK(_sc, KERN_DEBUG, "(%s:%d): " _fmt, \
> + __func__, __LINE__, ##__VA_ARGS__); \
> + } while (0)
> +
> +void
> +ath5k_debug_init(void);
> +
> +void
> +ath5k_debug_init_device(struct ath5k_softc *sc);
> +
> +void
> +ath5k_debug_finish(void);
> +
> +void
> +ath5k_debug_finish_device(struct ath5k_softc *sc);
> +
> +void
> +ath5k_debug_printrxbuffs(struct ath5k_softc *sc, struct ath5k_hw *ah);
> +
> +void
> +ath5k_debug_dump_modes(struct ath5k_softc *sc,
> + struct ieee80211_hw_mode *modes);
> +
> +void
> +ath5k_debug_dump_skb(struct ath5k_softc *sc,
> + struct sk_buff *skb, const char *prefix, int tx);
> +
> +void
> +ath5k_debug_printtxbuf(struct ath5k_softc *sc,
> + struct ath5k_buf *bf, int done);
> +
> +#else /* no debugging */
> +
> +#define ATH5K_TRACE(_sc) /* empty */
> +
> +static inline void __attribute__ ((format (printf, 3, 4)))
> +ATH5K_DBG(struct ath5k_softc *sc, unsigned int m, const char *fmt, ...) {}
> +
> +static inline void __attribute__ ((format (printf, 3, 4)))
> +ATH5K_DBG_UNLIMIT(struct ath5k_softc *sc, unsigned int m, const char *fmt, ...)
> +{}
> +
> +static inline void
> +ath5k_debug_init(void) {}
> +
> +static inline void
> +ath5k_debug_init_device(struct ath5k_softc *sc) {}
> +
> +static inline void
> +ath5k_debug_finish(void) {}
> +
> +static inline void
> +ath5k_debug_finish_device(struct ath5k_softc *sc) {}
> +
> +static inline void
> +ath5k_debug_printrxbuffs(struct ath5k_softc *sc, struct ath5k_hw *ah) {}
> +
> +static inline void
> +ath5k_debug_dump_modes(struct ath5k_softc *sc,
> + struct ieee80211_hw_mode *modes) {}
> +
> +static inline void
> +ath5k_debug_dump_skb(struct ath5k_softc *sc,
> + struct sk_buff *skb, const char *prefix, int tx) {}
> +
> +static inline void
> +ath5k_debug_printtxbuf(struct ath5k_softc *sc,
> + struct ath5k_buf *bf, int done) {}
> +
> +#endif /* if ATH5K_DEBUG */
> +
> +#endif /* ifndef _ATH5K_DEBUG_H */
> diff --git a/drivers/net/wireless/ath5k/hw.c b/drivers/net/wireless/ath5k/hw.c
> index 0cdc195..752bd6a 100644
> --- a/drivers/net/wireless/ath5k/hw.c
> +++ b/drivers/net/wireless/ath5k/hw.c
> @@ -29,6 +29,7 @@
>
> #include "reg.h"
> #include "base.h"
> +#include "debug.h"
>
> /*Rate tables*/
> static const struct ath5k_rate_table ath5k_rt_11a = AR5K_RATES_11A;
> @@ -238,10 +239,6 @@ struct ath5k_hw *ath5k_hw_attach(struct ath5k_softc *sc, u8 mac_version)
>
> ah->ah_phy = AR5K_PHY(0);
>
> -#ifdef AR5K_DEBUG
> - ath5k_hw_dump_state(ah);
> -#endif
> -
> /*
> * Get card capabilities, values, ...
> */
> @@ -295,7 +292,7 @@ static int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, int flags, bool initial)
> mode = 0;
> clock = 0;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> if (ah->ah_version != AR5K_AR5210) {
> /*
> @@ -425,7 +422,7 @@ static int ath5k_hw_nic_wakeup(struct ath5k_hw *ah, int flags, bool initial)
> const struct ath5k_rate_table *ath5k_hw_get_rate_table(struct ath5k_hw *ah,
> unsigned int mode)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> if (!test_bit(mode, ah->ah_capabilities.cap_mode))
> return NULL;
> @@ -452,7 +449,7 @@ const struct ath5k_rate_table *ath5k_hw_get_rate_table(struct ath5k_hw *ah,
> */
> void ath5k_hw_detach(struct ath5k_hw *ah)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> if (ah->ah_rf_banks != NULL)
> kfree(ah->ah_rf_banks);
> @@ -598,7 +595,7 @@ int ath5k_hw_reset(struct ath5k_hw *ah, enum ieee80211_if_types op_mode,
> unsigned int i, mode, freq, ee_mode, ant[2], driver_mode = -1;
> int ret;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> s_seq = 0;
> s_ant = 1;
> @@ -1030,7 +1027,7 @@ static int ath5k_hw_nic_reset(struct ath5k_hw *ah, u32 val)
> int ret;
> u32 mask = val ? val : ~0U;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> /* Read-and-clear RX Descriptor Pointer*/
> ath5k_hw_reg_read(ah, AR5K_RXDP);
> @@ -1077,7 +1074,7 @@ int ath5k_hw_set_power(struct ath5k_hw *ah, enum ath5k_power_mode mode,
> unsigned int i;
> u32 staid;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> staid = ath5k_hw_reg_read(ah, AR5K_STA_ID1);
>
> switch (mode) {
> @@ -1151,7 +1148,7 @@ commit:
> */
> void ath5k_hw_start_rx(struct ath5k_hw *ah)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> ath5k_hw_reg_write(ah, AR5K_CR_RXE, AR5K_CR);
> }
>
> @@ -1162,7 +1159,7 @@ int ath5k_hw_stop_rx_dma(struct ath5k_hw *ah)
> {
> unsigned int i;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> ath5k_hw_reg_write(ah, AR5K_CR_RXD, AR5K_CR);
>
> /*
> @@ -1189,7 +1186,7 @@ u32 ath5k_hw_get_rx_buf(struct ath5k_hw *ah)
> */
> void ath5k_hw_put_rx_buf(struct ath5k_hw *ah, u32 phys_addr)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> /*TODO:Shouldn't we check if RX is enabled first ?*/
> ath5k_hw_reg_write(ah, phys_addr, AR5K_RXDP);
> @@ -1207,7 +1204,7 @@ int ath5k_hw_tx_start(struct ath5k_hw *ah, unsigned int queue)
> {
> u32 tx_queue;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> AR5K_ASSERT_ENTRY(queue, ah->ah_capabilities.cap_queues.q_tx_num);
>
> /* Return if queue is declared inactive */
> @@ -1260,7 +1257,7 @@ int ath5k_hw_stop_tx_dma(struct ath5k_hw *ah, unsigned int queue)
> unsigned int i = 100;
> u32 tx_queue, pending;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> AR5K_ASSERT_ENTRY(queue, ah->ah_capabilities.cap_queues.q_tx_num);
>
> /* Return if queue is declared inactive */
> @@ -1319,7 +1316,7 @@ u32 ath5k_hw_get_tx_buf(struct ath5k_hw *ah, unsigned int queue)
> {
> u16 tx_reg;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> AR5K_ASSERT_ENTRY(queue, ah->ah_capabilities.cap_queues.q_tx_num);
>
> /*
> @@ -1353,7 +1350,7 @@ int ath5k_hw_put_tx_buf(struct ath5k_hw *ah, unsigned int queue, u32 phys_addr)
> {
> u16 tx_reg;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> AR5K_ASSERT_ENTRY(queue, ah->ah_capabilities.cap_queues.q_tx_num);
>
> /*
> @@ -1398,7 +1395,7 @@ int ath5k_hw_update_tx_triglevel(struct ath5k_hw *ah, bool increase)
> u32 trigger_level, imr;
> int ret = -EIO;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> /*
> * Disable interrupts by setting the mask
> @@ -1445,7 +1442,7 @@ done:
> */
> bool ath5k_hw_is_intr_pending(struct ath5k_hw *ah)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> return ath5k_hw_reg_read(ah, AR5K_INTPEND);
> }
>
> @@ -1456,7 +1453,7 @@ int ath5k_hw_get_isr(struct ath5k_hw *ah, enum ath5k_int *interrupt_mask)
> {
> u32 data;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> /*
> * Read interrupt status from the Interrupt Status register
> @@ -1580,7 +1577,7 @@ static int ath5k_hw_eeprom_read(struct ath5k_hw *ah, u32 offset, u16 *data)
> {
> u32 status, timeout;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> /*
> * Initialize EEPROM access
> */
> @@ -1616,7 +1613,7 @@ static int ath5k_hw_eeprom_write(struct ath5k_hw *ah, u32 offset, u16 data)
> #if 0
> u32 status, timeout;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> /*
> * Initialize eeprom access
> @@ -2114,7 +2111,7 @@ static int ath5k_hw_get_capabilities(struct ath5k_hw *ah)
> {
> u16 ee_header;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> /* Capabilities stored in the EEPROM */
> ee_header = ah->ah_capabilities.cap_eeprom.ee_header;
>
> @@ -2205,7 +2202,7 @@ int ath5k_hw_set_opmode(struct ath5k_hw *ah)
> pcu_reg = 0;
> beacon_reg = 0;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> switch (ah->ah_op_mode) {
> case IEEE80211_IF_TYPE_IBSS:
> @@ -2262,7 +2259,7 @@ int ath5k_hw_set_opmode(struct ath5k_hw *ah)
> */
> void ath5k_hw_get_lladdr(struct ath5k_hw *ah, u8 *mac)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> memcpy(mac, ah->ah_sta_id, ETH_ALEN);
> }
>
> @@ -2273,7 +2270,7 @@ int ath5k_hw_set_lladdr(struct ath5k_hw *ah, const u8 *mac)
> {
> u32 low_id, high_id;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> /* Set new station ID */
> memcpy(ah->ah_sta_id, mac, ETH_ALEN);
>
> @@ -2419,7 +2416,7 @@ void ath5k_hw_set_associd(struct ath5k_hw *ah, const u8 *bssid, u16 assoc_id)
> int ath5k_hw_set_bssid_mask(struct ath5k_hw *ah, const u8 *mask)
> {
> u32 low_id, high_id;
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> if (ah->ah_version == AR5K_AR5212) {
> low_id = AR5K_LOW_ID(mask);
> @@ -2443,7 +2440,7 @@ int ath5k_hw_set_bssid_mask(struct ath5k_hw *ah, const u8 *mask)
> */
> void ath5k_hw_start_rx_pcu(struct ath5k_hw *ah)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> AR5K_REG_DISABLE_BITS(ah, AR5K_DIAG_SW, AR5K_DIAG_SW_DIS_RX);
> }
>
> @@ -2452,7 +2449,7 @@ void ath5k_hw_start_rx_pcu(struct ath5k_hw *ah)
> */
> void ath5k_hw_stop_pcu_recv(struct ath5k_hw *ah)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> AR5K_REG_ENABLE_BITS(ah, AR5K_DIAG_SW, AR5K_DIAG_SW_DIS_RX);
> }
>
> @@ -2465,7 +2462,7 @@ void ath5k_hw_stop_pcu_recv(struct ath5k_hw *ah)
> */
> void ath5k_hw_set_mcast_filter(struct ath5k_hw *ah, u32 filter0, u32 filter1)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> /* Set the multicat filter */
> ath5k_hw_reg_write(ah, filter0, AR5K_MCAST_FILTER0);
> ath5k_hw_reg_write(ah, filter1, AR5K_MCAST_FILTER1);
> @@ -2477,7 +2474,7 @@ void ath5k_hw_set_mcast_filter(struct ath5k_hw *ah, u32 filter0, u32 filter1)
> int ath5k_hw_set_mcast_filterindex(struct ath5k_hw *ah, u32 index)
> {
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> if (index >= 64)
> return -EINVAL;
> else if (index >= 32)
> @@ -2495,7 +2492,7 @@ int ath5k_hw_set_mcast_filterindex(struct ath5k_hw *ah, u32 index)
> int ath5k_hw_clear_mcast_filter_idx(struct ath5k_hw *ah, u32 index)
> {
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> if (index >= 64)
> return -EINVAL;
> else if (index >= 32)
> @@ -2514,7 +2511,7 @@ u32 ath5k_hw_get_rx_filter(struct ath5k_hw *ah)
> {
> u32 data, filter = 0;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> filter = ath5k_hw_reg_read(ah, AR5K_RX_FILTER);
>
> /*Radar detection for 5212*/
> @@ -2537,7 +2534,7 @@ void ath5k_hw_set_rx_filter(struct ath5k_hw *ah, u32 filter)
> {
> u32 data = 0;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> /* Set PHY error filter register on 5212*/
> if (ah->ah_version == AR5K_AR5212) {
> @@ -2580,7 +2577,7 @@ void ath5k_hw_set_rx_filter(struct ath5k_hw *ah, u32 filter)
> */
> u32 ath5k_hw_get_tsf32(struct ath5k_hw *ah)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> return ath5k_hw_reg_read(ah, AR5K_TSF_L32);
> }
>
> @@ -2590,7 +2587,7 @@ u32 ath5k_hw_get_tsf32(struct ath5k_hw *ah)
> u64 ath5k_hw_get_tsf64(struct ath5k_hw *ah)
> {
> u64 tsf = ath5k_hw_reg_read(ah, AR5K_TSF_U32);
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> return ath5k_hw_reg_read(ah, AR5K_TSF_L32) | (tsf << 32);
> }
> @@ -2600,7 +2597,7 @@ u64 ath5k_hw_get_tsf64(struct ath5k_hw *ah)
> */
> void ath5k_hw_reset_tsf(struct ath5k_hw *ah)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> AR5K_REG_ENABLE_BITS(ah, AR5K_BEACON, AR5K_BEACON_RESET_TSF);
> }
>
> @@ -2611,7 +2608,7 @@ void ath5k_hw_init_beacon(struct ath5k_hw *ah, u32 next_beacon, u32 interval)
> {
> u32 timer1, timer2, timer3;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> /*
> * Set the additional timers by mode
> */
> @@ -2669,7 +2666,7 @@ int ath5k_hw_set_beacon_timers(struct ath5k_hw *ah,
> u32 cfp_count = 0; /* XXX */
> u32 tsf = 0; /* XXX */
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> /* Return on an invalid beacon state */
> if (state->bs_interval < 1)
> return -EINVAL;
> @@ -2781,7 +2778,7 @@ int ath5k_hw_set_beacon_timers(struct ath5k_hw *ah,
> */
> void ath5k_hw_reset_beacon(struct ath5k_hw *ah)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> /*
> * Disable beacon timer
> */
> @@ -2804,7 +2801,7 @@ int ath5k_hw_wait_for_beacon(struct ath5k_hw *ah, unsigned long phys_addr)
> unsigned int i;
> int ret;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> /* 5210 doesn't have QCU*/
> if (ah->ah_version == AR5K_AR5210) {
> @@ -2851,7 +2848,7 @@ int ath5k_hw_wait_for_beacon(struct ath5k_hw *ah, unsigned long phys_addr)
> void ath5k_hw_update_mib_counters(struct ath5k_hw *ah,
> struct ath5k_mib_stats *statistics)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> /* Read-And-Clear */
> statistics->ackrcv_bad += ath5k_hw_reg_read(ah, AR5K_ACK_FAIL);
> statistics->rts_bad += ath5k_hw_reg_read(ah, AR5K_RTS_FAIL);
> @@ -2896,7 +2893,7 @@ void ath5k_hw_set_ack_bitrate_high(struct ath5k_hw *ah, bool high)
> */
> int ath5k_hw_set_ack_timeout(struct ath5k_hw *ah, unsigned int timeout)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> if (ath5k_hw_clocktoh(AR5K_REG_MS(0xffffffff, AR5K_TIME_OUT_ACK),
> ah->ah_turbo) <= timeout)
> return -EINVAL;
> @@ -2912,7 +2909,7 @@ int ath5k_hw_set_ack_timeout(struct ath5k_hw *ah, unsigned int timeout)
> */
> unsigned int ath5k_hw_get_ack_timeout(struct ath5k_hw *ah)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> return ath5k_hw_clocktoh(AR5K_REG_MS(ath5k_hw_reg_read(ah,
> AR5K_TIME_OUT), AR5K_TIME_OUT_ACK), ah->ah_turbo);
> @@ -2923,7 +2920,7 @@ unsigned int ath5k_hw_get_ack_timeout(struct ath5k_hw *ah)
> */
> int ath5k_hw_set_cts_timeout(struct ath5k_hw *ah, unsigned int timeout)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> if (ath5k_hw_clocktoh(AR5K_REG_MS(0xffffffff, AR5K_TIME_OUT_CTS),
> ah->ah_turbo) <= timeout)
> return -EINVAL;
> @@ -2939,7 +2936,7 @@ int ath5k_hw_set_cts_timeout(struct ath5k_hw *ah, unsigned int timeout)
> */
> unsigned int ath5k_hw_get_cts_timeout(struct ath5k_hw *ah)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> return ath5k_hw_clocktoh(AR5K_REG_MS(ath5k_hw_reg_read(ah,
> AR5K_TIME_OUT), AR5K_TIME_OUT_CTS), ah->ah_turbo);
> }
> @@ -2952,7 +2949,7 @@ int ath5k_hw_reset_key(struct ath5k_hw *ah, u16 entry)
> {
> unsigned int i;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> AR5K_ASSERT_ENTRY(entry, AR5K_KEYTABLE_SIZE);
>
> for (i = 0; i < AR5K_KEYCACHE_SIZE; i++)
> @@ -2968,7 +2965,7 @@ int ath5k_hw_reset_key(struct ath5k_hw *ah, u16 entry)
>
> int ath5k_hw_is_key_valid(struct ath5k_hw *ah, u16 entry)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> AR5K_ASSERT_ENTRY(entry, AR5K_KEYTABLE_SIZE);
>
> /* Check the validation flag at the end of the entry */
> @@ -2983,7 +2980,7 @@ int ath5k_hw_set_key(struct ath5k_hw *ah, u16 entry,
> __le32 key_v[5] = {};
> u32 keytype;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> /* key->keylen comes in from mac80211 in bytes */
>
> @@ -3029,7 +3026,7 @@ int ath5k_hw_set_key_lladdr(struct ath5k_hw *ah, u16 entry, const u8 *mac)
> {
> u32 low_id, high_id;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> /* Invalid entry (key table overflow) */
> AR5K_ASSERT_ENTRY(entry, AR5K_KEYTABLE_SIZE);
>
> @@ -3063,7 +3060,7 @@ int ath5k_hw_setup_tx_queue(struct ath5k_hw *ah, enum ath5k_tx_queue queue_type,
> unsigned int queue;
> int ret;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> /*
> * Get queue by type
> @@ -3141,7 +3138,7 @@ int ath5k_hw_setup_tx_queue(struct ath5k_hw *ah, enum ath5k_tx_queue queue_type,
> int ath5k_hw_setup_tx_queueprops(struct ath5k_hw *ah, int queue,
> const struct ath5k_txq_info *queue_info)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> AR5K_ASSERT_ENTRY(queue, ah->ah_capabilities.cap_queues.q_tx_num);
>
> if (ah->ah_txq[queue].tqi_type == AR5K_TX_QUEUE_INACTIVE)
> @@ -3165,7 +3162,7 @@ int ath5k_hw_setup_tx_queueprops(struct ath5k_hw *ah, int queue,
> int ath5k_hw_get_tx_queueprops(struct ath5k_hw *ah, int queue,
> struct ath5k_txq_info *queue_info)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> memcpy(queue_info, &ah->ah_txq[queue], sizeof(struct ath5k_txq_info));
> return 0;
> }
> @@ -3175,7 +3172,7 @@ int ath5k_hw_get_tx_queueprops(struct ath5k_hw *ah, int queue,
> */
> void ath5k_hw_release_tx_queue(struct ath5k_hw *ah, unsigned int queue)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> if (WARN_ON(queue >= ah->ah_capabilities.cap_queues.q_tx_num))
> return;
>
> @@ -3193,7 +3190,7 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)
> u32 cw_min, cw_max, retry_lg, retry_sh;
> struct ath5k_txq_info *tq = &ah->ah_txq[queue];
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> AR5K_ASSERT_ENTRY(queue, ah->ah_capabilities.cap_queues.q_tx_num);
>
> tq = &ah->ah_txq[queue];
> @@ -3437,7 +3434,7 @@ int ath5k_hw_reset_tx_queue(struct ath5k_hw *ah, unsigned int queue)
> * for a specific queue [5211+]
> */
> u32 ath5k_hw_num_tx_pending(struct ath5k_hw *ah, unsigned int queue) {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> AR5K_ASSERT_ENTRY(queue, ah->ah_capabilities.cap_queues.q_tx_num);
>
> /* Return if queue is declared inactive */
> @@ -3456,7 +3453,7 @@ u32 ath5k_hw_num_tx_pending(struct ath5k_hw *ah, unsigned int queue) {
> */
> int ath5k_hw_set_slot_time(struct ath5k_hw *ah, unsigned int slot_time)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> if (slot_time < AR5K_SLOT_TIME_9 || slot_time > AR5K_SLOT_TIME_MAX)
> return -EINVAL;
>
> @@ -3474,7 +3471,7 @@ int ath5k_hw_set_slot_time(struct ath5k_hw *ah, unsigned int slot_time)
> */
> unsigned int ath5k_hw_get_slot_time(struct ath5k_hw *ah)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> if (ah->ah_version == AR5K_AR5210)
> return ath5k_hw_clocktoh(ath5k_hw_reg_read(ah,
> AR5K_SLOT_TIME) & 0xffff, ah->ah_turbo);
> @@ -3622,7 +3619,7 @@ static int ath5k_hw_setup_4word_tx_desc(struct ath5k_hw *ah,
> struct ath5k_hw_tx_status *tx_status;
> unsigned int buff_len;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> tx_desc = (struct ath5k_hw_4w_tx_desc *)&desc->ds_ctl0;
> tx_status = (struct ath5k_hw_tx_status *)&desc->ds_hw[2];
>
> @@ -3803,7 +3800,7 @@ static int ath5k_hw_proc_4word_tx_status(struct ath5k_hw *ah,
> struct ath5k_hw_tx_status *tx_status;
> struct ath5k_hw_4w_tx_desc *tx_desc;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> tx_desc = (struct ath5k_hw_4w_tx_desc *)&desc->ds_ctl0;
> tx_status = (struct ath5k_hw_tx_status *)&desc->ds_hw[2];
>
> @@ -3881,7 +3878,7 @@ int ath5k_hw_setup_rx_desc(struct ath5k_hw *ah, struct ath5k_desc *desc,
> {
> struct ath5k_rx_desc *rx_desc;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> rx_desc = (struct ath5k_rx_desc *)&desc->ds_ctl0;
>
> /*
> @@ -3986,7 +3983,7 @@ static int ath5k_hw_proc_new_rx_status(struct ath5k_hw *ah,
> struct ath5k_hw_new_rx_status *rx_status;
> struct ath5k_hw_rx_error *rx_err;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> rx_status = (struct ath5k_hw_new_rx_status *)&desc->ds_hw[0];
>
> /* Overlay on error */
> @@ -4064,7 +4061,7 @@ void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state)
> /*5210 has different led mode handling*/
> u32 led_5210;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> /*Reset led status*/
> if (ah->ah_version != AR5K_AR5210)
> @@ -4112,7 +4109,7 @@ void ath5k_hw_set_ledstate(struct ath5k_hw *ah, unsigned int state)
> */
> int ath5k_hw_set_gpio_output(struct ath5k_hw *ah, u32 gpio)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> if (gpio > AR5K_NUM_GPIO)
> return -EINVAL;
>
> @@ -4127,7 +4124,7 @@ int ath5k_hw_set_gpio_output(struct ath5k_hw *ah, u32 gpio)
> */
> int ath5k_hw_set_gpio_input(struct ath5k_hw *ah, u32 gpio)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> if (gpio > AR5K_NUM_GPIO)
> return -EINVAL;
>
> @@ -4142,7 +4139,7 @@ int ath5k_hw_set_gpio_input(struct ath5k_hw *ah, u32 gpio)
> */
> u32 ath5k_hw_get_gpio(struct ath5k_hw *ah, u32 gpio)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> if (gpio > AR5K_NUM_GPIO)
> return 0xffffffff;
>
> @@ -4157,7 +4154,7 @@ u32 ath5k_hw_get_gpio(struct ath5k_hw *ah, u32 gpio)
> int ath5k_hw_set_gpio(struct ath5k_hw *ah, u32 gpio, u32 val)
> {
> u32 data;
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> if (gpio > AR5K_NUM_GPIO)
> return -EINVAL;
> @@ -4181,7 +4178,7 @@ void ath5k_hw_set_gpio_intr(struct ath5k_hw *ah, unsigned int gpio,
> {
> u32 data;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> if (gpio > AR5K_NUM_GPIO)
> return;
>
> @@ -4234,115 +4231,15 @@ u16 ath5k_get_regdomain(struct ath5k_hw *ah)
> }
>
>
> -
> /****************\
> Misc functions
> \****************/
>
> -void /*O.K.*/
> -ath5k_hw_dump_state(struct ath5k_hw *ah)
> -{
> -#ifdef AR5K_DEBUG
> -#define AR5K_PRINT_REGISTER(_x) \
> - ATH5K_PRINTF("(%s: %08x) ", #_x, ath5k_hw_reg_read(ah, AR5K_##_x));
> -
> - ATH5K_PRINTF("MAC registers:\n");
> - AR5K_PRINT_REGISTER(CR);
> - AR5K_PRINT_REGISTER(CFG);
> - AR5K_PRINT_REGISTER(IER);
> - AR5K_PRINT_REGISTER(TXCFG);
> - AR5K_PRINT_REGISTER(RXCFG);
> - AR5K_PRINT_REGISTER(MIBC);
> - AR5K_PRINT_REGISTER(TOPS);
> - AR5K_PRINT_REGISTER(RXNOFRM);
> - AR5K_PRINT_REGISTER(RPGTO);
> - AR5K_PRINT_REGISTER(RFCNT);
> - AR5K_PRINT_REGISTER(MISC);
> - AR5K_PRINT_REGISTER(PISR);
> - AR5K_PRINT_REGISTER(SISR0);
> - AR5K_PRINT_REGISTER(SISR1);
> - AR5K_PRINT_REGISTER(SISR3);
> - AR5K_PRINT_REGISTER(SISR4);
> - AR5K_PRINT_REGISTER(DCM_ADDR);
> - AR5K_PRINT_REGISTER(DCM_DATA);
> - AR5K_PRINT_REGISTER(DCCFG);
> - AR5K_PRINT_REGISTER(CCFG);
> - AR5K_PRINT_REGISTER(CCFG_CUP);
> - AR5K_PRINT_REGISTER(CPC0);
> - AR5K_PRINT_REGISTER(CPC1);
> - AR5K_PRINT_REGISTER(CPC2);
> - AR5K_PRINT_REGISTER(CPCORN);
> - AR5K_PRINT_REGISTER(QCU_TXE);
> - AR5K_PRINT_REGISTER(QCU_TXD);
> - AR5K_PRINT_REGISTER(DCU_GBL_IFS_SIFS);
> - AR5K_PRINT_REGISTER(DCU_GBL_IFS_SLOT);
> - AR5K_PRINT_REGISTER(DCU_FP);
> - AR5K_PRINT_REGISTER(DCU_TXP);
> - AR5K_PRINT_REGISTER(DCU_TX_FILTER);
> - AR5K_PRINT_REGISTER(INTPEND);
> - AR5K_PRINT_REGISTER(PCICFG);
> - AR5K_PRINT_REGISTER(GPIOCR);
> - AR5K_PRINT_REGISTER(GPIODO);
> - AR5K_PRINT_REGISTER(SREV);
> - AR5K_PRINT_REGISTER(EEPROM_BASE);
> - AR5K_PRINT_REGISTER(EEPROM_DATA);
> - AR5K_PRINT_REGISTER(EEPROM_CMD);
> - AR5K_PRINT_REGISTER(EEPROM_CFG);
> - AR5K_PRINT_REGISTER(PCU_MIN);
> - AR5K_PRINT_REGISTER(STA_ID0);
> - AR5K_PRINT_REGISTER(STA_ID1);
> - AR5K_PRINT_REGISTER(BSS_ID0);
> - AR5K_PRINT_REGISTER(SLOT_TIME);
> - AR5K_PRINT_REGISTER(TIME_OUT);
> - AR5K_PRINT_REGISTER(RSSI_THR);
> - AR5K_PRINT_REGISTER(BEACON);
> - AR5K_PRINT_REGISTER(CFP_PERIOD);
> - AR5K_PRINT_REGISTER(TIMER0);
> - AR5K_PRINT_REGISTER(TIMER2);
> - AR5K_PRINT_REGISTER(TIMER3);
> - AR5K_PRINT_REGISTER(CFP_DUR);
> - AR5K_PRINT_REGISTER(MCAST_FILTER0);
> - AR5K_PRINT_REGISTER(MCAST_FILTER1);
> - AR5K_PRINT_REGISTER(DIAG_SW);
> - AR5K_PRINT_REGISTER(TSF_U32);
> - AR5K_PRINT_REGISTER(ADDAC_TEST);
> - AR5K_PRINT_REGISTER(DEFAULT_ANTENNA);
> - AR5K_PRINT_REGISTER(LAST_TSTP);
> - AR5K_PRINT_REGISTER(NAV);
> - AR5K_PRINT_REGISTER(RTS_OK);
> - AR5K_PRINT_REGISTER(ACK_FAIL);
> - AR5K_PRINT_REGISTER(FCS_FAIL);
> - AR5K_PRINT_REGISTER(BEACON_CNT);
> - AR5K_PRINT_REGISTER(TSF_PARM);
> - ATH5K_PRINTF("\n");
> -
> - ATH5K_PRINTF("PHY registers:\n");
> - AR5K_PRINT_REGISTER(PHY_TURBO);
> - AR5K_PRINT_REGISTER(PHY_AGC);
> - AR5K_PRINT_REGISTER(PHY_TIMING_3);
> - AR5K_PRINT_REGISTER(PHY_CHIP_ID);
> - AR5K_PRINT_REGISTER(PHY_AGCCTL);
> - AR5K_PRINT_REGISTER(PHY_NF);
> - AR5K_PRINT_REGISTER(PHY_SCR);
> - AR5K_PRINT_REGISTER(PHY_SLMT);
> - AR5K_PRINT_REGISTER(PHY_SCAL);
> - AR5K_PRINT_REGISTER(PHY_RX_DELAY);
> - AR5K_PRINT_REGISTER(PHY_IQ);
> - AR5K_PRINT_REGISTER(PHY_PAPD_PROBE);
> - AR5K_PRINT_REGISTER(PHY_TXPOWER_RATE1);
> - AR5K_PRINT_REGISTER(PHY_TXPOWER_RATE2);
> - AR5K_PRINT_REGISTER(PHY_RADAR);
> - AR5K_PRINT_REGISTER(PHY_ANT_SWITCH_TABLE_0);
> - AR5K_PRINT_REGISTER(PHY_ANT_SWITCH_TABLE_1);
> - ATH5K_PRINTF("\n");
> -#endif
> -}
> -
> int ath5k_hw_get_capability(struct ath5k_hw *ah,
> enum ath5k_capability_type cap_type,
> u32 capability, u32 *result)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> switch (cap_type) {
> case AR5K_CAP_NUM_TXQUEUES:
> @@ -4387,7 +4284,7 @@ yes:
> static int ath5k_hw_enable_pspoll(struct ath5k_hw *ah, u8 *bssid,
> u16 assoc_id)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> if (ah->ah_version == AR5K_AR5210) {
> AR5K_REG_DISABLE_BITS(ah, AR5K_STA_ID1,
> @@ -4400,7 +4297,7 @@ static int ath5k_hw_enable_pspoll(struct ath5k_hw *ah, u8 *bssid,
>
> static int ath5k_hw_disable_pspoll(struct ath5k_hw *ah)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> if (ah->ah_version == AR5K_AR5210) {
> AR5K_REG_ENABLE_BITS(ah, AR5K_STA_ID1,
> diff --git a/drivers/net/wireless/ath5k/phy.c b/drivers/net/wireless/ath5k/phy.c
> index a4968b6..3c2a67c 100644
> --- a/drivers/net/wireless/ath5k/phy.c
> +++ b/drivers/net/wireless/ath5k/phy.c
> @@ -24,6 +24,7 @@
> #include "ath5k.h"
> #include "reg.h"
> #include "base.h"
> +#include "debug.h"
>
> /* Struct to hold initial RF register values (RF Banks) */
> struct ath5k_ini_rf {
> @@ -880,11 +881,11 @@ static s32 ath5k_hw_rfregs_gain_adjust(struct ath5k_hw *ah)
> }
>
> done:
> -#ifdef AR5K_DEBUG
> - ATH5K_PRINTF("ret %d, gain step %u, current gain %u, target gain %u\n",
> + ATH5K_DBG(ah->ah_sc, ATH5K_DEBUG_CALIBRATE,
> + "ret %d, gain step %u, current gain %u, target gain %u\n",
> ret, ah->ah_gain.g_step_idx, ah->ah_gain.g_current,
> ah->ah_gain.g_target);
> -#endif
> +
> return ret;
> }
>
> @@ -1222,7 +1223,7 @@ enum ath5k_rfgain ath5k_hw_get_rf_gain(struct ath5k_hw *ah)
> {
> u32 data, type;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> if (ah->ah_rf_banks == NULL || !ah->ah_gain.g_active ||
> ah->ah_version <= AR5K_AR5211)
> @@ -1661,7 +1662,7 @@ static int ath5k_hw_rf511x_calibrate(struct ath5k_hw *ah,
> {
> u32 i_pwr, q_pwr;
> s32 iq_corr, i_coff, i_coffd, q_coff, q_coffd;
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> if (ah->ah_calibration == false ||
> ath5k_hw_reg_read(ah, AR5K_PHY_IQ) & AR5K_PHY_IQ_RUN)
> @@ -1718,7 +1719,7 @@ int ath5k_hw_phy_calibrate(struct ath5k_hw *ah,
>
> int ath5k_hw_phy_disable(struct ath5k_hw *ah)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> /*Just a try M.F.*/
> ath5k_hw_reg_write(ah, AR5K_PHY_ACT_DISABLE, AR5K_PHY_ACT);
>
> @@ -1738,7 +1739,7 @@ u16 ath5k_hw_radio_revision(struct ath5k_hw *ah, unsigned int chan)
> u32 srev;
> u16 ret;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
>
> /*
> * Set the radio chip access register
> @@ -1780,7 +1781,7 @@ u16 ath5k_hw_radio_revision(struct ath5k_hw *ah, unsigned int chan)
> void /*TODO:Boundary check*/
> ath5k_hw_set_def_antenna(struct ath5k_hw *ah, unsigned int ant)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> /*Just a try M.F.*/
> if (ah->ah_version != AR5K_AR5210)
> ath5k_hw_reg_write(ah, ant, AR5K_DEFAULT_ANTENNA);
> @@ -1788,7 +1789,7 @@ ath5k_hw_set_def_antenna(struct ath5k_hw *ah, unsigned int ant)
>
> unsigned int ath5k_hw_get_def_antenna(struct ath5k_hw *ah)
> {
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> /*Just a try M.F.*/
> if (ah->ah_version != AR5K_AR5210)
> return ath5k_hw_reg_read(ah, AR5K_DEFAULT_ANTENNA);
> @@ -1848,7 +1849,7 @@ ath5k_hw_txpower(struct ath5k_hw *ah, struct ieee80211_channel *channel,
> bool tpc = ah->ah_txpower.txp_tpc;
> unsigned int i;
>
> - AR5K_TRACE;
> + ATH5K_TRACE(ah->ah_sc);
> if (txpower > AR5K_TUNE_MAX_TXPOWER) {
> ATH5K_ERR(ah->ah_sc, "invalid tx power: %u\n", txpower);
> return -EINVAL;
> @@ -1902,9 +1903,9 @@ int ath5k_hw_set_txpower_limit(struct ath5k_hw *ah, unsigned int power)
> /*Just a try M.F.*/
> struct ieee80211_channel *channel = &ah->ah_current_channel;
>
> - AR5K_TRACE;
> -#ifdef AR5K_DEBUG
> - ATH5K_PRINTF("changing txpower to %d\n", power);
> -#endif
> + ATH5K_TRACE(ah->ah_sc);
> + ATH5K_DBG(ah->ah_sc, ATH5K_DEBUG_TXPOWER,
> + "changing txpower to %d\n", power);
> +
> return ath5k_hw_txpower(ah, channel, power);
> }
> --
> 1.5.3.4
>
>
Acked-by: Nick Kossifidis <mickflemm@xxxxxxxxx>
--
GPG ID: 0xD21DB2DB
As you read this post global entropy rises. Have Fun ;-)
Nick
-
To unsubscribe from this list: send the line "unsubscribe linux-wireless" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
