msm: kgsl: Program SMMU aperture only if tz support
SMMU aperture programming is done by clients as per
the newer tz model. In legacy tz model aperture
programming is handled by tz itself and clients
dont have to do it explicitly.
Before making a scm call make sure to check if tz
support aperture programming by clients.
Change-Id: I72558d4c13b4c8d72d9c7e8721711ffb383e8983
Signed-off-by: Sunil Khatri <sunilkh@codeaurora.org>
diff --git a/drivers/gpu/msm/kgsl_iommu.c b/drivers/gpu/msm/kgsl_iommu.c
index 0338c5fd..f8b45ce 100644
--- a/drivers/gpu/msm/kgsl_iommu.c
+++ b/drivers/gpu/msm/kgsl_iommu.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
+/* Copyright (c) 2011-2018, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@@ -35,6 +35,7 @@
#include "kgsl_pwrctrl.h"
#define CP_APERTURE_REG 0
+#define CP_SMMU_APERTURE_ID 0x1B
#define _IOMMU_PRIV(_mmu) (&((_mmu)->priv.iommu))
@@ -1166,7 +1167,7 @@
desc.args[3] = 0xFFFFFFFF;
desc.arginfo = SCM_ARGS(4);
- return scm_call2(SCM_SIP_FNID(SCM_SVC_MP, 0x1B), &desc);
+ return scm_call2(SCM_SIP_FNID(SCM_SVC_MP, CP_SMMU_APERTURE_ID), &desc);
}
static int _init_global_pt(struct kgsl_mmu *mmu, struct kgsl_pagetable *pt)
@@ -1209,7 +1210,8 @@
goto done;
}
- if (!MMU_FEATURE(mmu, KGSL_MMU_GLOBAL_PAGETABLE)) {
+ if (!MMU_FEATURE(mmu, KGSL_MMU_GLOBAL_PAGETABLE) &&
+ scm_is_call_available(SCM_SVC_MP, CP_SMMU_APERTURE_ID)) {
ret = program_smmu_aperture(cb_num, CP_APERTURE_REG);
if (ret) {
pr_err("SMMU aperture programming call failed with error %d\n",