diff options
| author |   Suzuki K Poulose <suzuki.poulose@arm.com> | 2018-09-26 17:32:51 +0100 |
|---|---|---|
| committer |   Marc Zyngier <marc.zyngier@arm.com> | 2018-10-01 13:50:32 +0100 |
| commit | bc1d7de8c550db2f8fd59458a07fefa863358b8d (patch) | |
| tree | 6c2121ab819bc61fb431f8b08093f827beb9c1dc /arch/arm64/include/asm/kvm_arm.h | |
| parent | vgic: Add support for 52bit guest physical address (diff) | |
| download | linux-dev-bc1d7de8c550db2f8fd59458a07fefa863358b8d.tar.xz linux-dev-bc1d7de8c550db2f8fd59458a07fefa863358b8d.zip | |
kvm: arm64: Add 52bit support for PAR to HPFAR conversoin
Add support for handling 52bit addresses in PAR to HPFAR
conversion. Instead of hardcoding the address limits, we
now use PHYS_MASK_SHIFT.
Cc: Marc Zyngier <marc.zyngier@arm.com>
Cc: Christoffer Dall <cdall@kernel.org>
Reviewed-by: Eric Auger <eric.auger@redhat.com>
Signed-off-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Diffstat (limited to 'arch/arm64/include/asm/kvm_arm.h')
| -rw-r--r-- | arch/arm64/include/asm/kvm_arm.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h index e4240568cc18..f1330284720d 100644 --- a/arch/arm64/include/asm/kvm_arm.h +++ b/arch/arm64/include/asm/kvm_arm.h @@ -311,6 +311,13 @@ /* Hyp Prefetch Fault Address Register (HPFAR/HDFAR) */ #define HPFAR_MASK (~UL(0xf)) +/* + * We have + * PAR [PA_Shift - 1 : 12] = PA [PA_Shift - 1 : 12] + * HPFAR [PA_Shift - 9 : 4] = FIPA [PA_Shift - 1 : 12] + */ +#define PAR_TO_HPFAR(par) \ + (((par) & GENMASK_ULL(PHYS_MASK_SHIFT - 1, 12)) >> 8) #define kvm_arm_exception_type \ {0, "IRQ" }, \ |