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

Commit 913911f4 authored by Seth Forshee's avatar Seth Forshee Committed by John W. Linville
Browse files

brcmsmac: Add brcms_dbg_mac80211() debug macro 



This macro is used for messages related to the 802.11 MAC layer.
Relevant messages are also converted 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 b353dda4

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

+2 −1
Original line number Diff line number Diff line
@@ -36,5 +36,6 @@ static inline void __brcms_dbg(struct device *dev, u32 level, 
#define brcms_crit(core, f, a...)	__brcms_crit(&(core)->dev, f, ##a)



#define brcms_dbg_info(core, f, a...)		brcms_dbg(core, BRCM_DL_INFO, f, ##a)

#define brcms_dbg_mac80211(core, f, a...)	brcms_dbg(core, BRCM_DL_MAC80211, f, ##a)



#endif /* _BRCMS_DEBUG_H_ */

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

+33 −26
Original line number Diff line number Diff line
@@ -646,7 +646,8 @@ static uint brcms_c_calc_frame_time(struct brcms_c_info *wlc, u32 ratespec, 
		rate = BRCM_RATE_1M;

	}



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

	brcms_dbg_mac80211(wlc->hw->d11core,

			   "wl%d: rspec 0x%x, preamble_type %d, len%d\n",

			   wlc->pub->unit, ratespec, preamble_type, mac_len);



	if (is_mcs_rate(ratespec)) {
@@ -807,7 +808,7 @@ static void brcms_b_core_phy_clk(struct brcms_hardware *wlc_hw, bool clk) 
/* low-level band switch utility routine */

static void brcms_c_setxband(struct brcms_hardware *wlc_hw, uint bandunit)

{

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

	brcms_dbg_mac80211(wlc_hw->d11core, "wl%d: bandunit %d\n", wlc_hw->unit,

			   bandunit);



	wlc_hw->band = wlc_hw->bandstate[bandunit];
@@ -836,7 +837,7 @@ static u32 brcms_c_setband_inact(struct brcms_c_info *wlc, uint bandunit) 
	u32 macintmask;

	u32 macctrl;



	BCMMSG(wlc->wiphy, "wl%d\n", wlc_hw->unit);

	brcms_dbg_mac80211(wlc_hw->d11core, "wl%d\n", wlc_hw->unit);

	macctrl = bcma_read32(wlc_hw->d11core,

			      D11REGOFFS(maccontrol));

	WARN_ON((macctrl & MCTL_EN_MAC) != 0);
@@ -1724,7 +1725,7 @@ static void brcms_b_bsinit(struct brcms_c_info *wlc, u16 chanspec) 
{

	struct brcms_hardware *wlc_hw = wlc->hw;



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

	brcms_dbg_mac80211(wlc_hw->d11core, "wl%d: bandunit %d\n", wlc_hw->unit,

			   wlc_hw->band->bandunit);



	brcms_c_ucode_bsinit(wlc_hw);
@@ -2648,7 +2649,7 @@ void brcms_c_suspend_mac_and_wait(struct brcms_c_info *wlc) 
	struct bcma_device *core = wlc_hw->d11core;

	u32 mc, mi;



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

	brcms_dbg_mac80211(core, "wl%d: bandunit %d\n", wlc_hw->unit,

			   wlc_hw->band->bandunit);



	/*
@@ -2716,7 +2717,7 @@ void brcms_c_enable_mac(struct brcms_c_info *wlc) 
	struct bcma_device *core = wlc_hw->d11core;

	u32 mc, mi;



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

	brcms_dbg_mac80211(core, "wl%d: bandunit %d\n", wlc_hw->unit,

			   wlc->band->bandunit);



	/*
@@ -3777,7 +3778,8 @@ static void brcms_c_set_ps_ctrl(struct brcms_c_info *wlc) 


	hps = brcms_c_ps_allowed(wlc);



	BCMMSG(wlc->wiphy, "wl%d: hps %d\n", wlc->pub->unit, hps);

	brcms_dbg_mac80211(wlc->hw->d11core, "wl%d: hps %d\n", wlc->pub->unit,

			   hps);



	v1 = bcma_read32(wlc->hw->d11core, D11REGOFFS(maccontrol));

	v2 = MCTL_WAKE;
@@ -3863,7 +3865,8 @@ brcms_b_set_chanspec(struct brcms_hardware *wlc_hw, u16 chanspec, 
{

	uint bandunit;



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

	brcms_dbg_mac80211(wlc_hw->d11core, "wl%d: 0x%x\n", wlc_hw->unit,

			   chanspec);



	wlc_hw->chanspec = chanspec;
@@ -5978,7 +5981,8 @@ brcms_c_calc_ack_time(struct brcms_c_info *wlc, u32 rspec, 
{

	uint dur = 0;



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

	brcms_dbg_mac80211(wlc->hw->d11core,

			   "wl%d: rspec 0x%x, preamble_type %d\n",

			   wlc->pub->unit, rspec, preamble_type);

	/*

	 * Spec 9.6: ack rate is the highest rate in BSSBasicRateSet that
@@ -5997,7 +6001,8 @@ static uint 
brcms_c_calc_cts_time(struct brcms_c_info *wlc, u32 rspec,

		      u8 preamble_type)

{

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

	brcms_dbg_mac80211(wlc->hw->d11core,

			   "wl%d: ratespec 0x%x, preamble_type %d\n",

			   wlc->pub->unit, rspec, preamble_type);

	return brcms_c_calc_ack_time(wlc, rspec, preamble_type);

}
@@ -6006,8 +6011,9 @@ static uint 
brcms_c_calc_ba_time(struct brcms_c_info *wlc, u32 rspec,

		     u8 preamble_type)

{

	BCMMSG(wlc->wiphy, "wl%d: rspec 0x%x, "

                "preamble_type %d\n", wlc->pub->unit, rspec, preamble_type);

	brcms_dbg_mac80211(wlc->hw->d11core,

			   "wl%d: rspec 0x%x, preamble_type %d\n",

			   wlc->pub->unit, rspec, preamble_type);

	/*

	 * Spec 9.6: ack rate is the highest rate in BSSBasicRateSet that

	 * is less than or equal to the rate of the immediately previous
@@ -6061,7 +6067,8 @@ brcms_c_calc_frame_len(struct brcms_c_info *wlc, u32 ratespec, 
	uint nsyms, mac_len, Ndps, kNdps;

	uint rate = rspec2rate(ratespec);



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

	brcms_dbg_mac80211(wlc->hw->d11core,

			   "wl%d: rspec 0x%x, preamble_type %d, dur %d\n",

			   wlc->pub->unit, ratespec, preamble_type, dur);



	if (is_mcs_rate(ratespec)) {
@@ -6177,7 +6184,7 @@ mac80211_wlc_set_nrate(struct brcms_c_info *wlc, struct brcms_band *cur_band, 
		} else if (rate > HIGHEST_SINGLE_STREAM_MCS) {

			/* mcs > 7 must use stf SDM */

			if (stf != PHY_TXC1_MODE_SDM) {

				BCMMSG(wlc->wiphy, "wl%d: enabling "

				brcms_dbg_mac80211(core, "wl%d: enabling "

						   "SDM mode for mcs %d\n",

						   wlc->pub->unit, rate);

				stf = PHY_TXC1_MODE_SDM;
@@ -7468,7 +7475,7 @@ brcms_c_calc_lsig_len(struct brcms_c_info *wlc, u32 ratespec, 
{

	uint nsyms, len = 0, kNdps;



	BCMMSG(wlc->wiphy, "wl%d: rate %d, len%d\n",

	brcms_dbg_mac80211(wlc->hw->d11core, "wl%d: rate %d, len%d\n",

			   wlc->pub->unit, rspec2rate(ratespec), mac_len);



	if (is_mcs_rate(ratespec)) {

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

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ 


/* Debug levels */

#define BRCM_DL_INFO		0x00000001

#define BRCM_DL_MAC80211	0x00000002



#define PM_OFF	0

#define PM_MAX	1