From: Sujith Manoharan <sujith@msujith.org>
To: linux-wireless@vger.kernel.org
Cc: ath9k-devel@lists.ath9k.org
Subject: [PATCH v2 07/11] ath9k: Disable AIC by default
Date: Sat, 14 Mar 2015 11:27:53 +0530 [thread overview]
Message-ID: <1426312677-2064-8-git-send-email-sujith@msujith.org> (raw)
In-Reply-To: <1426312677-2064-1-git-send-email-sujith@msujith.org>
From: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Since various MCI messages need to be
handled, along with driver-level support
in upper layers, disable AIC for now.
Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
---
drivers/net/wireless/ath/ath9k/ar9003_aic.c | 6 ++++++
drivers/net/wireless/ath/ath9k/ar9003_mci.c | 3 ++-
2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_aic.c b/drivers/net/wireless/ath/ath9k/ar9003_aic.c
index 51ecc9b..7bdbc7a 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_aic.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_aic.c
@@ -40,6 +40,12 @@ static bool ar9003_hw_is_aic_enabled(struct ath_hw *ah)
{
struct ath9k_hw_mci *mci_hw = &ah->btcoex_hw.mci;
+ /*
+ * Disable AIC for now, until we have all the
+ * HW code and the driver-layer support ready.
+ */
+ return false;
+
if (mci_hw->config & ATH_MCI_CONFIG_DISABLE_AIC)
return false;
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.c b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
index 20bb5b9..6fa98e5 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_mci.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
@@ -1364,7 +1364,8 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type)
mci->need_flush_btinfo = false;
break;
case MCI_STATE_AIC_CAL_SINGLE:
- value = ar9003_aic_calibration_single(ah);
+ if (ath9k_hw_is_aic_enabled(ah))
+ value = ar9003_aic_calibration_single(ah);
break;
default:
break;
--
2.3.1
next prev parent reply other threads:[~2015-03-14 5:54 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-14 5:57 [PATCH v2 00/11] ath9k patches Sujith Manoharan
2015-03-14 5:57 ` [PATCH v2 01/11] ath9k: Add initial structures for AIC Sujith Manoharan
2015-03-20 6:29 ` [v2,01/11] " Kalle Valo
2015-03-14 5:57 ` [PATCH v2 02/11] ath9k: Register private AIC ops Sujith Manoharan
2015-03-20 11:06 ` Kalle Valo
2015-03-20 13:46 ` Sujith Manoharan
2015-03-20 13:55 ` Kalle Valo
2015-03-14 5:57 ` [PATCH v2 03/11] ath9k: Add register definitions for AIC Sujith Manoharan
2015-03-14 5:57 ` [PATCH v2 04/11] ath9k: Handle MCI_STATE_AIC_CAL_SINGLE Sujith Manoharan
2015-03-14 5:57 ` [PATCH v2 05/11] ath9k: Finish AIC calibration Sujith Manoharan
2015-03-14 5:57 ` [PATCH v2 06/11] ath9k: Process the AIC calibration results Sujith Manoharan
2015-03-14 5:57 ` Sujith Manoharan [this message]
2015-03-14 5:57 ` [PATCH v2 08/11] ath9k: Handle MCI_STATE_AIC_CAL_RESET Sujith Manoharan
2015-03-14 5:57 ` [PATCH v2 09/11] ath9k: Handle MCI_STATE_AIC_START Sujith Manoharan
2015-03-14 5:57 ` [PATCH v2 10/11] ath9k: Handle MCI_STATE_AIC_CAL Sujith Manoharan
2015-03-14 5:57 ` [PATCH v2 11/11] ath9k: Start AIC calibration during MCI reset Sujith Manoharan
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=1426312677-2064-8-git-send-email-sujith@msujith.org \
--to=sujith@msujith.org \
--cc=ath9k-devel@lists.ath9k.org \
--cc=linux-wireless@vger.kernel.org \
/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).