leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

brcm80211: smac: indicate severe problems to Mac80211

Browse Source 
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: Alwin Beukers <alwin@broadcom.com>
Reviewed-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: Roland Vossen <rvossen@broadcom.com>
Signed-off-by: Arend van Spriel <arend@broadcom.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
This commit is contained in:
Roland Vossen 2011-10-18 14:03:04 +02:00 committed by John W. Linville
parent 0527781eb0
commit c261bdf8ac
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.c
View File

@ -1334,6 +1334,14 @@ uint brcms_reset(struct brcms_info *wl)
return 0; 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 * These are interrupt on/off entry points. Disable interrupts
* during interrupt state transition. * during interrupt state transition.

1
drivers/net/wireless/brcm80211/brcmsmac/mac80211_if.h
View File

@ -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_msleep(struct brcms_info *wl, uint ms);
extern void brcms_dpc(unsigned long data); extern void brcms_dpc(unsigned long data);
extern void brcms_timer(struct brcms_timer *t); extern void brcms_timer(struct brcms_timer *t);
extern void brcms_fatal_error(struct brcms_info *wl);
#endif /* _BRCM_MAC80211_IF_H_ */ #endif /* _BRCM_MAC80211_IF_H_ */

14
drivers/net/wireless/brcm80211/brcmsmac/main.c
View File

@ -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); 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) static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw)
{ {
bool fatal = false; bool fatal = false;
@ -2363,7 +2356,7 @@ static void brcms_b_fifoerrors(struct brcms_hardware *wlc_hw)
} }
if (fatal) { if (fatal) {
brcms_c_fatal_error(wlc_hw->wlc); /* big hammer */ brcms_fatal_error(wlc_hw->wlc->wl); /* big hammer */
break; break;
} else } else
W_REG(&regs->intctrlregs[idx].intstatus, 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", printk_once("%s : PSM Watchdog, chipid 0x%x, chiprev 0x%x\n",
__func__, wlc_hw->sih->chip, __func__, wlc_hw->sih->chip,
wlc_hw->sih->chiprev); wlc_hw->sih->chiprev);
/* big hammer */ brcms_fatal_error(wlc_hw->wlc->wl);
brcms_init(wlc->wl);
} }
/* gptimer timeout */ /* gptimer timeout */
@ -8419,7 +8411,7 @@ bool brcms_c_dpc(struct brcms_c_info *wlc, bool bounded)
return wlc->macintstatus != 0; return wlc->macintstatus != 0;
fatal: fatal:
brcms_init(wlc->wl); brcms_fatal_error(wlc_hw->wlc->wl);
return wlc->macintstatus != 0; return wlc->macintstatus != 0;
} }