ath11k: add support for m3 firmware

PCI devices like QCA6390 have a separate firmware image for the m3
micro-controller. Add support to load the firmware using m3.bin file.

Tested-on: QCA6390 hw2.0 PCI WLAN.HST.1.0.1-01740-QCAHSTSWPLZ_V2_TO_X86-1
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.1.0.1-01238-QCAHKSWPL_SILICONZ-2

Signed-off-by: Govind Singh <govinds@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1597389030-13887-2-git-send-email-kvalo@codeaurora.org

diff --git a/drivers/net/wireless/ath/ath11k/ahb.c b/drivers/net/wireless/ath/ath11k/ahb.c
index f00c4cc76d744d6327baf16279b658fa0554d7d2..746e84c4526ca4ec3c9cac08f9735524c6964b1c 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/ahb.c
+++ b/drivers/net/wireless/ath/ath11k/ahb.c
@@ -27,6 +27,7 @@ MODULE_DEVICE_TABLE(of, ath11k_ahb_of_match);
 
 static const struct ath11k_bus_params ath11k_ahb_bus_params = {
        .mhi_support = false,
+       .m3_fw_support = false,
 };
 
 /* Target firmware's Copy Engine configuration. */

diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h
index 0309b13e38c9837909a543493ad55f703d2b4523..b30abd611f0dbf52eed5200dccc701ccf87ecae8 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/core.h
+++ b/drivers/net/wireless/ath/ath11k/core.h
@@ -582,6 +582,7 @@ struct ath11k_board_data {
 
 struct ath11k_bus_params {
        bool mhi_support;
+       bool m3_fw_support;
 };
 
 /* IPQ8074 HW channel counters frequency value in hertz */

diff --git a/drivers/net/wireless/ath/ath11k/hw.h b/drivers/net/wireless/ath/ath11k/hw.h
index c02fd02839d4991feb9e91b11a1dda4c332436e7..5b443a212c850b8b82095a47f336a5b17b7a0c7a 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/hw.h
+++ b/drivers/net/wireless/ath/ath11k/hw.h
@@ -73,6 +73,7 @@
 #define ATH11K_DEFAULT_BOARD_FILE      "board.bin"
 #define ATH11K_DEFAULT_CAL_FILE                "caldata.bin"
 #define ATH11K_AMSS_FILE               "amss.bin"
+#define ATH11K_M3_FILE                 "m3.bin"
 
 enum ath11k_hw_rate_cck {
        ATH11K_HW_RATE_CCK_LP_11M = 0,

diff --git a/drivers/net/wireless/ath/ath11k/pci.c b/drivers/net/wireless/ath/ath11k/pci.c
index d09faaf747ba722bbe3933b543bb35d77000b51c..802461d1261a6fae629a8c08ba30a9c377bc1406 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/pci.c
+++ b/drivers/net/wireless/ath/ath11k/pci.c
@@ -29,6 +29,7 @@ MODULE_DEVICE_TABLE(pci, ath11k_pci_id_table);
 
 static const struct ath11k_bus_params ath11k_pci_bus_params = {
        .mhi_support = true,
+       .m3_fw_support = true,
 };
 
 static const struct ath11k_msi_config msi_config = {

diff --git a/drivers/net/wireless/ath/ath11k/qmi.c b/drivers/net/wireless/ath/ath11k/qmi.c
index 50812df6527d143121f17f79f076821bd2b77a8a..0d7441e6ff177abc966efc9e2e44ea19547ae1c6 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/qmi.c
+++ b/drivers/net/wireless/ath/ath11k/qmi.c
@@ -1516,11 +1516,17 @@ static int ath11k_qmi_host_cap_send(struct ath11k_base *ab)
        req.bdf_support_valid = 1;
        req.bdf_support = 1;
 
-       req.m3_support_valid = 0;
-       req.m3_support = 0;
-
-       req.m3_cache_support_valid = 0;
-       req.m3_cache_support = 0;
+       if (ab->bus_params.m3_fw_support) {
+               req.m3_support_valid = 1;
+               req.m3_support = 1;
+               req.m3_cache_support_valid = 1;
+               req.m3_cache_support = 1;
+       } else {
+               req.m3_support_valid = 0;
+               req.m3_support = 0;
+               req.m3_cache_support_valid = 0;
+               req.m3_cache_support = 0;
+       }
 
        req.cal_done_valid = 1;
        req.cal_done = ab->qmi.cal_done;
@@ -1908,8 +1914,57 @@ out:
        return ret;
 }
 
+static int ath11k_qmi_m3_load(struct ath11k_base *ab)
+{
+       struct m3_mem_region *m3_mem = &ab->qmi.m3_mem;
+       const struct firmware *fw;
+       char path[100];
+       int ret;
+
+       if (m3_mem->vaddr || m3_mem->size)
+               return 0;
+
+       fw = ath11k_core_firmware_request(ab, ATH11K_M3_FILE);
+       if (IS_ERR(fw)) {
+               ret = PTR_ERR(fw);
+               ath11k_core_create_firmware_path(ab, ATH11K_M3_FILE,
+                                                path, sizeof(path));
+               ath11k_err(ab, "failed to load %s: %d\n", path, ret);
+               return ret;
+       }
+
+       m3_mem->vaddr = dma_alloc_coherent(ab->dev,
+                                          fw->size, &m3_mem->paddr,
+                                          GFP_KERNEL);
+       if (!m3_mem->vaddr) {
+               ath11k_err(ab, "failed to allocate memory for M3 with size %zu\n",
+                          fw->size);
+               release_firmware(fw);
+               return -ENOMEM;
+       }
+
+       memcpy(m3_mem->vaddr, fw->data, fw->size);
+       m3_mem->size = fw->size;
+       release_firmware(fw);
+
+       return 0;
+}
+
+static void ath11k_qmi_m3_free(struct ath11k_base *ab)
+{
+       struct m3_mem_region *m3_mem = &ab->qmi.m3_mem;
+
+       if (!ab->bus_params.m3_fw_support || !m3_mem->vaddr)
+               return;
+
+       dma_free_coherent(ab->dev, m3_mem->size,
+                         m3_mem->vaddr, m3_mem->paddr);
+       m3_mem->vaddr = NULL;
+}
+
 static int ath11k_qmi_wlanfw_m3_info_send(struct ath11k_base *ab)
 {
+       struct m3_mem_region *m3_mem = &ab->qmi.m3_mem;
        struct qmi_wlanfw_m3_info_req_msg_v01 req;
        struct qmi_wlanfw_m3_info_resp_msg_v01 resp;
        struct qmi_txn txn = {};
@@ -1917,8 +1972,20 @@ static int ath11k_qmi_wlanfw_m3_info_send(struct ath11k_base *ab)
 
        memset(&req, 0, sizeof(req));
        memset(&resp, 0, sizeof(resp));
-       req.addr = 0;
-       req.size = 0;
+
+       if (ab->bus_params.m3_fw_support) {
+               ret = ath11k_qmi_m3_load(ab);
+               if (ret) {
+                       ath11k_err(ab, "failed to load m3 firmware: %d", ret);
+                       return ret;
+               }
+
+               req.addr = m3_mem->paddr;
+               req.size = m3_mem->size;
+       } else {
+               req.addr = 0;
+               req.size = 0;
+       }
 
        ret = qmi_txn_init(&ab->qmi.handle, &txn,
                           qmi_wlanfw_m3_info_resp_msg_v01_ei, &resp);
@@ -2424,5 +2491,6 @@ void ath11k_qmi_deinit_service(struct ath11k_base *ab)
        qmi_handle_release(&ab->qmi.handle);
        cancel_work_sync(&ab->qmi.event_work);
        destroy_workqueue(ab->qmi.event_wq);
+       ath11k_qmi_m3_free(ab);
 }
 

diff --git a/drivers/net/wireless/ath/ath11k/qmi.h b/drivers/net/wireless/ath/ath11k/qmi.h
index 3307be5be687130dc6f19a694645a7834a336adf..dd9e498a20565200d11ca8c7399d9e7474ff98e3 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/qmi.h
+++ b/drivers/net/wireless/ath/ath11k/qmi.h
@@ -96,6 +96,12 @@ struct target_info {
        char fw_build_id[ATH11K_QMI_WLANFW_MAX_BUILD_ID_LEN_V01 + 1];
 };
 
+struct m3_mem_region {
+       u32 size;
+       dma_addr_t paddr;
+       void *vaddr;
+};
+
 struct ath11k_qmi {
        struct ath11k_base *ab;
        struct qmi_handle handle;
@@ -110,6 +116,7 @@ struct ath11k_qmi {
        u32 target_mem_mode;
        u8 cal_done;
        struct target_info target;
+       struct m3_mem_region m3_mem;
 };
 
 #define QMI_WLANFW_HOST_CAP_REQ_MSG_V01_MAX_LEN                189