[PATCH 0/2] KVM: arm64: Cleanup the HCR_xyz macros

[Itaru Kitayama]

On Thu, Oct 15, 2026 at 06:36:03PM +0100, Marc Zyngier wrote:
> I've been postponing this for some time, but it finally happened: no
> more HCR_xyz macros.
> 
> This series converts the whole thing in one go, using the script
> fragment contained in the first patch. No AI agent involved, all bugs
> are mine! I intend to take this in for 7.4-rc1.
> 
> Patches on top of kvmarm-7.4.

I've applied this series on top of kvmarm-7.4 and it builds with my
.config. The kernel boots fine with QEMU in TCG mode, some vgic_*
kselftests ran without failure.

Tested-by: Itaru Kitayama <itaru.kitayama at fujitsu.com>

Thanks,
Itaru.

> 
> Marc Zyngier (2):
>   KVM: arm64: Convert HCR_xyz to HCR_EL2_xyz
>   KVM: arm64: Get rid of compatibility HCR_EL2 aliases
> 
>  arch/arm64/include/asm/el2_setup.h      |   4 +-
>  arch/arm64/include/asm/hardirq.h        |   6 +-
>  arch/arm64/include/asm/kvm_arm.h        |  79 ++--------------
>  arch/arm64/include/asm/kvm_emulate.h    |  18 ++--
>  arch/arm64/include/asm/kvm_mte.h        |   4 +-
>  arch/arm64/include/asm/kvm_ptrauth.h    |   4 +-
>  arch/arm64/kernel/head.S                |   4 +-
>  arch/arm64/kvm/arm.c                    |  28 +++---
>  arch/arm64/kvm/at.c                     |  18 ++--
>  arch/arm64/kvm/emulate-nested.c         | 116 ++++++++++++------------
>  arch/arm64/kvm/guest.c                  |   2 +-
>  arch/arm64/kvm/handle_exit.c            |   2 +-
>  arch/arm64/kvm/hyp/include/hyp/switch.h |  14 +--
>  arch/arm64/kvm/hyp/nvhe/host.S          |   2 +-
>  arch/arm64/kvm/hyp/nvhe/hyp-init.S      |   2 +-
>  arch/arm64/kvm/hyp/nvhe/hyp-main.c      |  20 ++--
>  arch/arm64/kvm/hyp/nvhe/mem_protect.c   |   6 +-
>  arch/arm64/kvm/hyp/nvhe/pkvm.c          |  32 +++----
>  arch/arm64/kvm/hyp/vgic-v3-sr.c         |   4 +-
>  arch/arm64/kvm/hyp/vhe/switch.c         |  12 +--
>  arch/arm64/kvm/hyp/vhe/tlb.c            |   2 +-
>  arch/arm64/kvm/inject_fault.c           |   6 +-
>  arch/arm64/kvm/mmu.c                    |   8 +-
>  arch/arm64/kvm/nested.c                 |   8 +-
>  arch/arm64/kvm/sys_regs.c               |  24 ++---
>  arch/arm64/kvm/vgic/vgic-v3-nested.c    |   4 +-
>  26 files changed, 182 insertions(+), 247 deletions(-)
> 
> -- 
> 2.47.3
>