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

Commit 229a41d9 authored by Seth Forshee's avatar Seth Forshee Committed by John W. Linville
Browse files

brcmsmac: Add brcms_dbg_int() debug macro 



Also convert relevant message to use this macro.

Signed-off-by: default avatarSeth Forshee <seth.forshee@canonical.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Tested-by: default avatarDaniel Wagner <wagi@monom.org>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 5ce58bb5

drivers/net/wireless/brcm80211/brcmsmac/debug.h

+1 −0
Original line number Diff line number Diff line
@@ -39,5 +39,6 @@ static inline void __brcms_dbg(struct device *dev, u32 level, 
#define brcms_dbg_mac80211(core, f, a...)	brcms_dbg(core, BRCM_DL_MAC80211, f, ##a)

#define brcms_dbg_rx(core, f, a...)		brcms_dbg(core, BRCM_DL_RX, f, ##a)

#define brcms_dbg_tx(core, f, a...)		brcms_dbg(core, BRCM_DL_TX, f, ##a)

#define brcms_dbg_int(core, f, a...)		brcms_dbg(core, BRCM_DL_INT, f, ##a)



#endif /* _BRCMS_DEBUG_H_ */

drivers/net/wireless/brcm80211/brcmsmac/main.c

+6 −6
Original line number Diff line number Diff line
@@ -2343,7 +2343,7 @@ static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw) 
		if (!intstatus)

			continue;



		BCMMSG(wlc_hw->wlc->wiphy, "wl%d: intstatus%d 0x%x\n",

		brcms_dbg_int(core, "wl%d: intstatus%d 0x%x\n",

			      unit, idx, intstatus);



		if (intstatus & I_RO) {
@@ -2541,7 +2541,7 @@ static inline u32 wlc_intstatus(struct brcms_c_info *wlc, bool in_isr) 
	/* macintstatus includes a DMA interrupt summary bit */

	macintstatus = bcma_read32(core, D11REGOFFS(macintstatus));



	BCMMSG(wlc->wiphy, "wl%d: macintstatus: 0x%x\n", wlc_hw->unit,

	brcms_dbg_int(core, "wl%d: macintstatus: 0x%x\n", wlc_hw->unit,

		      macintstatus);



	/* detect cardbus removed, in power down(suspend) and in reset */
@@ -7950,7 +7950,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded) 
	macintstatus = wlc->macintstatus;

	wlc->macintstatus = 0;



	BCMMSG(wlc->wiphy, "wl%d: macintstatus 0x%x\n",

	brcms_dbg_int(core, "wl%d: macintstatus 0x%x\n",

		      wlc_hw->unit, macintstatus);



	WARN_ON(macintstatus & MI_PRQ); /* PRQ Interrupt in non-MBSS */

drivers/net/wireless/brcm80211/include/defs.h

+1 −0
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ 
#define BRCM_DL_MAC80211	0x00000002

#define BRCM_DL_RX		0x00000004

#define BRCM_DL_TX		0x00000008

#define BRCM_DL_INT		0x00000010



#define PM_OFF	0

#define PM_MAX	1