ath9k: Handle MCI_STATE_AIC_START

This patch adds a function to handle the
MCI message MCI_STATE_AIC_START.

Signed-off-by: Sujith Manoharan <c_manoha@qca.qualcomm.com>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_aic.c b/drivers/net/wireless/ath/ath9k/ar9003_aic.c
index 4e8cf084d2fac2ca4c65787f176366c5779f820e..5b4f818264f569e3886e9cdfb7e72998fe8d3030 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ar9003_aic.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_aic.c
@@ -18,6 +18,7 @@
 #include "hw-ops.h"
 #include "ar9003_mci.h"
 #include "ar9003_aic.h"
+#include "ar9003_phy.h"
 #include "reg_aic.h"
 
 static const u8 com_att_db_table[ATH_AIC_MAX_COM_ATT_DB_TABLE] = {
@@ -512,6 +513,38 @@ exit:
 
 }
 
+u8 ar9003_aic_start_normal(struct ath_hw *ah)
+{
+       struct ath9k_hw_aic *aic = &ah->btcoex_hw.aic;
+       int16_t i;
+
+       if (aic->aic_cal_state != AIC_CAL_STATE_DONE)
+               return 1;
+
+       ar9003_aic_gain_table(ah);
+
+       REG_WRITE(ah, AR_PHY_AIC_SRAM_ADDR_B1, ATH_AIC_SRAM_AUTO_INCREMENT);
+
+       for (i = 0; i < ATH_AIC_MAX_BT_CHANNEL; i++) {
+               REG_WRITE(ah, AR_PHY_AIC_SRAM_DATA_B1, aic->aic_sram[i]);
+       }
+
+       /* FIXME: Replace these with proper register names */
+       REG_WRITE(ah, 0xa6b0, 0x80);
+       REG_WRITE(ah, 0xa6b4, 0x5b2df0);
+       REG_WRITE(ah, 0xa6b8, 0x10762cc8);
+       REG_WRITE(ah, 0xa6bc, 0x1219a4b);
+       REG_WRITE(ah, 0xa6c0, 0x1e01);
+       REG_WRITE(ah, 0xb6b4, 0xf0);
+       REG_WRITE(ah, 0xb6c0, 0x1e01);
+       REG_WRITE(ah, 0xb6b0, 0x81);
+       REG_WRITE(ah, AR_PHY_65NM_CH1_RXTX4, 0x40000000);
+
+       aic->aic_enabled = true;
+
+       return 0;
+}
+
 u8 ar9003_aic_cal_reset(struct ath_hw *ah)
 {
        struct ath9k_hw_aic *aic = &ah->btcoex_hw.aic;

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_aic.h b/drivers/net/wireless/ath/ath9k/ar9003_aic.h
index f7c95466149f9a960a81dbcd463d3d8f9a543442..4dbff96b49cd007fe6ba07f5f0de6226afdd00e0 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ar9003_aic.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_aic.h
@@ -53,6 +53,7 @@ struct ath_aic_out_info {
        struct ath_aic_sram_info sram;
 };
 
+u8 ar9003_aic_start_normal(struct ath_hw *ah);
 u8 ar9003_aic_cal_reset(struct ath_hw *ah);
 u8 ar9003_aic_calibration_single(struct ath_hw *ah);
 

diff --git a/drivers/net/wireless/ath/ath9k/ar9003_mci.c b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
index d6ed62807a979aaa62879823a3678cc626fc84b8..b559d75b748b7ec67ef226631083ddb3f0078b42 100644 (file)
--- a/drivers/net/wireless/ath/ath9k/ar9003_mci.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_mci.c
@@ -1363,6 +1363,10 @@ u32 ar9003_mci_state(struct ath_hw *ah, u32 state_type)
                value = (!mci->unhalt_bt_gpm && mci->need_flush_btinfo) ? 1 : 0;
                mci->need_flush_btinfo = false;
                break;
+       case MCI_STATE_AIC_START:
+               if (ath9k_hw_is_aic_enabled(ah))
+                       ar9003_aic_start_normal(ah);
+               break;
        case MCI_STATE_AIC_CAL_RESET:
                if (ath9k_hw_is_aic_enabled(ah))
                        value = ar9003_aic_cal_reset(ah);