3 files changed, 81 insertions, 0 deletions

diff --git a/drivers/net/wireless/ath/ath9k/ath9k.h b/drivers/net/wireless/ath/ath9k/ath9k.h
index 386402c37158..afc156a0a2e3 100644
--- a/drivers/net/wireless/ath/ath9k/ath9k.h
+++ b/drivers/net/wireless/ath/ath9k/ath9k.h
@@ -647,6 +647,7 @@ struct ath_softc {
         struct delayed_work tx_complete_work;
         struct delayed_work hw_pll_work;
         struct ath_btcoex btcoex;
+        struct ath_mci_coex mci_coex;
 
         struct ath_descdma txsdma;
 
diff --git a/drivers/net/wireless/ath/ath9k/mci.c b/drivers/net/wireless/ath/ath9k/mci.c
index 0fbb141bc302..5b246766bde5 100644
--- a/drivers/net/wireless/ath/ath9k/mci.c
+++ b/drivers/net/wireless/ath/ath9k/mci.c
@@ -14,6 +14,9 @@
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  */
 
+#include <linux/dma-mapping.h>
+#include <linux/slab.h>
+
 #include "ath9k.h"
 #include "mci.h"
 
@@ -252,3 +255,78 @@ void ath_mci_process_status(struct ath_softc *sc,
         if (old_num_mgmt != mci->num_mgmt)
                 ath_mci_update_scheme(sc);
 }
+
+
+static int ath_mci_buf_alloc(struct ath_softc *sc, struct ath_mci_buf *buf)
+{
+        int error = 0;
+
+        buf->bf_addr = dma_alloc_coherent(sc->dev, buf->bf_len,
+                                          &buf->bf_paddr, GFP_KERNEL);
+
+        if (buf->bf_addr == NULL) {
+                error = -ENOMEM;
+                goto fail;
+        }
+
+        return 0;
+
+fail:
+        memset(buf, 0, sizeof(*buf));
+        return error;
+}
+
+static void ath_mci_buf_free(struct ath_softc *sc, struct ath_mci_buf *buf)
+{
+        if (buf->bf_addr) {
+                dma_free_coherent(sc->dev, buf->bf_len, buf->bf_addr,
+                                                        buf->bf_paddr);
+                memset(buf, 0, sizeof(*buf));
+        }
+}
+
+int ath_mci_setup(struct ath_softc *sc)
+{
+        struct ath_common *common = ath9k_hw_common(sc->sc_ah);
+        struct ath_mci_coex *mci = &sc->mci_coex;
+        int error = 0;
+
+        mci->sched_buf.bf_len = ATH_MCI_SCHED_BUF_SIZE + ATH_MCI_GPM_BUF_SIZE;
+
+        if (ath_mci_buf_alloc(sc, &mci->sched_buf)) {
+                ath_dbg(common, ATH_DBG_FATAL, "MCI buffer alloc failed\n");
+                error = -ENOMEM;
+                goto fail;
+        }
+
+        mci->sched_buf.bf_len = ATH_MCI_SCHED_BUF_SIZE;
+
+        memset(mci->sched_buf.bf_addr, MCI_GPM_RSVD_PATTERN,
+                                                mci->sched_buf.bf_len);
+
+        mci->gpm_buf.bf_len = ATH_MCI_GPM_BUF_SIZE;
+        mci->gpm_buf.bf_addr = (u8 *)mci->sched_buf.bf_addr +
+                                                        mci->sched_buf.bf_len;
+        mci->gpm_buf.bf_paddr = mci->sched_buf.bf_paddr + mci->sched_buf.bf_len;
+
+        /* initialize the buffer */
+        memset(mci->gpm_buf.bf_addr, MCI_GPM_RSVD_PATTERN, mci->gpm_buf.bf_len);
+
+        ar9003_mci_setup(sc->sc_ah, mci->gpm_buf.bf_paddr,
+                         mci->gpm_buf.bf_addr, (mci->gpm_buf.bf_len >> 4),
+                         mci->sched_buf.bf_paddr);
+fail:
+        return error;
+}
+
+void ath_mci_cleanup(struct ath_softc *sc)
+{
+        struct ath_hw *ah = sc->sc_ah;
+        struct ath_mci_coex *mci = &sc->mci_coex;
+
+        /*
+         * both schedule and gpm buffers will be released
+         */
+        ath_mci_buf_free(sc, &mci->sched_buf);
+        ar9003_mci_cleanup(ah);
+}
diff --git a/drivers/net/wireless/ath/ath9k/mci.h b/drivers/net/wireless/ath/ath9k/mci.h
index 5df0d607e881..4eeb0feafc06 100644
--- a/drivers/net/wireless/ath/ath9k/mci.h
+++ b/drivers/net/wireless/ath/ath9k/mci.h
@@ -132,4 +132,6 @@ 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);
+int ath_mci_setup(struct ath_softc *sc);
+void ath_mci_cleanup(struct ath_softc *sc);
 #endif