commit e42561dbcd9d66d4de22d1b2bf48e124872b815c
author Igor Podgainõi <igor.podgainoi@arm.com> Mon Nov 11 11:22:03 2024 +0100
committer Igor Podgainõi <igor.podgainoi@arm.com> Mon Nov 11 13:00:46 2024 +0100
tree eab01079c905b0f119a826ca02ecb8e65a642647
parent 73d5bbd188aa33ad7ef4c28acbddaf2d8b9433a7

fix: update definitions for sysregs on older toolchains

The patch 0db4a3cd added new sysreg access which older toolchains
do not support. This fix opts to use the renaming variant of the
necessary preprocessor macros for the registers used as part of
that patch, so that TFTF can compile with older toolchains.

Change-Id: I1d4cdfc3f67a085af35a3b51477eda79e9e93db7
Signed-off-by: Igor Podgainõi <igor.podgainoi@arm.com>

include/lib/aarch64/arch_helpers.h

diff --git a/include/lib/aarch64/arch_helpers.h b/include/lib/aarch64/arch_helpers.h
index 5cb28cb..c906181 100644
--- a/include/lib/aarch64/arch_helpers.h
+++ b/include/lib/aarch64/arch_helpers.h
@@ -702,16 +702,16 @@
 DEFINE_RENAME_SYSREG_RW_FUNCS(contextidr_el2, CONTEXTIDR_EL2)
 
 /* Reliability, Availability, Serviceability (RAS) */
-DEFINE_SYSREG_RW_FUNCS(vdisr_el2)
-DEFINE_SYSREG_RW_FUNCS(vsesr_el2)
+DEFINE_RENAME_SYSREG_RW_FUNCS(vdisr_el2, VDISR_EL2)
+DEFINE_RENAME_SYSREG_RW_FUNCS(vsesr_el2, VSESR_EL2)
 
-DEFINE_SYSREG_RW_FUNCS(dbgvcr32_el2)
-DEFINE_SYSREG_RW_FUNCS(hacr_el2)
-DEFINE_SYSREG_RW_FUNCS(hpfar_el2)
-DEFINE_SYSREG_RW_FUNCS(ich_hcr_el2)
-DEFINE_SYSREG_RW_FUNCS(ich_vmcr_el2)
-DEFINE_SYSREG_RW_FUNCS(tpidr_el2)
-DEFINE_SYSREG_RW_FUNCS(vtcr_el2)
+DEFINE_RENAME_SYSREG_RW_FUNCS(dbgvcr32_el2, DBGVCR32_EL2)
+DEFINE_RENAME_SYSREG_RW_FUNCS(hacr_el2, HACR_EL2)
+DEFINE_RENAME_SYSREG_RW_FUNCS(hpfar_el2, HPFAR_EL2)
+DEFINE_RENAME_SYSREG_RW_FUNCS(ich_hcr_el2, ICH_HCR_EL2)
+DEFINE_RENAME_SYSREG_RW_FUNCS(ich_vmcr_el2, ICH_VMCR_EL2)
+DEFINE_RENAME_SYSREG_RW_FUNCS(tpidr_el2, TPIDR_EL2)
+DEFINE_RENAME_SYSREG_RW_FUNCS(vtcr_el2, VTCR_EL2)
 
 static inline u_register_t read_sp(void)
 {