ath11k: search DT for qcom,ath11k-calibration-variant

Board Data File (BDF) is loaded upon driver boot-up procedure. The right
board data file is identified on IPQ6018 using bus, qmi-chip-id and
qmi-board-id.

The problem, however, can occur when the (default) board data file cannot
fulfill with the vendor requirements and it is necessary to use a different
board data file.

This problem was already solved on ath10k by adding a ",variant=.*" at the
end of the board name. The same functionality must also be provided for
ath11k.

The device tree requires an additional string to define the variant name

    wifi@c000000 {
        status = "okay";
        qcom,ath11k-calibration-variant = "Cigtech-WF-188";
    };

This would create the boarddata identifier for the board-2.bin search

 *  bus=ahb,qmi-chip-id=0,qmi-board-id=18,variant=Cigtech-WF-188

Signed-off-by: Sven Eckelmann <sven@narfation.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/20201015131501.1939685-2-sven@narfation.org

diff --git a/drivers/net/wireless/ath/ath11k/core.c b/drivers/net/wireless/ath/ath11k/core.c
index ebd6886..c3af412 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/core.c
+++ b/drivers/net/wireless/ath/ath11k/core.c
@@ -7,6 +7,7 @@
 #include <linux/slab.h>
 #include <linux/remoteproc.h>
 #include <linux/firmware.h>
+#include <linux/of.h>
 #include "core.h"
 #include "dp_tx.h"
 #include "dp_rx.h"
@@ -141,14 +142,44 @@ static const struct ath11k_hw_params ath11k_hw_params[] = {
        },
 };
 
+int ath11k_core_check_dt(struct ath11k_base *ab)
+{
+       size_t max_len = sizeof(ab->qmi.target.bdf_ext);
+       const char *variant = NULL;
+       struct device_node *node;
+
+       node = ab->dev->of_node;
+       if (!node)
+               return -ENOENT;
+
+       of_property_read_string(node, "qcom,ath11k-calibration-variant",
+                               &variant);
+       if (!variant)
+               return -ENODATA;
+
+       if (strscpy(ab->qmi.target.bdf_ext, variant, max_len) < 0)
+               ath11k_dbg(ab, ATH11K_DBG_BOOT,
+                          "bdf variant string is longer than the buffer can accommodate (variant: %s)\n",
+                           variant);
+
+       return 0;
+}
+
 static int ath11k_core_create_board_name(struct ath11k_base *ab, char *name,
                                         size_t name_len)
 {
+       /* strlen(',variant=') + strlen(ab->qmi.target.bdf_ext) */
+       char variant[9 + ATH11K_QMI_BDF_EXT_STR_LENGTH] = { 0 };
+
+       if (ab->qmi.target.bdf_ext[0] != '\0')
+               scnprintf(variant, sizeof(variant), ",variant=%s",
+                         ab->qmi.target.bdf_ext);
+
        scnprintf(name, name_len,
-                 "bus=%s,qmi-chip-id=%d,qmi-board-id=%d",
+                 "bus=%s,qmi-chip-id=%d,qmi-board-id=%d%s",
                  ath11k_bus_str(ab->hif.bus),
                  ab->qmi.target.chip_id,
-                 ab->qmi.target.board_id);
+                 ab->qmi.target.board_id, variant);
 
        ath11k_dbg(ab, ATH11K_DBG_BOOT, "boot using board name '%s'\n", name);
 

diff --git a/drivers/net/wireless/ath/ath11k/core.h b/drivers/net/wireless/ath/ath11k/core.h
index 18b9742..18c961c 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/core.h
+++ b/drivers/net/wireless/ath/ath11k/core.h
@@ -883,6 +883,7 @@ void ath11k_core_free(struct ath11k_base *ath11k);
 int ath11k_core_fetch_bdf(struct ath11k_base *ath11k,
                          struct ath11k_board_data *bd);
 void ath11k_core_free_bdf(struct ath11k_base *ab, struct ath11k_board_data *bd);
+int ath11k_core_check_dt(struct ath11k_base *ath11k);
 
 void ath11k_core_halt(struct ath11k *ar);
 

diff --git a/drivers/net/wireless/ath/ath11k/qmi.c b/drivers/net/wireless/ath/ath11k/qmi.c
index c2b1651..9fb4dea 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/qmi.c
+++ b/drivers/net/wireless/ath/ath11k/qmi.c
@@ -1793,6 +1793,7 @@ static int ath11k_qmi_request_target_cap(struct ath11k_base *ab)
        struct qmi_wlanfw_cap_resp_msg_v01 resp;
        struct qmi_txn txn = {};
        int ret = 0;
+       int r;
 
        memset(&req, 0, sizeof(req));
        memset(&resp, 0, sizeof(resp));
@@ -1858,6 +1859,10 @@ static int ath11k_qmi_request_target_cap(struct ath11k_base *ab)
                    ab->qmi.target.fw_build_timestamp,
                    ab->qmi.target.fw_build_id);
 
+       r = ath11k_core_check_dt(ab);
+       if (r)
+               ath11k_dbg(ab, ATH11K_DBG_QMI, "DT bdf variant name not set.\n");
+
 out:
        return ret;
 }

diff --git a/drivers/net/wireless/ath/ath11k/qmi.h b/drivers/net/wireless/ath/ath11k/qmi.h
index b0a818f..7b170bc 100644 (file)
--- a/drivers/net/wireless/ath/ath11k/qmi.h
+++ b/drivers/net/wireless/ath/ath11k/qmi.h
@@ -24,6 +24,7 @@
 #define ATH11K_QMI_RESP_LEN_MAX                        8192
 #define ATH11K_QMI_WLANFW_MAX_NUM_MEM_SEG_V01  32
 #define ATH11K_QMI_CALDB_SIZE                  0x480000
+#define ATH11K_QMI_BDF_EXT_STR_LENGTH          0x20
 
 #define QMI_WLFW_REQUEST_MEM_IND_V01           0x0035
 #define QMI_WLFW_FW_MEM_READY_IND_V01          0x0037
@@ -101,6 +102,7 @@ struct target_info {
        u32 fw_version;
        char fw_build_timestamp[ATH11K_QMI_WLANFW_MAX_TIMESTAMP_LEN_V01 + 1];
        char fw_build_id[ATH11K_QMI_WLANFW_MAX_BUILD_ID_LEN_V01 + 1];
+       char bdf_ext[ATH11K_QMI_BDF_EXT_STR_LENGTH];
 };
 
 struct m3_mem_region {