arm64: Use __tlbi() macros in KVM code

Refactor the KVM code to use the __tlbi macros, which will allow an errata
workaround that repeats tlbi dsb sequences to only change one location.
This is not intended to change the generated assembly and comparing before
and after vmlinux objdump shows no functional changes.

Acked-by: Christoffer Dall <christoffer.dall@linaro.org>
Signed-off-by: Christopher Covington <cov@codeaurora.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>

diff --git a/arch/arm64/kvm/hyp/tlb.c b/arch/arm64/kvm/hyp/tlb.c
index 88e2f2b938f070c7570a8d76ae9ca348b1fd71e9..e8e7ba2bc11f93abde92c6b91782ae776bdbcb73 100644 (file)
--- a/arch/arm64/kvm/hyp/tlb.c
+++ b/arch/arm64/kvm/hyp/tlb.c
@@ -16,6 +16,7 @@
  */
 
 #include <asm/kvm_hyp.h>
+#include <asm/tlbflush.h>
 
 void __hyp_text __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa)
 {
@@ -32,7 +33,7 @@ void __hyp_text __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa)
         * whole of Stage-1. Weep...
         */
        ipa >>= 12;
-       asm volatile("tlbi ipas2e1is, %0" : : "r" (ipa));
+       __tlbi(ipas2e1is, ipa);
 
        /*
         * We have to ensure completion of the invalidation at Stage-2,
@@ -41,7 +42,7 @@ void __hyp_text __kvm_tlb_flush_vmid_ipa(struct kvm *kvm, phys_addr_t ipa)
         * the Stage-1 invalidation happened first.
         */
        dsb(ish);
-       asm volatile("tlbi vmalle1is" : : );
+       __tlbi(vmalle1is);
        dsb(ish);
        isb();
 
@@ -57,7 +58,7 @@ void __hyp_text __kvm_tlb_flush_vmid(struct kvm *kvm)
        write_sysreg(kvm->arch.vttbr, vttbr_el2);
        isb();
 
-       asm volatile("tlbi vmalls12e1is" : : );
+       __tlbi(vmalls12e1is);
        dsb(ish);
        isb();
 
@@ -72,7 +73,7 @@ void __hyp_text __kvm_tlb_flush_local_vmid(struct kvm_vcpu *vcpu)
        write_sysreg(kvm->arch.vttbr, vttbr_el2);
        isb();
 
-       asm volatile("tlbi vmalle1" : : );
+       __tlbi(vmalle1);
        dsb(nsh);
        isb();
 
@@ -82,7 +83,7 @@ void __hyp_text __kvm_tlb_flush_local_vmid(struct kvm_vcpu *vcpu)
 void __hyp_text __kvm_flush_vm_context(void)
 {
        dsb(ishst);
-       asm volatile("tlbi alle1is      \n"
-                    "ic ialluis          ": : );
+       __tlbi(alle1is);
+       asm volatile("ic ialluis" : : );
        dsb(ish);
 }