]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
wifi: ath10k: Store WLAN firmware version in SMEM image table
authorYoughandhar Chintala <quic_youghand@quicinc.com>
Thu, 17 Nov 2022 18:05:34 +0000 (23:35 +0530)
committerKalle Valo <quic_kvalo@quicinc.com>
Fri, 25 Nov 2022 11:12:06 +0000 (13:12 +0200)
In a SoC based solution, it would be useful to know the versions of the
various binary firmware blobs the system is running on. On a QCOM based
SoC, this info can be obtained from socinfo debugfs infrastructure. For
this to work, respective subsystem drivers have to export the firmware
version information to an SMEM based version information table.

Having firmware version information at one place will help quickly
figure out the firmware versions of various subsystems on the device
instead of going through builds/logs in an event of a system crash.

Fill WLAN firmware version information in SMEM version table to be
printed as part of socinfo debugfs infrastructure on a Qualcomm based
SoC.

This change is applicable only for SNOC/QMI based targets.

Example:
cat /sys/kernel/debug/qcom_socinfo/cnss/name
QC_IMAGE_VERSION_STRING=WLAN.HL.3.2.2.c10-00754-QCAHLSWMTPL-1

Tested-on: WCN3990 hw1.0 SNOC WLAN.HL.3.2.2.c10-00754-QCAHLSWMTPL-1

Signed-off-by: Youghandhar Chintala <quic_youghand@quicinc.com>
Signed-off-by: Kalle Valo <quic_kvalo@quicinc.com>
Link: https://lore.kernel.org/r/20221117180534.2267-1-quic_youghand@quicinc.com
drivers/net/wireless/ath/ath10k/Kconfig
drivers/net/wireless/ath/ath10k/qmi.c

index ca007b800f75607eaba3a0b842348e2617f5cf40..e0a51dad8e4200cc64d5174d83f7353721be9307 100644 (file)
@@ -44,6 +44,7 @@ config ATH10K_SNOC
        tristate "Qualcomm ath10k SNOC support"
        depends on ATH10K
        depends on ARCH_QCOM || COMPILE_TEST
+       select QCOM_SMEM
        select QCOM_SCM
        select QCOM_QMI_HELPERS
        help
index 8930a0f4c42f0f048703dfa62c239430c87f92e5..3f94fbf83702ce1c372a39c1030165212efe642f 100644 (file)
@@ -14,6 +14,7 @@
 #include <linux/net.h>
 #include <linux/platform_device.h>
 #include <linux/qcom_scm.h>
+#include <linux/soc/qcom/smem.h>
 #include <linux/string.h>
 #include <net/sock.h>
 
 
 #define ATH10K_QMI_CLIENT_ID           0x4b4e454c
 #define ATH10K_QMI_TIMEOUT             30
+#define SMEM_IMAGE_VERSION_TABLE       469
+#define SMEM_IMAGE_TABLE_CNSS_INDEX     13
+#define SMEM_IMAGE_VERSION_ENTRY_SIZE  128
+#define SMEM_IMAGE_VERSION_NAME_SIZE   75
 
 static int ath10k_qmi_map_msa_permission(struct ath10k_qmi *qmi,
                                         struct ath10k_msa_mem_info *mem_info)
@@ -536,6 +541,33 @@ int ath10k_qmi_wlan_disable(struct ath10k *ar)
        return ath10k_qmi_mode_send_sync_msg(ar, QMI_WLFW_OFF_V01);
 }
 
+static void ath10k_qmi_add_wlan_ver_smem(struct ath10k *ar, const char *fw_build_id)
+{
+       u8 *table_ptr;
+       size_t smem_item_size;
+       const u32 smem_img_idx_wlan = SMEM_IMAGE_TABLE_CNSS_INDEX *
+                                     SMEM_IMAGE_VERSION_ENTRY_SIZE;
+
+       table_ptr = qcom_smem_get(QCOM_SMEM_HOST_ANY,
+                                 SMEM_IMAGE_VERSION_TABLE,
+                                 &smem_item_size);
+
+       if (IS_ERR(table_ptr)) {
+               ath10k_err(ar, "smem image version table not found\n");
+               return;
+       }
+
+       if (smem_img_idx_wlan + SMEM_IMAGE_VERSION_ENTRY_SIZE >
+           smem_item_size) {
+               ath10k_err(ar, "smem block size too small: %zu\n",
+                          smem_item_size);
+               return;
+       }
+
+       strscpy(table_ptr + smem_img_idx_wlan, fw_build_id,
+               SMEM_IMAGE_VERSION_NAME_SIZE);
+}
+
 static int ath10k_qmi_cap_send_sync_msg(struct ath10k_qmi *qmi)
 {
        struct wlfw_cap_resp_msg_v01 *resp;
@@ -606,6 +638,9 @@ static int ath10k_qmi_cap_send_sync_msg(struct ath10k_qmi *qmi)
                            qmi->fw_version, qmi->fw_build_timestamp, qmi->fw_build_id);
        }
 
+       if (resp->fw_build_id_valid)
+               ath10k_qmi_add_wlan_ver_smem(ar, qmi->fw_build_id);
+
        kfree(resp);
        return 0;