| Message ID | 1407272099-6271-1-git-send-email-greearb@candelatech.com (mailing list archive) |
|---|---|
| State | Not Applicable, archived |
| Headers | show |
greearb@candelatech.com writes: > From: Ben Greear <greearb@candelatech.com> > > Signed-off-by: Ben Greear <greearb@candelatech.com> > --- [...] > --- a/drivers/net/wireless/ath/ath10k/core.c > +++ b/drivers/net/wireless/ath/ath10k/core.c > @@ -700,6 +700,7 @@ static void ath10k_core_restart(struct work_struct *work) > switch (ar->state) { > case ATH10K_STATE_ON: > ar->state = ATH10K_STATE_RESTARTING; > + ath10k_warn("core-restart, going to state RESTARTING from ON\n"); > del_timer_sync(&ar->scan.timeout); > ath10k_reset_scan((unsigned long)ar); > ieee80211_restart_hw(ar->hw); > @@ -713,10 +714,11 @@ static void ath10k_core_restart(struct work_struct *work) > /* hw restart might be requested from multiple places */ > break; > case ATH10K_STATE_RESTARTED: > - ar->state = ATH10K_STATE_WEDGED; > /* fall through */ > case ATH10K_STATE_WEDGED: > - ath10k_warn("device is wedged, will not restart\n"); > + ath10k_warn("device is wedged, will not restart (state %d)\n", > + ar->state); > + ar->state = ATH10K_STATE_WEDGED; > break; > } I think state prints should be debug messages, not part of error messages. For example, we could add new debug level ATH10K_DBG_CORE or something like that.
On 08/15/2014 05:04 AM, Kalle Valo wrote: > greearb@candelatech.com writes: > >> From: Ben Greear <greearb@candelatech.com> >> >> Signed-off-by: Ben Greear <greearb@candelatech.com> >> --- > > [...] > >> --- a/drivers/net/wireless/ath/ath10k/core.c >> +++ b/drivers/net/wireless/ath/ath10k/core.c >> @@ -700,6 +700,7 @@ static void ath10k_core_restart(struct work_struct *work) >> switch (ar->state) { >> case ATH10K_STATE_ON: >> ar->state = ATH10K_STATE_RESTARTING; >> + ath10k_warn("core-restart, going to state RESTARTING from ON\n"); >> del_timer_sync(&ar->scan.timeout); >> ath10k_reset_scan((unsigned long)ar); >> ieee80211_restart_hw(ar->hw); >> @@ -713,10 +714,11 @@ static void ath10k_core_restart(struct work_struct *work) >> /* hw restart might be requested from multiple places */ >> break; >> case ATH10K_STATE_RESTARTED: >> - ar->state = ATH10K_STATE_WEDGED; >> /* fall through */ >> case ATH10K_STATE_WEDGED: >> - ath10k_warn("device is wedged, will not restart\n"); >> + ath10k_warn("device is wedged, will not restart (state %d)\n", >> + ar->state); >> + ar->state = ATH10K_STATE_WEDGED; >> break; >> } > > I think state prints should be debug messages, not part of error > messages. For example, we could add new debug level ATH10K_DBG_CORE or > something like that. I'll respin the patch accordingly when I get a chance. Thanks, Ben
diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c index 030bef1..d522d3a 100644 --- a/drivers/net/wireless/ath/ath10k/core.c +++ b/drivers/net/wireless/ath/ath10k/core.c @@ -700,6 +700,7 @@ static void ath10k_core_restart(struct work_struct *work) switch (ar->state) { case ATH10K_STATE_ON: ar->state = ATH10K_STATE_RESTARTING; + ath10k_warn("core-restart, going to state RESTARTING from ON\n"); del_timer_sync(&ar->scan.timeout); ath10k_reset_scan((unsigned long)ar); ieee80211_restart_hw(ar->hw); @@ -713,10 +714,11 @@ static void ath10k_core_restart(struct work_struct *work) /* hw restart might be requested from multiple places */ break; case ATH10K_STATE_RESTARTED: - ar->state = ATH10K_STATE_WEDGED; /* fall through */ case ATH10K_STATE_WEDGED: - ath10k_warn("device is wedged, will not restart\n"); + ath10k_warn("device is wedged, will not restart (state %d)\n", + ar->state); + ar->state = ATH10K_STATE_WEDGED; break; }