summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarcin Juszkiewicz <marcin.juszkiewicz@linaro.org>2023-04-20 21:45:32 +0200
committermergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2023-04-20 20:11:46 +0000
commit9bf79303ae5cb4d0e14ed7a219107b53e2ecdcd0 (patch)
tree90ca5c716debebfff547b8d014e34760d98b82d2
parent67b5dba791d3d93d80d00e979e3ab9b1b8f1f2fb (diff)
downloadedk2-9bf79303ae5cb4d0e14ed7a219107b53e2ecdcd0.tar.gz
edk2-9bf79303ae5cb4d0e14ed7a219107b53e2ecdcd0.tar.bz2
edk2-9bf79303ae5cb4d0e14ed7a219107b53e2ecdcd0.zip
ArmPkg: older assemblers may lack ID_AA64ISAR2_EL1
ArmCpuInfo needs to be able to read ID_AA64ISAR2_EL1 system register. Older toolchains do not know it. Same solution as one for QEMU: https://www.mail-archive.com/qemu-devel@nongnu.org/msg929586.html Signed-off-by: Marcin Juszkiewicz <marcin.juszkiewicz@linaro.org> Reviewed-by: Leif Lindholm <quic_llindhol@quicinc.com>
-rw-r--r--ArmPkg/Include/Chipset/AArch64.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/ArmPkg/Include/Chipset/AArch64.h b/ArmPkg/Include/Chipset/AArch64.h
index bfd2859f51..690433f68e 100644
--- a/ArmPkg/Include/Chipset/AArch64.h
+++ b/ArmPkg/Include/Chipset/AArch64.h
@@ -112,6 +112,10 @@
#define ARM_VECTOR_LOW_A32_FIQ 0x700
#define ARM_VECTOR_LOW_A32_SERR 0x780
+// The ID_AA64ISAR2_EL1 register is not recognized by older
+// assemblers, we need to define it here.
+#define ID_AA64ISAR2_EL1 S3_0_C0_C6_2
+
// The ID_AA64MMFR2_EL1 register was added in ARMv8.2. Since we
// build for ARMv8.0, we need to define the register here.
#define ID_AA64MMFR2_EL1 S3_0_C0_C7_2