ath10k: Use bdf calibration variant for snoc targets

Board Data File (BDF) is loaded upon driver boot-up procedure.
The right board data file is identified using bus 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.

Also using the chip_id for identifying the board data helps
in dealing with different variants of the board data file based
on the RF card. If the chip_id is not programmed, a default value
of 0xff will be used for parsing the board data file.

Add the support to get the variant field from DTSI and
use this information along with the chip_id to load the vendor
specific BDF.

The device tree requires addition strings to define the variant name

    wifi@a000000 {
            status = "okay";
            qcom,ath10k-calibration-variant = "xyz-v2";
    };

    wifi@a800000 {
            status = "okay";
            qcom,ath10k-calibration-variant = "xyz-v1";
    };

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

 *  bus=snoc,qmi-board-id=16,qmi-chip-id=0,variant=xyz-v1
 *  bus=snoc,qmi-board-id=17,qmi-chip-id=0,variant=xyz-v2

Tested-on: WCN3990 hw1.0 SNOC WLAN.HL.3.1-01040-QCAHLSWMTPLZ-1

Signed-off-by: Rakesh Pillai <pillair@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>
Link: https://lore.kernel.org/r/1600157948-2042-1-git-send-email-pillair@codeaurora.org

diff --git a/drivers/net/wireless/ath/ath10k/core.c b/drivers/net/wireless/ath/ath10k/core.c
index 5f4e1219684bafd18c0acfad1a8b0c49222064b8..d73ad60b571c2c41653cf8723f998a010bcebec8 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.c
+++ b/drivers/net/wireless/ath/ath10k/core.c
@@ -1022,7 +1022,7 @@ static int ath10k_core_check_smbios(struct ath10k *ar)
        return 0;
 }
 
-static int ath10k_core_check_dt(struct ath10k *ar)
+int ath10k_core_check_dt(struct ath10k *ar)
 {
        struct device_node *node;
        const char *variant = NULL;
@@ -1043,6 +1043,7 @@ static int ath10k_core_check_dt(struct ath10k *ar)
 
        return 0;
 }
+EXPORT_SYMBOL(ath10k_core_check_dt);
 
 static int ath10k_download_fw(struct ath10k *ar)
 {
@@ -1437,10 +1438,17 @@ static int ath10k_core_create_board_name(struct ath10k *ar, char *name,
        }
 
        if (ar->id.qmi_ids_valid) {
-               scnprintf(name, name_len,
-                         "bus=%s,qmi-board-id=%x",
-                         ath10k_bus_str(ar->hif.bus),
-                         ar->id.qmi_board_id);
+               if (with_variant && ar->id.bdf_ext[0] != '\0')
+                       scnprintf(name, name_len,
+                                 "bus=%s,qmi-board-id=%x,qmi-chip-id=%x%s",
+                                 ath10k_bus_str(ar->hif.bus),
+                                 ar->id.qmi_board_id, ar->id.qmi_chip_id,
+                                 variant);
+               else
+                       scnprintf(name, name_len,
+                                 "bus=%s,qmi-board-id=%x",
+                                 ath10k_bus_str(ar->hif.bus),
+                                 ar->id.qmi_board_id);
                goto out;
        }
 

diff --git a/drivers/net/wireless/ath/ath10k/core.h b/drivers/net/wireless/ath/ath10k/core.h
index 4cf5bd4896bc05b60ca0bfc45331186eae682650..b50ab9e229dc53db0c69605b766c18ec7c7e8dae 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/core.h
+++ b/drivers/net/wireless/ath/ath10k/core.h
@@ -1076,6 +1076,7 @@ struct ath10k {
                bool bmi_ids_valid;
                bool qmi_ids_valid;
                u32 qmi_board_id;
+               u32 qmi_chip_id;
                u8 bmi_board_id;
                u8 bmi_eboard_id;
                u8 bmi_chip_id;
@@ -1315,6 +1316,7 @@ int ath10k_core_register(struct ath10k *ar,
                         const struct ath10k_bus_params *bus_params);
 void ath10k_core_unregister(struct ath10k *ar);
 int ath10k_core_fetch_board_file(struct ath10k *ar, int bd_ie_type);
+int ath10k_core_check_dt(struct ath10k *ar);
 void ath10k_core_free_board_files(struct ath10k *ar);
 
 #endif /* _CORE_H_ */

diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c
index 5468a41e928ef29422766020d0e9c1ebeaaa08c4..ae6b1f402adfe488dd2dfbdd0515ad66a95c22b8 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/qmi.c
+++ b/drivers/net/wireless/ath/ath10k/qmi.c
@@ -576,6 +576,8 @@ static int ath10k_qmi_cap_send_sync_msg(struct ath10k_qmi *qmi)
        if (resp->chip_info_valid) {
                qmi->chip_info.chip_id = resp->chip_info.chip_id;
                qmi->chip_info.chip_family = resp->chip_info.chip_family;
+       } else {
+               qmi->chip_info.chip_id = 0xFF;
        }
 
        if (resp->board_info_valid)
@@ -817,12 +819,18 @@ err_setup_msa:
 static int ath10k_qmi_fetch_board_file(struct ath10k_qmi *qmi)
 {
        struct ath10k *ar = qmi->ar;
+       int ret;
 
        ar->hif.bus = ATH10K_BUS_SNOC;
        ar->id.qmi_ids_valid = true;
        ar->id.qmi_board_id = qmi->board_info.board_id;
+       ar->id.qmi_chip_id = qmi->chip_info.chip_id;
        ar->hw_params.fw.dir = WCN3990_HW_1_0_FW_DIR;
 
+       ret = ath10k_core_check_dt(ar);
+       if (ret)
+               ath10k_dbg(ar, ATH10K_DBG_QMI, "DT bdf variant name not set.\n");
+
        return ath10k_core_fetch_board_file(qmi->ar, ATH10K_BD_IE_BOARD);
 }