ath11k: allocate smaller chunks of memory for firmware

On x86 it's sometimes difficult to allocate a large contigous DMA
memory, so instead allocate blocks of small chunk memory.

In ath11k_qmi_msg_mem_request_cb() the error handling was cleaned up to avoid
an unused variable warning. Also changed the test from (ret < 0) to just (ret)
as the functions don't return any positive values.

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: Carl Huang <cjhuang@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1597389030-13887-8-git-send-email-kvalo@codeaurora.org

diff --git a/drivers/net/wireless/ath/ath11k/qmi.c b/drivers/net/wireless/ath/ath11k/qmi.c
index acf7a3f2fe7798af709bda1e4ac7537fa0a044cd..b386ab4bd8069f43831ea8060b42a587eca01b1c 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/qmi.c
+++ b/drivers/net/wireless/ath/ath11k/qmi.c
@@ -1640,19 +1640,30 @@ static int ath11k_qmi_respond_fw_mem_request(struct ath11k_base *ab)
 
        memset(&resp, 0, sizeof(resp));
 
-       req->mem_seg_len = ab->qmi.mem_seg_count;
+       /* For QCA6390 by default FW requests a block of ~4M contiguous
+        * DMA memory, it's hard to allocate from OS. So host returns
+        * failure to FW and FW will then request mulitple blocks of small
+        * chunk size memory.
+        */
+       if (!ab->bus_params.fixed_mem_region && ab->qmi.mem_seg_count <= 2) {
+               ath11k_dbg(ab, ATH11K_DBG_QMI, "qmi delays mem_request %d\n",
+                          ab->qmi.mem_seg_count);
+               memset(req, 0, sizeof(*req));
+       } else {
+               req->mem_seg_len = ab->qmi.mem_seg_count;
+
+               for (i = 0; i < req->mem_seg_len ; i++) {
+                       req->mem_seg[i].addr = ab->qmi.target_mem[i].paddr;
+                       req->mem_seg[i].size = ab->qmi.target_mem[i].size;
+                       req->mem_seg[i].type = ab->qmi.target_mem[i].type;
+               }
+       }
 
        ret = qmi_txn_init(&ab->qmi.handle, &txn,
                           qmi_wlanfw_respond_mem_resp_msg_v01_ei, &resp);
        if (ret < 0)
                goto out;
 
-       for (i = 0; i < req->mem_seg_len ; i++) {
-               req->mem_seg[i].addr = ab->qmi.target_mem[i].paddr;
-               req->mem_seg[i].size = ab->qmi.target_mem[i].size;
-               req->mem_seg[i].type = ab->qmi.target_mem[i].type;
-       }
-
        ret = qmi_send_request(&ab->qmi.handle, NULL, &txn,
                               QMI_WLANFW_RESPOND_MEM_REQ_V01,
                               QMI_WLANFW_RESPOND_MEM_REQ_MSG_V01_MAX_LEN,
@@ -2411,13 +2422,20 @@ static void ath11k_qmi_msg_mem_request_cb(struct qmi_handle *qmi_hdl,
                           msg->mem_seg[i].type, msg->mem_seg[i].size);
        }
 
-       if (ab->bus_params.fixed_mem_region)
+       if (ab->bus_params.fixed_mem_region) {
                ret = ath11k_qmi_assign_target_mem_chunk(ab);
-       else
+               if (ret) {
+                       ath11k_warn(ab, "qmi failed to assign target memory: %d\n",
+                                   ret);
+                       return;
+               }
+       } else if (msg->mem_seg_len > 2) {
                ret = ath11k_qmi_alloc_target_mem_chunk(ab);
-       if (ret < 0) {
-               ath11k_warn(ab, "qmi failed to alloc target memory:%d\n", ret);
-               return;
+               if (ret) {
+                       ath11k_warn(ab, "qmi failed to alloc target memory: %d\n",
+                                   ret);
+                       return;
+               }
        }
 
        ath11k_qmi_driver_event_post(qmi, ATH11K_QMI_EVENT_REQUEST_MEM, NULL);