Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07d3ddfc authored by Govind Singh's avatar Govind Singh
Browse files

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.

Change-Id: Id0d75721bfd31bfbcc146d8251764e4841c22d6c
Signed-off-by: default avatarGovind Singh <govinds@codeaurora.org>
parent ee636941

drivers/net/wireless/ath/ath10k/qmi.c

+9 −0
Original line number Diff line number Diff line
@@ -95,6 +95,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)
@@ -113,6 +116,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]);

}
@@ -945,6 +951,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);

drivers/net/wireless/ath/ath10k/qmi.h

+1 −0
Original line number Diff line number Diff line
@@ -115,6 +115,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,