2016-04-07 06:42:31

by Rajkumar Manoharan

Subject: [PATCH] ath10k: fix rx_channel during hw reconfigure

Upon firmware assert, restart work will be triggered so that mac80211
will reconfigure the driver. An issue is reported that after restart
work, survey dump data do not contain in-use (SURVEY_INFO_IN_USE) info
for operating channel. During reconfigure, since mac80211 already has
valid channel context for given radio, channel context iteration return
num_chanctx > 0. Hence rx_channel is always NULL. Fix this by assigning
channel context to rx_channel when driver restart is in progress.

Cc: [email protected]
Signed-off-by: Rajkumar Manoharan <[email protected]>
---
drivers/net/wireless/ath/ath10k/mac.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/drivers/net/wireless/ath/ath10k/mac.c b/drivers/net/wireless/ath/ath10k/mac.c
index b0e613bc10a5..e31469dd58dd 100644
--- a/drivers/net/wireless/ath/ath10k/mac.c
+++ b/drivers/net/wireless/ath/ath10k/mac.c
@@ -6867,7 +6867,13 @@ ath10k_mac_update_rx_channel(struct ath10k *ar,
def = &vifs[0].new_ctx->def;

ar->rx_channel = def->chan;
- } else if (ctx && ath10k_mac_num_chanctxs(ar) == 0) {
+ } else if ((ctx && ath10k_mac_num_chanctxs(ar) == 0) ||
+ (ctx && (ar->state == ATH10K_STATE_RESTARTED))) {
+ /* During driver restart due to firmware assert, since mac80211
+ * already has valid channel context for given radio, channel
+ * context iteration return num_chanctx > 0. So fix rx_channel
+ * when restart is in progress.
+ */
ar->rx_channel = ctx->def.chan;
} else {
ar->rx_channel = NULL;
--
2.7.4

2016-04-19 15:47:17

by Kalle Valo

Subject: Re: [PATCH] ath10k: fix rx_channel during hw reconfigure

Rajkumar Manoharan <[email protected]> writes:

> Upon firmware assert, restart work will be triggered so that mac80211
> will reconfigure the driver. An issue is reported that after restart
> work, survey dump data do not contain in-use (SURVEY_INFO_IN_USE) info
> for operating channel. During reconfigure, since mac80211 already has
> valid channel context for given radio, channel context iteration return
> num_chanctx > 0. Hence rx_channel is always NULL. Fix this by assigning
> channel context to rx_channel when driver restart is in progress.
>
> Cc: [email protected]
> Signed-off-by: Rajkumar Manoharan <[email protected]>

Applied, thanks.

--
Kalle Valo