All of lore.kernel.org
 help / color / mirror / Atom feed
From: Felix Fietkau <nbd@openwrt.org>
To: linux-wireless@vger.kernel.org
Cc: linville@tuxdriver.com, mcgrof@qca.qualcomm.com
Subject: [PATCH 9/9] ath9k_hw: increase tx abort timeout for half/quarter channels
Date: Sun, 15 Apr 2012 12:15:41 +0200	[thread overview]
Message-ID: <1334484941-27673-9-git-send-email-nbd@openwrt.org> (raw)
In-Reply-To: <1334484941-27673-8-git-send-email-nbd@openwrt.org>

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
---
 drivers/net/wireless/ath/ath9k/mac.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c
index f7bd253..04ef775 100644
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -133,8 +133,16 @@ EXPORT_SYMBOL(ath9k_hw_updatetxtriglevel);
 
 void ath9k_hw_abort_tx_dma(struct ath_hw *ah)
 {
+	int maxdelay = 1000;
 	int i, q;
 
+	if (ah->curchan) {
+		if (IS_CHAN_HALF_RATE(ah->curchan))
+			maxdelay *= 2;
+		else if (IS_CHAN_QUARTER_RATE(ah->curchan))
+			maxdelay *= 4;
+	}
+
 	REG_WRITE(ah, AR_Q_TXD, AR_Q_TXD_M);
 
 	REG_SET_BIT(ah, AR_PCU_MISC, AR_PCU_FORCE_QUIET_COLL | AR_PCU_CLEAR_VMF);
@@ -142,7 +150,7 @@ void ath9k_hw_abort_tx_dma(struct ath_hw *ah)
 	REG_SET_BIT(ah, AR_D_GBL_IFS_MISC, AR_D_GBL_IFS_MISC_IGNORE_BACKOFF);
 
 	for (q = 0; q < AR_NUM_QCU; q++) {
-		for (i = 0; i < 1000; i++) {
+		for (i = 0; i < maxdelay; i++) {
 			if (i)
 				udelay(5);
 
-- 
1.7.3.2


  reply	other threads:[~2012-04-15 10:15 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-04-15 10:15 [PATCH 1/9] ath9k_hw: use lower rx latency values for half/quarter channels Felix Fietkau
2012-04-15 10:15 ` [PATCH 2/9] ath9k_hw: do not override SIFS time " Felix Fietkau
2012-04-15 10:15   ` [PATCH 3/9] ath9k_hw: set the PHY mode for half/quarter channels on AR9003 Felix Fietkau
2012-04-15 10:15     ` [PATCH 4/9] ath9k_hw: increase symbol overlap window for half/quarter channels Felix Fietkau
2012-04-15 10:15       ` [PATCH 5/9] ath9k_hw: fix and clean up PHY activation delay Felix Fietkau
2012-04-15 10:15         ` [PATCH 6/9] ath9k_hw: increase ACK timeout for half/quarter channels Felix Fietkau
2012-04-15 10:15           ` [PATCH 7/9] ath9k_hw: disable Tx IQ calibration on " Felix Fietkau
2012-04-15 10:15             ` [PATCH 8/9] ath9k_hw: disable fast channel change when changing from/to half/quarter mode Felix Fietkau
2012-04-15 10:15               ` Felix Fietkau [this message]
2012-04-15 18:22   ` [PATCH 2/9] ath9k_hw: do not override SIFS time for half/quarter channels Daniel Halperin
2012-04-15 18:27     ` Felix Fietkau
2012-04-16  6:30       ` Daniel Halperin
2012-04-16  9:44         ` Felix Fietkau
2012-04-16 13:16           ` Felix Fietkau

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1334484941-27673-9-git-send-email-nbd@openwrt.org \
    --to=nbd@openwrt.org \
    --cc=linux-wireless@vger.kernel.org \
    --cc=linville@tuxdriver.com \
    --cc=mcgrof@qca.qualcomm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.