ath10k: Don't call SCM interface for statically mapped msa region

For some targets ex: QCS404, SCM permissions for MSA region is
statically configured in TrustZone fw. Add SCM call disable option
for such targets to avoid duplicate permissions.

Testing: Tested on WCN3990 HW
Tested FW: WLAN.HL.3.1-01040-QCAHLSWMTPLZ-1

Signed-off-by: Govind Singh <govinds@codeaurora.org>
Signed-off-by: Kalle Valo <kvalo@codeaurora.org>

diff --git a/drivers/net/wireless/ath/ath10k/qmi.c b/drivers/net/wireless/ath/ath10k/qmi.c
index 7b524b614f2253ee9f7d5cffc95a381f5f566ddf..85dce43c5439b6516ba59a7d64d46769522f2f65 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/qmi.c
+++ b/drivers/net/wireless/ath/ath10k/qmi.c
@@ -84,6 +84,9 @@ static int ath10k_qmi_setup_msa_permissions(struct ath10k_qmi *qmi)
        int ret;
        int i;
 
+       if (qmi->msa_fixed_perm)
+               return 0;
+
        for (i = 0; i < qmi->nr_mem_region; i++) {
                ret = ath10k_qmi_map_msa_permission(qmi, &qmi->mem_region[i]);
                if (ret)
@@ -102,6 +105,9 @@ static void ath10k_qmi_remove_msa_permission(struct ath10k_qmi *qmi)
 {
        int i;
 
+       if (qmi->msa_fixed_perm)
+               return;
+
        for (i = 0; i < qmi->nr_mem_region; i++)
                ath10k_qmi_unmap_msa_permission(qmi, &qmi->mem_region[i]);
 }
@@ -1035,6 +1041,9 @@ static int ath10k_qmi_setup_msa_resources(struct ath10k_qmi *qmi, u32 msa_size)
                qmi->msa_mem_size = msa_size;
        }
 
+       if (of_property_read_bool(dev->of_node, "qcom,msa-fixed-perm"))
+               qmi->msa_fixed_perm = true;
+
        ath10k_dbg(ar, ATH10K_DBG_QMI, "msa pa: %pad , msa va: 0x%p\n",
                   &qmi->msa_pa,
                   qmi->msa_va);

diff --git a/drivers/net/wireless/ath/ath10k/qmi.h b/drivers/net/wireless/ath/ath10k/qmi.h
index 40aafb875ed0123a9e527b701b52dded073b1753..dc257375f1613e0f41597b093a7f2f354a18b59e 100644 (file)
--- a/drivers/net/wireless/ath/ath10k/qmi.h
+++ b/drivers/net/wireless/ath/ath10k/qmi.h
@@ -104,6 +104,7 @@ struct ath10k_qmi {
        bool fw_ready;
        char fw_build_timestamp[MAX_TIMESTAMP_LEN + 1];
        struct ath10k_qmi_cal_data cal_data[MAX_NUM_CAL_V01];
+       bool msa_fixed_perm;
 };
 
 int ath10k_qmi_wlan_enable(struct ath10k *ar,