2013-03-15 15:18:54

by Felix Fietkau

Subject: [PATCH 3.9] ath9k: limit tx path hang check to normal data queues

The beacon and multicast-buffer queues are managed by the beacon
tasklet, and the generic tx path hang check does not help in any way
here. Running it on those queues anyway can introduce some race
conditions leading to unnecessary chip resets.

Cc: [email protected]
Signed-off-by: Felix Fietkau <[email protected]>
---
drivers/net/wireless/ath/ath9k/link.c | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/link.c b/drivers/net/wireless/ath/ath9k/link.c
index ade3afb..39c84ec 100644
--- a/drivers/net/wireless/ath/ath9k/link.c
+++ b/drivers/net/wireless/ath/ath9k/link.c
@@ -28,21 +28,21 @@ void ath_tx_complete_poll_work(struct work_struct *work)
int i;
bool needreset = false;

- for (i = 0; i < ATH9K_NUM_TX_QUEUES; i++)
- if (ATH_TXQ_SETUP(sc, i)) {
- txq = &sc->tx.txq[i];
- ath_txq_lock(sc, txq);
- if (txq->axq_depth) {
- if (txq->axq_tx_inprogress) {
- needreset = true;
- ath_txq_unlock(sc, txq);
- break;
- } else {
- txq->axq_tx_inprogress = true;
- }
+ for (i = 0; i < IEEE80211_NUM_ACS; i++) {
+ txq = sc->tx.txq_map[i];
+
+ ath_txq_lock(sc, txq);
+ if (txq->axq_depth) {
+ if (txq->axq_tx_inprogress) {
+ needreset = true;
+ ath_txq_unlock(sc, txq);
+ break;
+ } else {
+ txq->axq_tx_inprogress = true;
}
- ath_txq_unlock_complete(sc, txq);
}
+ ath_txq_unlock_complete(sc, txq);
+ }

if (needreset) {
ath_dbg(ath9k_hw_common(sc->sc_ah), RESET,
--
1.8.0.2

2013-03-15 18:34:58

by Luis Chamberlain

Subject: Re: [PATCH 3.9] ath9k: limit tx path hang check to normal data queues

On Fri, Mar 15, 2013 at 04:18:44PM +0100, Felix Fietkau wrote:
> The beacon and multicast-buffer queues are managed by the beacon
> tasklet, and the generic tx path hang check does not help in any way
> here. Running it on those queues anyway can introduce some race
> conditions leading to unnecessary chip resets.
>
> Cc: [email protected]
> Signed-off-by: Felix Fietkau <[email protected]>

This applies to v3.8 as well, do you want it there as well?

Luis

2013-03-15 22:21:54

by Felix Fietkau

Subject: Re: [PATCH 3.9] ath9k: limit tx path hang check to normal data queues

On 2013-03-15 7:34 PM, Luis R. Rodriguez wrote:
> On Fri, Mar 15, 2013 at 04:18:44PM +0100, Felix Fietkau wrote:
>> The beacon and multicast-buffer queues are managed by the beacon
>> tasklet, and the generic tx path hang check does not help in any way
>> here. Running it on those queues anyway can introduce some race
>> conditions leading to unnecessary chip resets.
>>
>> Cc: [email protected]
>> Signed-off-by: Felix Fietkau <[email protected]>
>
> This applies to v3.8 as well, do you want it there as well?
Yes