From ce71010347a06aee2010655c9c4f35eddb0d6c2c Mon Sep 17 00:00:00 2001 From: Suzuki K Poulose Date: Mon, 26 Apr 2021 13:26:14 +0100 Subject: [PATCH] ANDROID: kvm: arm64: Clarify the comment for SPE save context Make the comment in line with the upstream version. Bug: 174685394 Signed-off-by: Suzuki K Poulose Signed-off-by: Qais Yousef Change-Id: I8c239d37c96c0c8de1261df6d2a5a2defd43ccfb --- arch/arm64/kvm/hyp/nvhe/switch.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/arch/arm64/kvm/hyp/nvhe/switch.c b/arch/arm64/kvm/hyp/nvhe/switch.c index 9cc4c9ebfd8f..e9f6ea704d07 100644 --- a/arch/arm64/kvm/hyp/nvhe/switch.c +++ b/arch/arm64/kvm/hyp/nvhe/switch.c @@ -193,12 +193,11 @@ int __kvm_vcpu_run(struct kvm_vcpu *vcpu) __sysreg_save_state_nvhe(host_ctxt); /* - * For nVHE, we must save and disable any SPE - * buffers, as the translation regime is going - * to be loaded with that of the guest. And we must - * save host context for SPE, before we change the - * ownership to EL2 (via MDCR_EL2_E2PB == 0) and before - * we load guest Stage1. + * We must flush and disable the SPE buffer for nVHE, as + * the translation regime(EL1&0) is going to be loaded with + * that of the guest. And we must do this before we change the + * translation regime to EL2 (via MDCR_EL2_E2PB == 0) and + * before we load guest Stage1. */ __debug_save_host_buffers_nvhe(vcpu);