summaryrefslogtreecommitdiff
path: root/arch/arm64/kvm
diff options
context:
space:
mode:
authorAlex Marginean <alexandru.marginean@nxp.com>2020-02-20 13:39:44 +0200
committerJason Liu <jason.hui.liu@nxp.com>2020-02-26 04:17:48 +0800
commit1c1b132b4b0752b9300bb6868b07e49d20b67f54 (patch)
tree4acc684f59e9663e715cbc92c088eaa59764aed5 /arch/arm64/kvm
parent42c2753d88dc94476ca82264b55b770bfb61ed0c (diff)
LF-980 arch/arm64: use TKT340553_SW_WORKAROUND only for IMX_SCU_SOC
The patch fixes a linkage issue if IMX is not enabled in config. The definition of TKT340553_SW_WORKAROUND depends on CONFIG_IMX_SCU_SOC, but its usage in arch/arm64 code did not. Signed-off-by: Alex Marginean <alexandru.marginean@nxp.com> Reviewed-by: Horia Geanta <horia.geanta@nxp.com> Tested-by: Leonard Crestez <leonard.crestez@nxp.com> Acked-by: Jason Liu <jason.hui.liu@nxp.com> Acked-by: Dong Aisheng <aisheng.dong@nxp.com> Signed-off-by: Dong Aisheng <aisheng.dong@nxp.com> (cherry picked from commit 272cb97a0343176f098b9a6705b90c121433d920)
Diffstat (limited to 'arch/arm64/kvm')
-rw-r--r--arch/arm64/kvm/hyp/tlb.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm64/kvm/hyp/tlb.c b/arch/arm64/kvm/hyp/tlb.c
index 6a109156681c..d4c852745deb 100644
--- a/arch/arm64/kvm/hyp/tlb.c
+++ b/arch/arm64/kvm/hyp/tlb.c
@@ -16,7 +16,11 @@ struct tlb_inv_context {
u64 sctlr;
};
+#ifdef CONFIG_IMX_SCU_SOC
extern bool TKT340553_SW_WORKAROUND;
+#else
+#define TKT340553_SW_WORKAROUND 0
+#endif
static void __hyp_text __tlb_switch_to_guest_vhe(struct kvm *kvm,
struct tlb_inv_context *cxt)