From: Marc Zyngier <maz@kernel.org>
To: kvmarm@lists.linux.dev, linux-arm-kernel@lists.infradead.org,
kvm@vger.kernel.org
Cc: Steffen Eiden <seiden@linux.ibm.com>,
Joey Gouly <joey.gouly@arm.com>,
Suzuki K Poulose <suzuki.poulose@arm.com>,
Oliver Upton <oupton@kernel.org>,
Zenghui Yu <yuzenghui@huawei.com>,
Fuad Tabba <fuad.tabba@linux.dev>
Subject: [PATCH 2/2] KVM: arm64: Get rid of compatibility HCR_EL2 aliases
Date: Thu, 15 Oct 2026 18:36:05 +0100 [thread overview]
Message-ID: <20261015173605.1072963-3-maz@kernel.org> (raw)
In-Reply-To: <20261015173605.1072963-1-maz@kernel.org>
Now that we dropped out reliance on the old HCR_EL2 aliases, do the
right thing and purge the kernel of the compatibility definitions.
Signed-off-by: Marc Zyngier <maz@kernel.org>
---
arch/arm64/include/asm/kvm_arm.h | 65 --------------------------------
1 file changed, 65 deletions(-)
diff --git a/arch/arm64/include/asm/kvm_arm.h b/arch/arm64/include/asm/kvm_arm.h
index b78e5ce08905b..ae2dafd21cb7c 100644
--- a/arch/arm64/include/asm/kvm_arm.h
+++ b/arch/arm64/include/asm/kvm_arm.h
@@ -14,71 +14,6 @@
#include <asm/esr.h>
#include <asm/sysreg.h>
-/*
- * Because I'm terribly lazy and that repainting the whole of the KVM
- * code with the proper names is a pain, use a helper to map the names
- * inherited from AArch32 with the new fancy nomenclature. One day...
- */
-#define __HCR(x) HCR_EL2_##x
-
-#define HCR_TID5 __HCR(TID5)
-#define HCR_DCT __HCR(DCT)
-#define HCR_ATA_SHIFT __HCR(ATA_SHIFT)
-#define HCR_ATA __HCR(ATA)
-#define HCR_TTLBOS __HCR(TTLBOS)
-#define HCR_TTLBIS __HCR(TTLBIS)
-#define HCR_ENSCXT __HCR(EnSCXT)
-#define HCR_TOCU __HCR(TOCU)
-#define HCR_AMVOFFEN __HCR(AMVOFFEN)
-#define HCR_TICAB __HCR(TICAB)
-#define HCR_TID4 __HCR(TID4)
-#define HCR_FIEN __HCR(FIEN)
-#define HCR_FWB __HCR(FWB)
-#define HCR_NV2 __HCR(NV2)
-#define HCR_AT __HCR(AT)
-#define HCR_NV1 __HCR(NV1)
-#define HCR_NV __HCR(NV)
-#define HCR_API __HCR(API)
-#define HCR_APK __HCR(APK)
-#define HCR_TEA __HCR(TEA)
-#define HCR_TERR __HCR(TERR)
-#define HCR_TLOR __HCR(TLOR)
-#define HCR_E2H __HCR(E2H)
-#define HCR_ID __HCR(ID)
-#define HCR_CD __HCR(CD)
-#define HCR_RW __HCR(RW)
-#define HCR_TRVM __HCR(TRVM)
-#define HCR_HCD __HCR(HCD)
-#define HCR_TDZ __HCR(TDZ)
-#define HCR_TGE __HCR(TGE)
-#define HCR_TVM __HCR(TVM)
-#define HCR_TTLB __HCR(TTLB)
-#define HCR_TPU __HCR(TPU)
-#define HCR_TPC __HCR(TPCP)
-#define HCR_TSW __HCR(TSW)
-#define HCR_TACR __HCR(TACR)
-#define HCR_TIDCP __HCR(TIDCP)
-#define HCR_TSC __HCR(TSC)
-#define HCR_TID3 __HCR(TID3)
-#define HCR_TID2 __HCR(TID2)
-#define HCR_TID1 __HCR(TID1)
-#define HCR_TID0 __HCR(TID0)
-#define HCR_TWE __HCR(TWE)
-#define HCR_TWI __HCR(TWI)
-#define HCR_DC __HCR(DC)
-#define HCR_BSU __HCR(BSU)
-#define HCR_BSU_IS __HCR(BSU_IS)
-#define HCR_FB __HCR(FB)
-#define HCR_VSE __HCR(VSE)
-#define HCR_VI __HCR(VI)
-#define HCR_VF __HCR(VF)
-#define HCR_AMO __HCR(AMO)
-#define HCR_IMO __HCR(IMO)
-#define HCR_FMO __HCR(FMO)
-#define HCR_PTW __HCR(PTW)
-#define HCR_SWIO __HCR(SWIO)
-#define HCR_VM __HCR(VM)
-
/*
* The bits we set in HCR:
* TLOR: Trap LORegion register accesses
--
2.47.3
prev parent reply other threads:[~2026-10-15 17:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-10-15 17:36 [PATCH 0/2] KVM: arm64: Cleanup the HCR_xyz macros Marc Zyngier
2026-10-15 17:36 ` [PATCH 1/2] KVM: arm64: Convert HCR_xyz to HCR_EL2_xyz Marc Zyngier
2026-10-15 17:36 ` Marc Zyngier [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20261015173605.1072963-3-maz@kernel.org \
--to=maz@kernel.org \
--cc=fuad.tabba@linux.dev \
--cc=joey.gouly@arm.com \
--cc=kvm@vger.kernel.org \
--cc=kvmarm@lists.linux.dev \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=oupton@kernel.org \
--cc=seiden@linux.ibm.com \
--cc=suzuki.poulose@arm.com \
--cc=yuzenghui@huawei.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.