Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-next into for-davem

Conflicts:
	include/net/bluetooth/bluetooth.h

18 files changed, 519 insertions, 99 deletions

diff --git a/drivers/net/wireless/ath/ath9k/Kconfig b/drivers/net/wireless/ath/ath9k/Kconfig
index d9c08c619a3a..7b4c074e12fa 100644
--- a/drivers/net/wireless/ath/ath9k/Kconfig
+++ b/drivers/net/wireless/ath/ath9k/Kconfig
@@ -25,6 +25,7 @@ config ATH9K
 
 config ATH9K_PCI
         bool "Atheros ath9k PCI/PCIe bus support"
+        default y
         depends on ATH9K && PCI
         ---help---
           This option enables the PCI bus support in ath9k.
diff --git a/drivers/net/wireless/ath/ath9k/Makefile b/drivers/net/wireless/ath/ath9k/Makefile
index 36ed3c46fec6..49d3f25f509d 100644
--- a/drivers/net/wireless/ath/ath9k/Makefile
+++ b/drivers/net/wireless/ath/ath9k/Makefile
@@ -4,6 +4,7 @@ ath9k-y +=	beacon.o \
                 main.o \
                 recv.o \
                 xmit.o \
+                mci.o \
 
 ath9k-$(CONFIG_ATH9K_RATE_CONTROL) += rc.o
 ath9k-$(CONFIG_ATH9K_PCI) += pci.o
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
index 3b262ba6b172..a93bd63ad23b 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.c
@@ -121,10 +121,8 @@ static const struct ar9300_eeprom ar9300_default = {
                  * if the register is per chain
                  */
                 .noiseFloorThreshCh = {-1, 0, 0},
-                .ob = {1, 1, 1},/* 3 chain */
-                .db_stage2 = {1, 1, 1}, /* 3 chain  */
-                .db_stage3 = {0, 0, 0},
-                .db_stage4 = {0, 0, 0},
+                .reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+                .quick_drop = 0,
                 .xpaBiasLvl = 0,
                 .txFrameToDataStart = 0x0e,
                 .txFrameToPaOn = 0x0e,
@@ -144,7 +142,7 @@ static const struct ar9300_eeprom ar9300_default = {
          },
         .base_ext1 = {
                 .ant_div_control = 0,
-                .future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+                .future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
         },
         .calFreqPier2G = {
                 FREQ2FBIN(2412, 1),
@@ -323,10 +321,8 @@ static const struct ar9300_eeprom ar9300_default = {
                 .spurChans = {0, 0, 0, 0, 0},
                 /* noiseFloorThreshCh Check if the register is per chain */
                 .noiseFloorThreshCh = {-1, 0, 0},
-                .ob = {3, 3, 3}, /* 3 chain */
-                .db_stage2 = {3, 3, 3}, /* 3 chain */
-                .db_stage3 = {3, 3, 3}, /* doesn't exist for 2G */
-                .db_stage4 = {3, 3, 3},  /* don't exist for 2G */
+                .reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+                .quick_drop = 0,
                 .xpaBiasLvl = 0,
                 .txFrameToDataStart = 0x0e,
                 .txFrameToPaOn = 0x0e,
@@ -698,10 +694,8 @@ static const struct ar9300_eeprom ar9300_x113 = {
                  * if the register is per chain
                  */
                 .noiseFloorThreshCh = {-1, 0, 0},
-                .ob = {1, 1, 1},/* 3 chain */
-                .db_stage2 = {1, 1, 1}, /* 3 chain  */
-                .db_stage3 = {0, 0, 0},
-                .db_stage4 = {0, 0, 0},
+                .reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+                .quick_drop = 0,
                 .xpaBiasLvl = 0,
                 .txFrameToDataStart = 0x0e,
                 .txFrameToPaOn = 0x0e,
@@ -721,7 +715,7 @@ static const struct ar9300_eeprom ar9300_x113 = {
          },
          .base_ext1 = {
                 .ant_div_control = 0,
-                .future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+                .future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
          },
         .calFreqPier2G = {
                 FREQ2FBIN(2412, 1),
@@ -900,10 +894,8 @@ static const struct ar9300_eeprom ar9300_x113 = {
                 .spurChans = {FREQ2FBIN(5500, 0), 0, 0, 0, 0},
                 /* noiseFloorThreshCh Check if the register is per chain */
                 .noiseFloorThreshCh = {-1, 0, 0},
-                .ob = {3, 3, 3}, /* 3 chain */
-                .db_stage2 = {3, 3, 3}, /* 3 chain */
-                .db_stage3 = {3, 3, 3}, /* doesn't exist for 2G */
-                .db_stage4 = {3, 3, 3},  /* don't exist for 2G */
+                .reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+                .quick_drop = 0,
                 .xpaBiasLvl = 0xf,
                 .txFrameToDataStart = 0x0e,
                 .txFrameToPaOn = 0x0e,
@@ -1276,10 +1268,8 @@ static const struct ar9300_eeprom ar9300_h112 = {
                  * if the register is per chain
                  */
                 .noiseFloorThreshCh = {-1, 0, 0},
-                .ob = {1, 1, 1},/* 3 chain */
-                .db_stage2 = {1, 1, 1}, /* 3 chain  */
-                .db_stage3 = {0, 0, 0},
-                .db_stage4 = {0, 0, 0},
+                .reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+                .quick_drop = 0,
                 .xpaBiasLvl = 0,
                 .txFrameToDataStart = 0x0e,
                 .txFrameToPaOn = 0x0e,
@@ -1291,20 +1281,20 @@ static const struct ar9300_eeprom ar9300_h112 = {
                 .txEndToRxOn = 0x2,
                 .txFrameToXpaOn = 0xe,
                 .thresh62 = 28,
-                .papdRateMaskHt20 = LE32(0x80c080),
-                .papdRateMaskHt40 = LE32(0x80c080),
+                .papdRateMaskHt20 = LE32(0x0c80c080),
+                .papdRateMaskHt40 = LE32(0x0080c080),
                 .futureModal = {
                         0, 0, 0, 0, 0, 0, 0, 0,
                 },
         },
         .base_ext1 = {
                 .ant_div_control = 0,
-                .future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+                .future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
         },
         .calFreqPier2G = {
                 FREQ2FBIN(2412, 1),
                 FREQ2FBIN(2437, 1),
-                FREQ2FBIN(2472, 1),
+                FREQ2FBIN(2462, 1),
         },
         /* ar9300_cal_data_per_freq_op_loop 2g */
         .calPierData2G = {
@@ -1314,7 +1304,7 @@ static const struct ar9300_eeprom ar9300_h112 = {
         },
         .calTarget_freqbin_Cck = {
                 FREQ2FBIN(2412, 1),
-                FREQ2FBIN(2484, 1),
+                FREQ2FBIN(2472, 1),
         },
         .calTarget_freqbin_2G = {
                 FREQ2FBIN(2412, 1),
@@ -1478,10 +1468,8 @@ static const struct ar9300_eeprom ar9300_h112 = {
                 .spurChans = {0, 0, 0, 0, 0},
                 /* noiseFloorThreshCh Check if the register is per chain */
                 .noiseFloorThreshCh = {-1, 0, 0},
-                .ob = {3, 3, 3}, /* 3 chain */
-                .db_stage2 = {3, 3, 3}, /* 3 chain */
-                .db_stage3 = {3, 3, 3}, /* doesn't exist for 2G */
-                .db_stage4 = {3, 3, 3},  /* don't exist for 2G */
+                .reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+                .quick_drop = 0,
                 .xpaBiasLvl = 0,
                 .txFrameToDataStart = 0x0e,
                 .txFrameToPaOn = 0x0e,
@@ -1515,7 +1503,7 @@ static const struct ar9300_eeprom ar9300_h112 = {
                 FREQ2FBIN(5500, 0),
                 FREQ2FBIN(5600, 0),
                 FREQ2FBIN(5700, 0),
-                FREQ2FBIN(5825, 0)
+                FREQ2FBIN(5785, 0)
         },
         .calPierData5G = {
                 {
@@ -1854,10 +1842,8 @@ static const struct ar9300_eeprom ar9300_x112 = {
                  * if the register is per chain
                  */
                 .noiseFloorThreshCh = {-1, 0, 0},
-                .ob = {1, 1, 1},/* 3 chain */
-                .db_stage2 = {1, 1, 1}, /* 3 chain  */
-                .db_stage3 = {0, 0, 0},
-                .db_stage4 = {0, 0, 0},
+                .reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+                .quick_drop = 0,
                 .xpaBiasLvl = 0,
                 .txFrameToDataStart = 0x0e,
                 .txFrameToPaOn = 0x0e,
@@ -1877,7 +1863,7 @@ static const struct ar9300_eeprom ar9300_x112 = {
         },
         .base_ext1 = {
                 .ant_div_control = 0,
-                .future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+                .future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
         },
         .calFreqPier2G = {
                 FREQ2FBIN(2412, 1),
@@ -2056,10 +2042,8 @@ static const struct ar9300_eeprom ar9300_x112 = {
                 .spurChans = {0, 0, 0, 0, 0},
                 /* noiseFloorThreshch check if the register is per chain */
                 .noiseFloorThreshCh = {-1, 0, 0},
-                .ob = {3, 3, 3}, /* 3 chain */
-                .db_stage2 = {3, 3, 3}, /* 3 chain */
-                .db_stage3 = {3, 3, 3}, /* doesn't exist for 2G */
-                .db_stage4 = {3, 3, 3},  /* don't exist for 2G */
+                .reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+                .quick_drop = 0,
                 .xpaBiasLvl = 0,
                 .txFrameToDataStart = 0x0e,
                 .txFrameToPaOn = 0x0e,
@@ -2431,10 +2415,8 @@ static const struct ar9300_eeprom ar9300_h116 = {
                  * if the register is per chain
                  */
                 .noiseFloorThreshCh = {-1, 0, 0},
-                .ob = {1, 1, 1},/* 3 chain */
-                .db_stage2 = {1, 1, 1}, /* 3 chain  */
-                .db_stage3 = {0, 0, 0},
-                .db_stage4 = {0, 0, 0},
+                .reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+                .quick_drop = 0,
                 .xpaBiasLvl = 0,
                 .txFrameToDataStart = 0x0e,
                 .txFrameToPaOn = 0x0e,
@@ -2454,12 +2436,12 @@ static const struct ar9300_eeprom ar9300_h116 = {
          },
          .base_ext1 = {
                 .ant_div_control = 0,
-                .future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+                .future = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
          },
         .calFreqPier2G = {
                 FREQ2FBIN(2412, 1),
                 FREQ2FBIN(2437, 1),
-                FREQ2FBIN(2472, 1),
+                FREQ2FBIN(2462, 1),
          },
         /* ar9300_cal_data_per_freq_op_loop 2g */
         .calPierData2G = {
@@ -2633,10 +2615,8 @@ static const struct ar9300_eeprom ar9300_h116 = {
                 .spurChans = {0, 0, 0, 0, 0},
                 /* noiseFloorThreshCh Check if the register is per chain */
                 .noiseFloorThreshCh = {-1, 0, 0},
-                .ob = {3, 3, 3}, /* 3 chain */
-                .db_stage2 = {3, 3, 3}, /* 3 chain */
-                .db_stage3 = {3, 3, 3}, /* doesn't exist for 2G */
-                .db_stage4 = {3, 3, 3},  /* don't exist for 2G */
+                .reserved = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
+                .quick_drop = 0,
                 .xpaBiasLvl = 0,
                 .txFrameToDataStart = 0x0e,
                 .txFrameToPaOn = 0x0e,
@@ -2663,7 +2643,7 @@ static const struct ar9300_eeprom ar9300_h116 = {
                 .xatten1MarginHigh = {0, 0, 0}
          },
         .calFreqPier5G = {
-                FREQ2FBIN(5180, 0),
+                FREQ2FBIN(5160, 0),
                 FREQ2FBIN(5220, 0),
                 FREQ2FBIN(5320, 0),
                 FREQ2FBIN(5400, 0),
@@ -3023,6 +3003,8 @@ static u32 ath9k_hw_ar9300_get_eeprom(struct ath_hw *ah,
                 return eep->modalHeader5G.antennaGain;
         case EEP_ANTENNA_GAIN_2G:
                 return eep->modalHeader2G.antennaGain;
+        case EEP_QUICK_DROP:
+                return pBase->miscConfiguration & BIT(1);
         default:
                 return 0;
         }
@@ -3428,25 +3410,14 @@ static u32 ar9003_dump_modal_eeprom(char *buf, u32 len, u32 size,
         PR_EEP("Chain0 NF Threshold", modal_hdr->noiseFloorThreshCh[0]);
         PR_EEP("Chain1 NF Threshold", modal_hdr->noiseFloorThreshCh[1]);
         PR_EEP("Chain2 NF Threshold", modal_hdr->noiseFloorThreshCh[2]);
+        PR_EEP("Quick Drop", modal_hdr->quick_drop);
+        PR_EEP("txEndToXpaOff", modal_hdr->txEndToXpaOff);
         PR_EEP("xPA Bias Level", modal_hdr->xpaBiasLvl);
         PR_EEP("txFrameToDataStart", modal_hdr->txFrameToDataStart);
         PR_EEP("txFrameToPaOn", modal_hdr->txFrameToPaOn);
         PR_EEP("txFrameToXpaOn", modal_hdr->txFrameToXpaOn);
         PR_EEP("txClip", modal_hdr->txClip);
         PR_EEP("ADC Desired size", modal_hdr->adcDesiredSize);
-        PR_EEP("Chain0 ob", modal_hdr->ob[0]);
-        PR_EEP("Chain1 ob", modal_hdr->ob[1]);
-        PR_EEP("Chain2 ob", modal_hdr->ob[2]);
-
-        PR_EEP("Chain0 db_stage2", modal_hdr->db_stage2[0]);
-        PR_EEP("Chain1 db_stage2", modal_hdr->db_stage2[1]);
-        PR_EEP("Chain2 db_stage2", modal_hdr->db_stage2[2]);
-        PR_EEP("Chain0 db_stage3", modal_hdr->db_stage3[0]);
-        PR_EEP("Chain1 db_stage3", modal_hdr->db_stage3[1]);
-        PR_EEP("Chain2 db_stage3", modal_hdr->db_stage3[2]);
-        PR_EEP("Chain0 db_stage4", modal_hdr->db_stage4[0]);
-        PR_EEP("Chain1 db_stage4", modal_hdr->db_stage4[1]);
-        PR_EEP("Chain2 db_stage4", modal_hdr->db_stage4[2]);
 
         return len;
 }
@@ -3503,6 +3474,7 @@ static u32 ath9k_hw_ar9003_dump_eeprom(struct ath_hw *ah, bool dump_base_hdr,
         PR_EEP("Internal regulator", !!(pBase->featureEnable & BIT(4)));
         PR_EEP("Enable Paprd", !!(pBase->featureEnable & BIT(5)));
         PR_EEP("Driver Strength", !!(pBase->miscConfiguration & BIT(0)));
+        PR_EEP("Quick Drop", !!(pBase->miscConfiguration & BIT(1)));
         PR_EEP("Chain mask Reduce", (pBase->miscConfiguration >> 0x3) & 0x1);
         PR_EEP("Write enable Gpio", pBase->eepromWriteEnableGpio);
         PR_EEP("WLAN Disable Gpio", pBase->wlanDisableGpio);
@@ -3965,6 +3937,40 @@ static void ar9003_hw_apply_tuning_caps(struct ath_hw *ah)
         }
 }
 
+static void ar9003_hw_quick_drop_apply(struct ath_hw *ah, u16 freq)
+{
+        struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+        int quick_drop = ath9k_hw_ar9300_get_eeprom(ah, EEP_QUICK_DROP);
+        s32 t[3], f[3] = {5180, 5500, 5785};
+
+        if (!quick_drop)
+                return;
+
+        if (freq < 4000)
+                quick_drop = eep->modalHeader2G.quick_drop;
+        else {
+                t[0] = eep->base_ext1.quick_drop_low;
+                t[1] = eep->modalHeader5G.quick_drop;
+                t[2] = eep->base_ext1.quick_drop_high;
+                quick_drop = ar9003_hw_power_interpolate(freq, f, t, 3);
+        }
+        REG_RMW_FIELD(ah, AR_PHY_AGC, AR_PHY_AGC_QUICK_DROP, quick_drop);
+}
+
+static void ar9003_hw_txend_to_xpa_off_apply(struct ath_hw *ah, u16 freq)
+{
+        struct ar9300_eeprom *eep = &ah->eeprom.ar9300_eep;
+        u32 value;
+
+        value = (freq < 4000) ? eep->modalHeader2G.txEndToXpaOff :
+                                eep->modalHeader5G.txEndToXpaOff;
+
+        REG_RMW_FIELD(ah, AR_PHY_XPA_TIMING_CTL,
+                      AR_PHY_XPA_TIMING_CTL_TX_END_XPAB_OFF, value);
+        REG_RMW_FIELD(ah, AR_PHY_XPA_TIMING_CTL,
+                      AR_PHY_XPA_TIMING_CTL_TX_END_XPAA_OFF, value);
+}
+
 static void ath9k_hw_ar9300_set_board_values(struct ath_hw *ah,
                                              struct ath9k_channel *chan)
 {
@@ -3972,10 +3978,12 @@ static void ath9k_hw_ar9300_set_board_values(struct ath_hw *ah,
         ar9003_hw_ant_ctrl_apply(ah, IS_CHAN_2GHZ(chan));
         ar9003_hw_drive_strength_apply(ah);
         ar9003_hw_atten_apply(ah, chan);
+        ar9003_hw_quick_drop_apply(ah, chan->channel);
         if (!AR_SREV_9330(ah) && !AR_SREV_9340(ah))
                 ar9003_hw_internal_regulator_apply(ah);
         if (AR_SREV_9485(ah) || AR_SREV_9330(ah) || AR_SREV_9340(ah))
                 ar9003_hw_apply_tuning_caps(ah);
+        ar9003_hw_txend_to_xpa_off_apply(ah, chan->channel);
 }
 
 static void ath9k_hw_ar9300_set_addac(struct ath_hw *ah,
@@ -5051,6 +5059,8 @@ static void ath9k_hw_ar9300_set_txpower(struct ath_hw *ah,
                         regulatory->max_power_level = targetPowerValT2[i];
         }
 
+        ath9k_hw_update_regulatory_maxpower(ah);
+
         if (test)
                 return;
 
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
index 6335a867527e..bb223fe82816 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_eeprom.h
@@ -216,10 +216,8 @@ struct ar9300_modal_eep_header {
         u8 spurChans[AR_EEPROM_MODAL_SPURS];
         /* 3  Check if the register is per chain */
         int8_t noiseFloorThreshCh[AR9300_MAX_CHAINS];
-        u8 ob[AR9300_MAX_CHAINS];
-        u8 db_stage2[AR9300_MAX_CHAINS];
-        u8 db_stage3[AR9300_MAX_CHAINS];
-        u8 db_stage4[AR9300_MAX_CHAINS];
+        u8 reserved[11];
+        int8_t quick_drop;
         u8 xpaBiasLvl;
         u8 txFrameToDataStart;
         u8 txFrameToPaOn;
@@ -269,7 +267,9 @@ struct cal_ctl_data_5g {
 
 struct ar9300_BaseExtension_1 {
         u8 ant_div_control;
-        u8 future[13];
+        u8 future[11];
+        int8_t quick_drop_low;
+        int8_t quick_drop_high;
 } __packed;
 
 struct ar9300_BaseExtension_2 {
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.c b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
index 2330e7ede199..e41d26939ab8 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.c
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.c
@@ -199,12 +199,14 @@ static void ar9003_hw_spur_mitigate_mrc_cck(struct ath_hw *ah,
                         synth_freq = chan->channel;
                 }
         } else {
-                range = 10;
+                range = AR_SREV_9462(ah) ? 5 : 10;
                 max_spur_cnts = 4;
                 synth_freq = chan->channel;
         }
 
         for (i = 0; i < max_spur_cnts; i++) {
+                if (AR_SREV_9462(ah) && (i == 0 || i == 3))
+                        continue;
                 negative = 0;
                 if (AR_SREV_9485(ah) || AR_SREV_9340(ah) || AR_SREV_9330(ah))
                         cur_bb_spur = FBIN2FREQ(spur_fbin_ptr[i],
diff --git a/drivers/net/wireless/ath/ath9k/ar9003_phy.h b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
index 4114fe752c6b..497d7461838a 100644
--- a/drivers/net/wireless/ath/ath9k/ar9003_phy.h
+++ b/drivers/net/wireless/ath/ath9k/ar9003_phy.h
@@ -389,6 +389,8 @@
 #define AR_PHY_DAG_CTRLCCK_RSSI_THR_S   10
 
 #define AR_PHY_RIFS_INIT_DELAY         0x3ff0000
+#define AR_PHY_AGC_QUICK_DROP       0x03c00000
+#define AR_PHY_AGC_QUICK_DROP_S     22
 #define AR_PHY_AGC_COARSE_LOW       0x00007F80
 #define AR_PHY_AGC_COARSE_LOW_S     7
 #define AR_PHY_AGC_COARSE_HIGH      0x003F8000
diff --git a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
index 9c51b395b4ff..259a6f312afb 100644
--- a/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
+++ b/drivers/net/wireless/ath/ath9k/ar9462_2p0_initvals.h
@@ -43,16 +43,16 @@ static const u32 ar9462_2p0_baseband_postamble[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x00009810, 0xd00a8005, 0xd00a8005, 0xd00a8011, 0xd00a8011},
         {0x00009820, 0x206a022e, 0x206a022e, 0x206a012e, 0x206a012e},
-        {0x00009824, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0, 0x5ac640d0},
-        {0x00009828, 0x06903081, 0x06903081, 0x06903881, 0x06903881},
+        {0x00009824, 0x5ac640de, 0x5ac640d0, 0x5ac640d0, 0x5ac640de},
+        {0x00009828, 0x0796be89, 0x0696b081, 0x0696b881, 0x0796be89},
         {0x0000982c, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4, 0x05eea6d4},
         {0x00009830, 0x0000059c, 0x0000059c, 0x0000119c, 0x0000119c},
         {0x00009c00, 0x000000c4, 0x000000c4, 0x000000c4, 0x000000c4},
         {0x00009e00, 0x0372111a, 0x0372111a, 0x037216a0, 0x037216a0},
         {0x00009e04, 0x001c2020, 0x001c2020, 0x001c2020, 0x001c2020},
         {0x00009e0c, 0x6c4000e2, 0x6d4000e2, 0x6d4000e2, 0x6c4000e2},
-        {0x00009e10, 0x7ec88d2e, 0x7ec88d2e, 0x7ec84d2e, 0x7ec84d2e},
-        {0x00009e14, 0x37b95d5e, 0x37b9605e, 0x3039605e, 0x33795d5e},
+        {0x00009e10, 0x92c88d2e, 0x7ec88d2e, 0x7ec84d2e, 0x92c84d2e},
+        {0x00009e14, 0x37b95d5e, 0x37b9605e, 0x3379605e, 0x33795d5e},
         {0x00009e18, 0x00000000, 0x00000000, 0x00000000, 0x00000000},
         {0x00009e1c, 0x0001cf9c, 0x0001cf9c, 0x00021f9c, 0x00021f9c},
         {0x00009e20, 0x000003b5, 0x000003b5, 0x000003ce, 0x000003ce},
@@ -688,8 +688,8 @@ static const u32 ar9462_2p0_mac_postamble_emulation[][5] = {
 static const u32 ar9462_2p0_radio_postamble_sys3ant[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x000160ac, 0xa4646c08, 0xa4646c08, 0x24645808, 0x24645808},
-        {0x00016140, 0x10804008, 0x10804008, 0x90804008, 0x90804008},
-        {0x00016540, 0x10804008, 0x10804008, 0x90804008, 0x90804008},
+        {0x00016140, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
+        {0x00016540, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
 };
 
 static const u32 ar9462_2p0_baseband_postamble_emulation[][5] = {
@@ -717,8 +717,8 @@ static const u32 ar9462_2p0_baseband_postamble_emulation[][5] = {
 static const u32 ar9462_2p0_radio_postamble_sys2ant[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
         {0x000160ac, 0xa4646c08, 0xa4646c08, 0x24645808, 0x24645808},
-        {0x00016140, 0x10804008, 0x10804008, 0x90804008, 0x90804008},
-        {0x00016540, 0x10804008, 0x10804008, 0x90804008, 0x90804008},
+        {0x00016140, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
+        {0x00016540, 0x10804008, 0x10804008, 0x50804008, 0x50804008},
 };
 
 static const u32 ar9462_common_wo_xlna_rx_gain_table_2p0[][2] = {
@@ -1059,7 +1059,7 @@ static const u32 ar9462_modes_low_ob_db_tx_gain_table_2p0[][5] = {
 
 static const u32 ar9462_2p0_soc_postamble[][5] = {
         /* Addr      5G_HT20     5G_HT40     2G_HT40     2G_HT20   */
-        {0x00007010, 0x00002233, 0x00002233, 0x00002233, 0x00002233},
+        {0x00007010, 0x00000033, 0x00000033, 0x00000033, 0x00000033},
 };
 
 static const u32 ar9462_2p0_baseband_core[][2] = {
@@ -1257,8 +1257,8 @@ static const u32 ar9462_modes_high_ob_db_tx_gain_table_2p0[][5] = {
         {0x0000a540, 0x48025e6c, 0x48025e6c, 0x38001660, 0x38001660},
         {0x0000a544, 0x4e025e8e, 0x4e025e8e, 0x3b001861, 0x3b001861},
         {0x0000a548, 0x53025eb2, 0x53025eb2, 0x3e001a81, 0x3e001a81},
-        {0x0000a54c, 0x59025eb2, 0x59025eb2, 0x42001a83, 0x42001a83},
-        {0x0000a550, 0x5f025ef6, 0x5f025ef6, 0x44001c84, 0x44001c84},
+        {0x0000a54c, 0x59025eb6, 0x59025eb6, 0x42001a83, 0x42001a83},
+        {0x0000a550, 0x5d025ef6, 0x5d025ef6, 0x44001c84, 0x44001c84},
         {0x0000a554, 0x62025f56, 0x62025f56, 0x48001ce3, 0x48001ce3},
         {0x0000a558, 0x66027f56, 0x66027f56, 0x4c001ce5, 0x4c001ce5},
         {0x0000a55c, 0x6a029f56, 0x6a029f56, 0x50001ce9, 0x50001ce9},
@@ -1850,8 +1850,8 @@ static const u32 ar9462_modes_green_ob_db_tx_gain_table_2p0[][5] = {
         {0x0000a540, 0x48025e6c, 0x48025e6c, 0x38001660, 0x38001660},
         {0x0000a544, 0x4e025e8e, 0x4e025e8e, 0x3b001861, 0x3b001861},
         {0x0000a548, 0x53025eb2, 0x53025eb2, 0x3e001a81, 0x3e001a81},
-        {0x0000a54c, 0x59025eb2, 0x59025eb2, 0x42001a83, 0x42001a83},
-        {0x0000a550, 0x5f025ef6, 0x5f025ef6, 0x44001c84, 0x44001c84},
+        {0x0000a54c, 0x59025eb6, 0x59025eb6, 0x42001a83, 0x42001a83},
+        {0x0000a550, 0x5d025ef6, 0x5d025ef6, 0x44001c84, 0x44001c84},
         {0x0000a554, 0x62025f56, 0x62025f56, 0x48001ce3, 0x48001ce3},
         {0x0000a558, 0x66027f56, 0x66027f56, 0x4c001ce5, 0x4c001ce5},
         {0x0000a55c, 0x6a029f56, 0x6a029f56, 0x50001ce9, 0x50001ce9},
diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 1c269f50822b..93b45b4b3033 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -25,6 +25,7 @@
 
 #include "debug.h"
 #include "common.h"
+#include "mci.h"
 
 /*
  * Header for the ath9k.ko driver core *only* -- hw code nor any other driver
@@ -252,6 +253,7 @@ struct ath_node {
 #ifdef CONFIG_ATH9K_DEBUGFS
         struct list_head list; /* for sc->nodes */
         struct ieee80211_sta *sta; /* station struct we're part of */
+        struct ieee80211_vif *vif; /* interface with which we're associated */
 #endif
         struct ath_atx_tid tid[WME_NUM_TID];
         struct ath_atx_ac ac[WME_NUM_AC];
@@ -443,7 +445,9 @@ struct ath_btcoex {
         u32 btcoex_no_stomp; /* in usec */
         u32 btcoex_period; /* in usec */
         u32 btscan_no_stomp; /* in usec */
+        u32 duty_cycle;
         struct ath_gen_timer *no_stomp_timer; /* Timer for no BT stomping */
+        struct ath_mci_profile mci;
 };
 
 int ath_init_btcoex_timer(struct ath_softc *sc);
diff --git a/drivers/net/wireless/ath/ath9k/debug.c b/drivers/net/wireless/ath/ath9k/debug.c
index 2741203e803f..6fb719d85b37 100644
--- a/drivers/net/wireless/ath/ath9k/debug.c
+++ b/drivers/net/wireless/ath/ath9k/debug.c
@@ -709,24 +709,29 @@ static ssize_t read_file_stations(struct file *file, char __user *user_buf,
 
         len += snprintf(buf + len, size - len,
                         "Stations:\n"
-                        " tid: addr sched paused buf_q-empty an ac\n"
+                        " tid: addr sched paused buf_q-empty an ac baw\n"
                         " ac: addr sched tid_q-empty txq\n");
 
         spin_lock(&sc->nodes_lock);
         list_for_each_entry(an, &sc->nodes, list) {
+                unsigned short ma = an->maxampdu;
+                if (ma == 0)
+                        ma = 65535; /* see ath_lookup_rate */
                 len += snprintf(buf + len, size - len,
-                                "%pM\n", an->sta->addr);
+                                "iface: %pM  sta: %pM max-ampdu: %hu mpdu-density: %uus\n",
+                                an->vif->addr, an->sta->addr, ma,
+                                (unsigned int)(an->mpdudensity));
                 if (len >= size)
                         goto done;
 
                 for (q = 0; q < WME_NUM_TID; q++) {
                         struct ath_atx_tid *tid = &(an->tid[q]);
                         len += snprintf(buf + len, size - len,
-                                        " tid: %p %s %s %i %p %p\n",
+                                        " tid: %p %s %s %i %p %p %hu\n",
                                         tid, tid->sched ? "sched" : "idle",
                                         tid->paused ? "paused" : "running",
                                         skb_queue_empty(&tid->buf_q),
-                                        tid->an, tid->ac);
+                                        tid->an, tid->ac, tid->baw_size);
                         if (len >= size)
                                 goto done;
                 }
diff --git a/drivers/net/wireless/ath/ath9k/eeprom.h b/drivers/net/wireless/ath/ath9k/eeprom.h
index 49abd34be741..5ff7ab965120 100644
--- a/drivers/net/wireless/ath/ath9k/eeprom.h
+++ b/drivers/net/wireless/ath/ath9k/eeprom.h
@@ -249,7 +249,8 @@ enum eeprom_param {
         EEP_ANT_DIV_CTL1,
         EEP_CHAIN_MASK_REDUCE,
         EEP_ANTENNA_GAIN_2G,
-        EEP_ANTENNA_GAIN_5G
+        EEP_ANTENNA_GAIN_5G,
+        EEP_QUICK_DROP
 };
 
 enum ar5416_rates {
diff --git a/drivers/net/wireless/ath/ath9k/gpio.c b/drivers/net/wireless/ath/ath9k/gpio.c
index 655576c8fdab..2c279dcaf4ba 100644
--- a/drivers/net/wireless/ath/ath9k/gpio.c
+++ b/drivers/net/wireless/ath/ath9k/gpio.c
@@ -189,8 +189,8 @@ static void ath_btcoex_period_timer(unsigned long data)
         bool is_btscan;
 
         ath9k_ps_wakeup(sc);
-        ath_detect_bt_priority(sc);
-
+        if (!(ah->caps.hw_caps & ATH9K_HW_CAP_MCI))
+                ath_detect_bt_priority(sc);
         is_btscan = sc->sc_flags & SC_OP_BT_SCAN;
 
         spin_lock_bh(&btcoex->btcoex_lock);
@@ -212,8 +212,9 @@ static void ath_btcoex_period_timer(unsigned long data)
         }
 
         ath9k_ps_restore(sc);
+        timer_period = btcoex->btcoex_period / 1000;
         mod_timer(&btcoex->period_timer, jiffies +
-                                  msecs_to_jiffies(ATH_BTCOEX_DEF_BT_PERIOD));
+                                  msecs_to_jiffies(timer_period));
 }
 
 /*
diff --git a/drivers/net/wireless/ath/ath9k/hw.c b/drivers/net/wireless/ath/ath9k/hw.c
index 2f91acccb7db..662ab7e9a0f0 100644
--- a/drivers/net/wireless/ath/ath9k/hw.c
+++ b/drivers/net/wireless/ath/ath9k/hw.c
@@ -2335,7 +2335,7 @@ int ath9k_hw_fill_cap_info(struct ath_hw *ah)
                         ah->enabled_cals |= TX_IQ_ON_AGC_CAL;
         }
         if (AR_SREV_9462(ah))
-                pCap->hw_caps |= ATH9K_HW_CAP_RTT;
+                pCap->hw_caps |= ATH9K_HW_CAP_RTT | ATH9K_HW_CAP_MCI;
 
         return 0;
 }
@@ -2583,7 +2583,7 @@ void ath9k_hw_set_txpowerlimit(struct ath_hw *ah, u32 limit, bool test)
         struct ath9k_channel *chan = ah->curchan;
         struct ieee80211_channel *channel = chan->chan;
 
-        reg->power_limit = min_t(int, limit, MAX_RATE_POWER);
+        reg->power_limit = min_t(u32, limit, MAX_RATE_POWER);
         if (test)
                 channel->max_power = MAX_RATE_POWER / 2;
 
diff --git a/drivers/net/wireless/ath/ath9k/hw.h b/drivers/net/wireless/ath/ath9k/hw.h
index f389b3c93cf3..33e8f2f9d425 100644
--- a/drivers/net/wireless/ath/ath9k/hw.h
+++ b/drivers/net/wireless/ath/ath9k/hw.h
@@ -203,6 +203,7 @@ enum ath9k_hw_caps {
         ATH9K_HW_CAP_5GHZ                       = BIT(14),
         ATH9K_HW_CAP_APM                        = BIT(15),
         ATH9K_HW_CAP_RTT                        = BIT(16),
+        ATH9K_HW_CAP_MCI                        = BIT(17),
 };
 
 struct ath9k_hw_capabilities {
@@ -419,6 +420,16 @@ enum ath9k_rx_qtype {
         ATH9K_RX_QUEUE_MAX,
 };
 
+enum ath_mci_gpm_coex_profile_type {
+        MCI_GPM_COEX_PROFILE_UNKNOWN,
+        MCI_GPM_COEX_PROFILE_RFCOMM,
+        MCI_GPM_COEX_PROFILE_A2DP,
+        MCI_GPM_COEX_PROFILE_HID,
+        MCI_GPM_COEX_PROFILE_BNEP,
+        MCI_GPM_COEX_PROFILE_VOICE,
+        MCI_GPM_COEX_PROFILE_MAX
+};
+
 struct ath9k_beacon_state {
         u32 bs_nexttbtt;
         u32 bs_nextdtim;
diff --git a/drivers/net/wireless/ath/ath9k/init.c b/drivers/net/wireless/ath/ath9k/init.c
index d4c909f8e474..e046de94836a 100644
--- a/drivers/net/wireless/ath/ath9k/init.c
+++ b/drivers/net/wireless/ath/ath9k/init.c
@@ -424,6 +424,8 @@ static int ath9k_init_btcoex(struct ath_softc *sc)
                 txq = sc->tx.txq_map[WME_AC_BE];
                 ath9k_hw_init_btcoex_hw(sc->sc_ah, txq->axq_qnum);
                 sc->btcoex.bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
+                sc->btcoex.duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE;
+                INIT_LIST_HEAD(&sc->btcoex.mci.info);
                 break;
         default:
                 WARN_ON(1);
@@ -695,6 +697,7 @@ void ath9k_set_hw_capab(struct ath_softc *sc, struct ieee80211_hw *hw)
                 hw->wiphy->flags &= ~WIPHY_FLAG_PS_ON_BY_DEFAULT;
 
         hw->wiphy->flags |= WIPHY_FLAG_IBSS_RSN;
+        hw->wiphy->flags |= WIPHY_FLAG_SUPPORTS_TDLS;
 
         hw->queues = 4;
         hw->max_rates = 4;
diff --git a/drivers/net/wireless/ath/ath9k/main.c b/drivers/net/wireless/ath/ath9k/main.c
index 93fbe6f40898..e43c41cff25b 100644
--- a/drivers/net/wireless/ath/ath9k/main.c
+++ b/drivers/net/wireless/ath/ath9k/main.c
@@ -630,7 +630,8 @@ set_timer:
         }
 }
 
-static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta)
+static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta,
+                            struct ieee80211_vif *vif)
 {
         struct ath_node *an;
         an = (struct ath_node *)sta->drv_priv;
@@ -640,6 +641,7 @@ static void ath_node_attach(struct ath_softc *sc, struct ieee80211_sta *sta)
         list_add(&an->list, &sc->nodes);
         spin_unlock(&sc->nodes_lock);
         an->sta = sta;
+        an->vif = vif;
 #endif
         if (sc->sc_flags & SC_OP_TXAGGR) {
                 ath_tx_node_init(sc, an);
@@ -1133,8 +1135,9 @@ static int ath9k_start(struct ieee80211_hw *hw)
 
         if ((ah->btcoex_hw.scheme != ATH_BTCOEX_CFG_NONE) &&
             !ah->btcoex_hw.enabled) {
-                ath9k_hw_btcoex_set_weight(ah, AR_BT_COEX_WGHT,
-                                           AR_STOMP_LOW_WLAN_WGHT);
+                if (!(sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_MCI))
+                        ath9k_hw_btcoex_set_weight(ah, AR_BT_COEX_WGHT,
+                                                   AR_STOMP_LOW_WLAN_WGHT);
                 ath9k_hw_btcoex_enable(ah);
 
                 if (ah->btcoex_hw.scheme == ATH_BTCOEX_CFG_3WIRE)
@@ -1237,6 +1240,7 @@ static void ath9k_stop(struct ieee80211_hw *hw)
                 ath9k_hw_btcoex_disable(ah);
                 if (ah->btcoex_hw.scheme == ATH_BTCOEX_CFG_3WIRE)
                         ath9k_btcoex_timer_pause(sc);
+                ath_mci_flush_profile(&sc->btcoex.mci);
         }
 
         spin_lock_bh(&sc->sc_pcu_lock);
@@ -1798,7 +1802,7 @@ static int ath9k_sta_add(struct ieee80211_hw *hw,
         struct ath_node *an = (struct ath_node *) sta->drv_priv;
         struct ieee80211_key_conf ps_key = { };
 
-        ath_node_attach(sc, sta);
+        ath_node_attach(sc, sta, vif);
 
         if (vif->type != NL80211_IFTYPE_AP &&
             vif->type != NL80211_IFTYPE_AP_VLAN)
diff --git a/drivers/net/wireless/ath/ath9k/mci.c b/drivers/net/wireless/ath/ath9k/mci.c
new file mode 100644
index 000000000000..0fbb141bc302
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/mci.c
@@ -0,0 +1,254 @@
+/*
+ * Copyright (c) 2010-2011 Atheros Communications Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "ath9k.h"
+#include "mci.h"
+
+u8 ath_mci_duty_cycle[] = { 0, 50, 60, 70, 80, 85, 90, 95, 98 };
+
+static struct ath_mci_profile_info*
+ath_mci_find_profile(struct ath_mci_profile *mci,
+                     struct ath_mci_profile_info *info)
+{
+        struct ath_mci_profile_info *entry;
+
+        list_for_each_entry(entry, &mci->info, list) {
+                if (entry->conn_handle == info->conn_handle)
+                        break;
+        }
+        return entry;
+}
+
+static bool ath_mci_add_profile(struct ath_common *common,
+                                struct ath_mci_profile *mci,
+                                struct ath_mci_profile_info *info)
+{
+        struct ath_mci_profile_info *entry;
+
+        if ((mci->num_sco == ATH_MCI_MAX_SCO_PROFILE) &&
+            (info->type == MCI_GPM_COEX_PROFILE_VOICE)) {
+                ath_dbg(common, ATH_DBG_MCI,
+                        "Too many SCO profile, failed to add new profile\n");
+                return false;
+        }
+
+        if (((NUM_PROF(mci) - mci->num_sco) == ATH_MCI_MAX_ACL_PROFILE) &&
+            (info->type != MCI_GPM_COEX_PROFILE_VOICE)) {
+                ath_dbg(common, ATH_DBG_MCI,
+                        "Too many ACL profile, failed to add new profile\n");
+                return false;
+        }
+
+        entry = ath_mci_find_profile(mci, info);
+
+        if (entry)
+                memcpy(entry, info, 10);
+        else {
+                entry = kzalloc(sizeof(*entry), GFP_KERNEL);
+                if (!entry)
+                        return false;
+
+                memcpy(entry, info, 10);
+                INC_PROF(mci, info);
+                list_add_tail(&info->list, &mci->info);
+        }
+        return true;
+}
+
+static void ath_mci_del_profile(struct ath_common *common,
+                                struct ath_mci_profile *mci,
+                                struct ath_mci_profile_info *info)
+{
+        struct ath_mci_profile_info *entry;
+
+        entry = ath_mci_find_profile(mci, info);
+
+        if (!entry) {
+                ath_dbg(common, ATH_DBG_MCI,
+                        "Profile to be deleted not found\n");
+                return;
+        }
+        DEC_PROF(mci, entry);
+        list_del(&entry->list);
+        kfree(entry);
+}
+
+void ath_mci_flush_profile(struct ath_mci_profile *mci)
+{
+        struct ath_mci_profile_info *info, *tinfo;
+
+        list_for_each_entry_safe(info, tinfo, &mci->info, list) {
+                list_del(&info->list);
+                DEC_PROF(mci, info);
+                kfree(info);
+        }
+        mci->aggr_limit = 0;
+}
+
+static void ath_mci_adjust_aggr_limit(struct ath_btcoex *btcoex)
+{
+        struct ath_mci_profile *mci = &btcoex->mci;
+        u32 wlan_airtime = btcoex->btcoex_period *
+                                (100 - btcoex->duty_cycle) / 100;
+
+        /*
+         * Scale: wlan_airtime is in ms, aggr_limit is in 0.25 ms.
+         * When wlan_airtime is less than 4ms, aggregation limit has to be
+         * adjusted half of wlan_airtime to ensure that the aggregation can fit
+         * without collision with BT traffic.
+         */
+        if ((wlan_airtime <= 4) &&
+            (!mci->aggr_limit || (mci->aggr_limit > (2 * wlan_airtime))))
+                mci->aggr_limit = 2 * wlan_airtime;
+}
+
+static void ath_mci_update_scheme(struct ath_softc *sc)
+{
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+        struct ath_btcoex *btcoex = &sc->btcoex;
+        struct ath_mci_profile *mci = &btcoex->mci;
+        struct ath_mci_profile_info *info;
+        u32 num_profile = NUM_PROF(mci);
+
+        if (num_profile == 1) {
+                info = list_first_entry(&mci->info,
+                                        struct ath_mci_profile_info,
+                                        list);
+                if (mci->num_sco && info->T == 12) {
+                        mci->aggr_limit = 8;
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "Single SCO, aggregation limit 2 ms\n");
+                } else if ((info->type == MCI_GPM_COEX_PROFILE_BNEP) &&
+                           !info->master) {
+                        btcoex->btcoex_period = 60;
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "Single slave PAN/FTP, bt period 60 ms\n");
+                } else if ((info->type == MCI_GPM_COEX_PROFILE_HID) &&
+                         (info->T > 0 && info->T < 50) &&
+                         (info->A > 1 || info->W > 1)) {
+                        btcoex->duty_cycle = 30;
+                        mci->aggr_limit = 8;
+                        ath_dbg(common, ATH_DBG_MCI,
+                                "Multiple attempt/timeout single HID "
+                                "aggregation limit 2 ms dutycycle 30%%\n");
+                }
+        } else if ((num_profile == 2) && (mci->num_hid == 2)) {
+                btcoex->duty_cycle = 30;
+                mci->aggr_limit = 8;
+                ath_dbg(common, ATH_DBG_MCI,
+                        "Two HIDs aggregation limit 2 ms dutycycle 30%%\n");
+        } else if (num_profile > 3) {
+                mci->aggr_limit = 6;
+                ath_dbg(common, ATH_DBG_MCI,
+                        "Three or more profiles aggregation limit 1.5 ms\n");
+        }
+
+        if (IS_CHAN_2GHZ(sc->sc_ah->curchan)) {
+                if (IS_CHAN_HT(sc->sc_ah->curchan))
+                        ath_mci_adjust_aggr_limit(btcoex);
+                else
+                        btcoex->btcoex_period >>= 1;
+        }
+
+        ath9k_hw_btcoex_disable(sc->sc_ah);
+        ath9k_btcoex_timer_pause(sc);
+
+        if (IS_CHAN_5GHZ(sc->sc_ah->curchan))
+                return;
+
+        btcoex->duty_cycle += (mci->num_bdr ? ATH_MCI_MAX_DUTY_CYCLE : 0);
+        if (btcoex->duty_cycle > ATH_MCI_MAX_DUTY_CYCLE)
+                btcoex->duty_cycle = ATH_MCI_MAX_DUTY_CYCLE;
+
+        btcoex->btcoex_period *= 1000;
+        btcoex->btcoex_no_stomp =  btcoex->btcoex_period *
+                                        (100 - btcoex->duty_cycle) / 100;
+
+        ath9k_hw_btcoex_enable(sc->sc_ah);
+        ath9k_btcoex_timer_resume(sc);
+}
+
+void ath_mci_process_profile(struct ath_softc *sc,
+                             struct ath_mci_profile_info *info)
+{
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+        struct ath_btcoex *btcoex = &sc->btcoex;
+        struct ath_mci_profile *mci = &btcoex->mci;
+
+        if (info->start) {
+                if (!ath_mci_add_profile(common, mci, info))
+                        return;
+        } else
+                ath_mci_del_profile(common, mci, info);
+
+        btcoex->btcoex_period = ATH_MCI_DEF_BT_PERIOD;
+        mci->aggr_limit = mci->num_sco ? 6 : 0;
+        if (NUM_PROF(mci)) {
+                btcoex->bt_stomp_type = ATH_BTCOEX_STOMP_LOW;
+                btcoex->duty_cycle = ath_mci_duty_cycle[NUM_PROF(mci)];
+        } else {
+                btcoex->bt_stomp_type = mci->num_mgmt ? ATH_BTCOEX_STOMP_ALL :
+                                                        ATH_BTCOEX_STOMP_LOW;
+                btcoex->duty_cycle = ATH_BTCOEX_DEF_DUTY_CYCLE;
+        }
+
+        ath_mci_update_scheme(sc);
+}
+
+void ath_mci_process_status(struct ath_softc *sc,
+                            struct ath_mci_profile_status *status)
+{
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+        struct ath_btcoex *btcoex = &sc->btcoex;
+        struct ath_mci_profile *mci = &btcoex->mci;
+        struct ath_mci_profile_info info;
+        int i = 0, old_num_mgmt = mci->num_mgmt;
+
+        /* Link status type are not handled */
+        if (status->is_link) {
+                ath_dbg(common, ATH_DBG_MCI,
+                        "Skip link type status update\n");
+                return;
+        }
+
+        memset(&info, 0, sizeof(struct ath_mci_profile_info));
+
+        info.conn_handle = status->conn_handle;
+        if (ath_mci_find_profile(mci, &info)) {
+                ath_dbg(common, ATH_DBG_MCI,
+                        "Skip non link state update for existing profile %d\n",
+                        status->conn_handle);
+                return;
+        }
+        if (status->conn_handle >= ATH_MCI_MAX_PROFILE) {
+                ath_dbg(common, ATH_DBG_MCI,
+                        "Ignore too many non-link update\n");
+                return;
+        }
+        if (status->is_critical)
+                __set_bit(status->conn_handle, mci->status);
+        else
+                __clear_bit(status->conn_handle, mci->status);
+
+        mci->num_mgmt = 0;
+        do {
+                if (test_bit(i, mci->status))
+                        mci->num_mgmt++;
+        } while (++i < ATH_MCI_MAX_PROFILE);
+
+        if (old_num_mgmt != mci->num_mgmt)
+                ath_mci_update_scheme(sc);
+}
diff --git a/drivers/net/wireless/ath/ath9k/mci.h b/drivers/net/wireless/ath/ath9k/mci.h
new file mode 100644
index 000000000000..9590c61822d1
--- /dev/null
+++ b/drivers/net/wireless/ath/ath9k/mci.h
@@ -0,0 +1,118 @@
+/*
+ * Copyright (c) 2010-2011 Atheros Communications Inc.
+ *
+ * Permission to use, copy, modify, and/or distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#ifndef MCI_H
+#define MCI_H
+
+#define ATH_MCI_DEF_BT_PERIOD           40
+#define ATH_MCI_BDR_DUTY_CYCLE          20
+#define ATH_MCI_MAX_DUTY_CYCLE          90
+
+#define ATH_MCI_DEF_AGGR_LIMIT          6 /* in 0.24 ms */
+#define ATH_MCI_MAX_ACL_PROFILE         7
+#define ATH_MCI_MAX_SCO_PROFILE         1
+#define ATH_MCI_MAX_PROFILE             (ATH_MCI_MAX_ACL_PROFILE +\
+                                         ATH_MCI_MAX_SCO_PROFILE)
+
+#define INC_PROF(_mci, _info) do {               \
+                switch (_info->type) {           \
+                case MCI_GPM_COEX_PROFILE_RFCOMM:\
+                        _mci->num_other_acl++;   \
+                        break;                   \
+                case MCI_GPM_COEX_PROFILE_A2DP:  \
+                        _mci->num_a2dp++;        \
+                        if (!_info->edr)         \
+                                _mci->num_bdr++; \
+                        break;                   \
+                case MCI_GPM_COEX_PROFILE_HID:   \
+                        _mci->num_hid++;         \
+                        break;                   \
+                case MCI_GPM_COEX_PROFILE_BNEP:  \
+                        _mci->num_pan++;         \
+                        break;                   \
+                case MCI_GPM_COEX_PROFILE_VOICE: \
+                        _mci->num_sco++;         \
+                        break;                   \
+                default:                         \
+                        break;                   \
+                }                                \
+        } while (0)
+
+#define DEC_PROF(_mci, _info) do {               \
+                switch (_info->type) {           \
+                case MCI_GPM_COEX_PROFILE_RFCOMM:\
+                        _mci->num_other_acl--;   \
+                        break;                   \
+                case MCI_GPM_COEX_PROFILE_A2DP:  \
+                        _mci->num_a2dp--;        \
+                        if (!_info->edr)         \
+                                _mci->num_bdr--; \
+                        break;                   \
+                case MCI_GPM_COEX_PROFILE_HID:   \
+                        _mci->num_hid--;         \
+                        break;                   \
+                case MCI_GPM_COEX_PROFILE_BNEP:  \
+                        _mci->num_pan--;         \
+                        break;                   \
+                case MCI_GPM_COEX_PROFILE_VOICE: \
+                        _mci->num_sco--;         \
+                        break;                   \
+                default:                         \
+                        break;                   \
+                }                                \
+        } while (0)
+
+#define NUM_PROF(_mci)  (_mci->num_other_acl + _mci->num_a2dp + \
+                         _mci->num_hid + _mci->num_pan + _mci->num_sco)
+
+struct ath_mci_profile_info {
+        u8 type;
+        u8 conn_handle;
+        bool start;
+        bool master;
+        bool edr;
+        u8 voice_type;
+        u16 T;          /* Voice: Tvoice, HID: Tsniff,        in slots */
+        u8 W;           /* Voice: Wvoice, HID: Sniff timeout, in slots */
+        u8 A;           /*                HID: Sniff attempt, in slots */
+        struct list_head list;
+};
+
+struct ath_mci_profile_status {
+        bool is_critical;
+        bool is_link;
+        u8 conn_handle;
+};
+
+struct ath_mci_profile {
+        struct list_head info;
+        DECLARE_BITMAP(status, ATH_MCI_MAX_PROFILE);
+        u16 aggr_limit;
+        u8 num_mgmt;
+        u8 num_sco;
+        u8 num_a2dp;
+        u8 num_hid;
+        u8 num_pan;
+        u8 num_other_acl;
+        u8 num_bdr;
+};
+
+void ath_mci_flush_profile(struct ath_mci_profile *mci);
+void ath_mci_process_profile(struct ath_softc *sc,
+                             struct ath_mci_profile_info *info);
+void ath_mci_process_status(struct ath_softc *sc,
+                            struct ath_mci_profile_status *status);
+#endif
diff --git a/drivers/net/wireless/ath/ath9k/xmit.c b/drivers/net/wireless/ath/ath9k/xmit.c
index 03b0a651a591..55d077e7135d 100644
--- a/drivers/net/wireless/ath/ath9k/xmit.c
+++ b/drivers/net/wireless/ath/ath9k/xmit.c
@@ -601,6 +601,7 @@ static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,
         struct sk_buff *skb;
         struct ieee80211_tx_info *tx_info;
         struct ieee80211_tx_rate *rates;
+        struct ath_mci_profile *mci = &sc->btcoex.mci;
         u32 max_4ms_framelen, frmlen;
         u16 aggr_limit, legacy = 0;
         int i;
@@ -645,7 +646,9 @@ static u32 ath_lookup_rate(struct ath_softc *sc, struct ath_buf *bf,
         if (tx_info->flags & IEEE80211_TX_CTL_RATE_CTRL_PROBE || legacy)
                 return 0;
 
-        if (sc->sc_flags & SC_OP_BT_PRIORITY_DETECTED)
+        if ((sc->sc_ah->caps.hw_caps & ATH9K_HW_CAP_MCI) && mci->aggr_limit)
+                aggr_limit = (max_4ms_framelen * mci->aggr_limit) >> 4;
+        else if (sc->sc_flags & SC_OP_BT_PRIORITY_DETECTED)
                 aggr_limit = min((max_4ms_framelen * 3) / 8,
                                  (u32)ATH_AMPDU_LIMIT_MAX);
         else