From: Vasanthakumar Thiagarajan <vasanth@atheros.com>
To: linville@tuxdriver.com
Cc: linux-wireless@vger.kernel.org
Subject: [PATCH V2 21/22] ath9k_hw: Disable INTR_HOST1_FATAL to avoid interrupt strom with ar9430
Date: Tue, 19 Apr 2011 19:29:19 +0530 [thread overview]
Message-ID: <1303221560-25139-22-git-send-email-vasanth@atheros.com> (raw)
In-Reply-To: <1303221560-25139-1-git-send-email-vasanth@atheros.com>
Signed-off-by: Vasanthakumar Thiagarajan <vasanth@atheros.com>
---
drivers/net/wireless/ath/ath9k/hw.c | 6 +++++-
drivers/net/wireless/ath/ath9k/mac.c | 10 ++++++----
2 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index c725640..b780f6f 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -793,12 +793,16 @@ static void ath9k_hw_init_pll(struct ath_hw *ah,
static void ath9k_hw_init_interrupt_masks(struct ath_hw *ah,
enum nl80211_iftype opmode)
{
+ u32 sync_default = AR_INTR_SYNC_DEFAULT;
u32 imr_reg = AR_IMR_TXERR |
AR_IMR_TXURN |
AR_IMR_RXERR |
AR_IMR_RXORN |
AR_IMR_BCNMISC;
+ if (AR_SREV_9340(ah))
+ sync_default &= ~AR_INTR_SYNC_HOST1_FATAL;
+
if (AR_SREV_9300_20_OR_LATER(ah)) {
imr_reg |= AR_IMR_RXOK_HP;
if (ah->config.rx_intr_mitigation)
@@ -829,7 +833,7 @@ static void ath9k_hw_init_interrupt_masks(struct ath_hw *ah,
if (!AR_SREV_9100(ah)) {
REG_WRITE(ah, AR_INTR_SYNC_CAUSE, 0xFFFFFFFF);
- REG_WRITE(ah, AR_INTR_SYNC_ENABLE, AR_INTR_SYNC_DEFAULT);
+ REG_WRITE(ah, AR_INTR_SYNC_ENABLE, sync_default);
REG_WRITE(ah, AR_INTR_SYNC_MASK, 0);
}
diff --git a/drivers/net/wireless/ath/ath9k/mac.c b/drivers/net/wireless/ath/ath9k/mac.c
index 1968c67..c8a4ced 100644
--- a/drivers/net/wireless/ath/ath9k/mac.c
+++ b/drivers/net/wireless/ath/ath9k/mac.c
@@ -812,10 +812,14 @@ EXPORT_SYMBOL(ath9k_hw_disable_interrupts);
void ath9k_hw_enable_interrupts(struct ath_hw *ah)
{
struct ath_common *common = ath9k_hw_common(ah);
+ u32 sync_default = AR_INTR_SYNC_DEFAULT;
if (!(ah->imask & ATH9K_INT_GLOBAL))
return;
+ if (AR_SREV_9340(ah))
+ sync_default &= ~AR_INTR_SYNC_HOST1_FATAL;
+
ath_dbg(common, ATH_DBG_INTERRUPT, "enable IER\n");
REG_WRITE(ah, AR_IER, AR_IER_ENABLE);
if (!AR_SREV_9100(ah)) {
@@ -824,10 +828,8 @@ void ath9k_hw_enable_interrupts(struct ath_hw *ah)
REG_WRITE(ah, AR_INTR_ASYNC_MASK, AR_INTR_MAC_IRQ);
- REG_WRITE(ah, AR_INTR_SYNC_ENABLE,
- AR_INTR_SYNC_DEFAULT);
- REG_WRITE(ah, AR_INTR_SYNC_MASK,
- AR_INTR_SYNC_DEFAULT);
+ REG_WRITE(ah, AR_INTR_SYNC_ENABLE, sync_default);
+ REG_WRITE(ah, AR_INTR_SYNC_MASK, sync_default);
}
ath_dbg(common, ATH_DBG_INTERRUPT, "AR_IMR 0x%x IER 0x%x\n",
REG_READ(ah, AR_IMR), REG_READ(ah, AR_IER));
--
1.7.0.4
next prev parent reply other threads:[~2011-04-19 13:59 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-04-19 13:58 [PATCH V2 00/22] Add support for AR9340 Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 02/22] ath9k_hw: Take care of few host interface register changes " Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 03/22] ath9k_hw: Get AHB clock information from ath9k_platform_data Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 04/22] ath9k_hw: Configure pll control register accordingly for AR9340 Vasanthakumar Thiagarajan
2011-04-19 14:13 ` Sujith
2011-04-20 4:35 ` Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 05/22] ath9k_hw: Add initvals.h for ar9340 Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 08/22] ath9k_hw: Initialize tx and rx gain table from " Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 09/22] ath9k_hw: Read spur frequency information from eeprom for AR9340 Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 10/22] ath9k_hw: Configure RF channel freqency " Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 11/22] ath9k_hw: Clean up rx/tx chain configuration before AGC/IQ cal Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 13/22] ath9k_hw: Don't configure AR_CH0_THERM for AR9340 Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 14/22] ath9k_hw: Skip internal regulator configuration " Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 15/22] ath9k_hw: Configure tuning capacitance value for AR9340 as well Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 16/22] ath9k_hw: Enable byte Tx/Rx data swap for AR9340 Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 17/22] ath9k_hw: Configure chain switch table and attenuation control only for active chains Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 18/22] ath9k_hw: Read iq calibration data " Vasanthakumar Thiagarajan
2011-04-19 13:59 ` [PATCH V2 19/22] ath9k: Add AR9340 platform id to id table Vasanthakumar Thiagarajan
2011-04-19 13:59 ` Vasanthakumar Thiagarajan [this message]
2011-04-19 13:59 ` [PATCH V2 22/22] ath9k_hw: Enable AR9340 support Vasanthakumar Thiagarajan
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=1303221560-25139-22-git-send-email-vasanth@atheros.com \
--to=vasanth@atheros.com \
--cc=linux-wireless@vger.kernel.org \
--cc=linville@tuxdriver.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).