From: Marc Zyngier <maz@kernel.org>
Date: Fri, 17 Jan 2025 11:06:50 +0000 (+0000)
Subject: Merge branch kvm-arm64/misc-6.14 into kvmarm-master/next
X-Git-Tag: v6.14-rc1~60^2~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fa5e4043e9b17ddd7339258eed26399c755e7659;p=thirdparty%2Fkernel%2Flinux.git

Merge branch kvm-arm64/misc-6.14 into kvmarm-master/next

* kvm-arm64/misc-6.14:
  : .
  : Misc KVM/arm64 changes for 6.14
  :
  : - Don't expose AArch32 EL0 capability when NV is enabled
  :
  : - Update documentation to reflect the full gamut of kvm-arm.mode
  :   behaviours
  :
  : - Use the hypervisor VA bit width when dumping stacktraces
  :
  : - Decouple the hypervisor stack size from PAGE_SIZE, at least
  :   on the surface...
  :
  : - Make use of str_enabled_disabled() when advertising GICv4.1 support
  :
  : - Explicitly handle BRBE traps as UNDEFINED
  : .
  KVM: arm64: Explicitly handle BRBE traps as UNDEFINED
  KVM: arm64: vgic: Use str_enabled_disabled() in vgic_v3_probe()
  arm64: kvm: Introduce nvhe stack size constants
  KVM: arm64: Fix nVHE stacktrace VA bits mask
  Documentation: Update the behaviour of "kvm-arm.mode"
  KVM: arm64: nv: Advertise the lack of AArch32 EL0 support

Signed-off-by: Marc Zyngier <maz@kernel.org>
---

fa5e4043e9b17ddd7339258eed26399c755e7659
diff --cc arch/arm64/kvm/mmu.c
index 9403524c11c61,8850741243bb5..1f55b0c7b11d9
--- a/arch/arm64/kvm/mmu.c
+++ b/arch/arm64/kvm/mmu.c
@@@ -30,10 -29,10 +30,12 @@@ static unsigned long __ro_after_init hy
  static unsigned long __ro_after_init hyp_idmap_end;
  static phys_addr_t __ro_after_init hyp_idmap_vector;
  
+ u32 __ro_after_init __hyp_va_bits;
+ 
  static unsigned long __ro_after_init io_map_base;
  
 +#define KVM_PGT_FN(fn)		(!is_protected_kvm_enabled() ? fn : p ## fn)
 +
  static phys_addr_t __stage2_range_addr_end(phys_addr_t addr, phys_addr_t end,
  					   phys_addr_t size)
  {