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

brcm80211: smac: indicate severe problems to Mac80211 



In case the hardware crashes, a reinitialization internal to the driver
was performed. Since Mac80211 must be in the know of such an event as
well, ieee80211_restart_hw() is now called.

Reviewed-by: default avatarAlwin Beukers <alwin@broadcom.com>
Reviewed-by: default avatarArend van Spriel <arend@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 0527781e

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

+8 −0
Original line number Diff line number Diff line
@@ -1334,6 +1334,14 @@ uint brcms_reset(struct brcms_info *wl) 
	return 0;

}



void brcms_fatal_error(struct brcms_info *wl)

{

	wiphy_err(wl->wlc->wiphy, "wl%d: fatal error, reinitializing\n",

		  wl->wlc->pub->unit);

	brcms_reset(wl);

	ieee80211_restart_hw(wl->pub->ieee_hw);

}



/*

 * These are interrupt on/off entry points. Disable interrupts

 * during interrupt state transition.

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

+1 −0
Original line number Diff line number Diff line
@@ -104,5 +104,6 @@ extern bool brcms_del_timer(struct brcms_timer *timer); 
extern void brcms_msleep(struct brcms_info *wl, uint ms);

extern void brcms_dpc(unsigned long data);

extern void brcms_timer(struct brcms_timer *t);

extern void brcms_fatal_error(struct brcms_info *wl);



#endif				/* _BRCM_MAC80211_IF_H_ */

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

+3 −11
Original line number Diff line number Diff line
@@ -2301,13 +2301,6 @@ void brcms_b_antsel_type_set(struct brcms_hardware *wlc_hw, u8 antsel_type) 
	wlc_phy_antsel_type_set(wlc_hw->band->pi, antsel_type);

}



static void brcms_c_fatal_error(struct brcms_c_info *wlc)

{

	wiphy_err(wlc->wiphy, "wl%d: fatal error, reinitializing\n",

		  wlc->pub->unit);

	brcms_init(wlc->wl);

}



static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw)

{

	bool fatal = false;
@@ -2363,7 +2356,7 @@ static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw) 
		}



		if (fatal) {

			brcms_c_fatal_error(wlc_hw->wlc);	/* big hammer */

			brcms_fatal_error(wlc_hw->wlc->wl); /* big hammer */

			break;

		} else

			W_REG(&regs->intctrlregs[idx].intstatus,
@@ -8397,8 +8390,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded) 
		printk_once("%s : PSM Watchdog, chipid 0x%x, chiprev 0x%x\n",

					__func__, wlc_hw->sih->chip,

					wlc_hw->sih->chiprev);

		/* big hammer */

		brcms_init(wlc->wl);

		brcms_fatal_error(wlc_hw->wlc->wl);

	}



	/* gptimer timeout */
@@ -8419,7 +8411,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded) 
	return wlc->macintstatus != 0;



 fatal:

	brcms_init(wlc->wl);

	brcms_fatal_error(wlc_hw->wlc->wl);

	return wlc->macintstatus != 0;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE