diff options
| author | David Brazdil <dbrazdil@google.com> | 2020-06-25 16:14:09 +0300 |
|---|---|---|
| committer | Marc Zyngier <maz@kernel.org> | 2020-07-05 20:38:01 +0300 |
| commit | 53b671128bd7f9ea41ae1a06106d88eb4cf66623 (patch) | |
| tree | 925bb5d8c5e3255467fbebb93f6537fa1ae14de3 | |
| parent | 7621712918ad4f5e6356193d9058debf657a6254 (diff) | |
| download | linux-53b671128bd7f9ea41ae1a06106d88eb4cf66623.tar.xz | |
KVM: arm64: Use build-time defines in has_vhe()
Build system compiles hyp code with macros specifying if the code belongs
to VHE or nVHE. Use these macros to evaluate has_vhe() at compile time.
Signed-off-by: David Brazdil <dbrazdil@google.com>
Signed-off-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20200625131420.71444-5-dbrazdil@google.com
| -rw-r--r-- | arch/arm64/include/asm/virt.h | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm64/include/asm/virt.h b/arch/arm64/include/asm/virt.h index 5051b388c654..09977acc007d 100644 --- a/arch/arm64/include/asm/virt.h +++ b/arch/arm64/include/asm/virt.h @@ -85,10 +85,17 @@ static inline bool is_kernel_in_hyp_mode(void) static __always_inline bool has_vhe(void) { - if (cpus_have_final_cap(ARM64_HAS_VIRT_HOST_EXTN)) + /* + * The following macros are defined for code specic to VHE/nVHE. + * If has_vhe() is inlined into those compilation units, it can + * be determined statically. Otherwise fall back to caps. + */ + if (__is_defined(__KVM_VHE_HYPERVISOR__)) return true; - - return false; + else if (__is_defined(__KVM_NVHE_HYPERVISOR__)) + return false; + else + return cpus_have_final_cap(ARM64_HAS_VIRT_HOST_EXTN); } #endif /* __ASSEMBLY__ */ |