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

Commit a8bc4917 authored by Roland Vossen's avatar Roland Vossen Committed by John W. Linville
Browse files

brcm80211: smac: bugfix for tx mute in brcms_b_init() 



Transmit can only be muted if the mac core is enabled. When brcms_b_init()
is called, the mac core is suspended. Brcms_b_init() calls a transmit mute
function that requires an enabled mac core. This code path is never taken,
but would have been taken in subsequent patches.

Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@broadcom.com>
Reviewed-by: default avatarPieter-Paul Giesberts <pieterpg@broadcom.com>
Signed-off-by: default avatarRoland Vossen <rvossen@broadcom.com>
Signed-off-by: default avatarArend van Spriel <arend@broadcom.com>
Signed-off-by: default avatarJohn W. Linville <linville@tuxdriver.com>
parent 43ac0972

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

+8 −8
Original line number Diff line number Diff line
@@ -2452,6 +2452,7 @@ static void brcms_b_tx_fifo_resume(struct brcms_hardware *wlc_hw, 
	}

}



/* precondition: requires the mac core to be enabled */

static void brcms_b_mute(struct brcms_hardware *wlc_hw, bool on, u32 flags)

{

	static const u8 null_ether_addr[ETH_ALEN] = {0, 0, 0, 0, 0, 0};
@@ -3354,8 +3355,7 @@ static void brcms_b_coreinit(struct brcms_c_info *wlc) 
}



void

static brcms_b_init(struct brcms_hardware *wlc_hw, u16 chanspec,

			  bool mute) {

static brcms_b_init(struct brcms_hardware *wlc_hw, u16 chanspec) {

	u32 macintmask;

	bool fastclk;

	struct brcms_c_info *wlc = wlc_hw->wlc;
@@ -3380,10 +3380,6 @@ static brcms_b_init(struct brcms_hardware *wlc_hw, u16 chanspec, 
	/* core-specific initialization */

	brcms_b_coreinit(wlc);



	/* suspend the tx fifos and mute the phy for preism cac time */

	if (mute)

		brcms_b_mute(wlc_hw, ON, PHY_MUTE_FOR_PREISM);



	/* band-specific inits */

	brcms_b_bsinit(wlc, chanspec);
@@ -8261,7 +8257,7 @@ void brcms_c_init(struct brcms_c_info *wlc) 
{

	struct d11regs __iomem *regs;

	u16 chanspec;

	bool mute = false;

	bool mute_tx = false;



	BCMMSG(wlc->wiphy, "wl%d\n", wlc->pub->unit);
@@ -8277,7 +8273,7 @@ void brcms_c_init(struct brcms_c_info *wlc) 
	else

		chanspec = brcms_c_init_chanspec(wlc);



	brcms_b_init(wlc->hw, chanspec, mute);

	brcms_b_init(wlc->hw, chanspec);



	/* update beacon listen interval */

	brcms_c_bcn_li_upd(wlc);
@@ -8343,6 +8339,10 @@ void brcms_c_init(struct brcms_c_info *wlc) 
	/* ..now really unleash hell (allow the MAC out of suspend) */

	brcms_c_enable_mac(wlc);



	/* suspend the tx fifos and mute the phy for preism cac time */

	if (mute_tx)

		brcms_b_mute(wlc->hw, ON, PHY_MUTE_FOR_PREISM);



	/* clear tx flow control */

	brcms_c_txflowcontrol_reset(wlc);