From 7ac4607385f8490b2a12acaef73f2f31583160f0 Mon Sep 17 00:00:00 2001
From: Jordi Vaquero <jordi.vaquero@metempsy.com>
Date: Mon, 13 Jan 2020 10:47:55 +0100
Subject: [PATCH] arch-arm: Fix EL2 target exception level for SP alignment
 fault.

This commit fixes the target exception Level EL2 for alignmemt fault, it
is based on HCR_EL2.tge bit.

Change-Id: Ief78b2aa0c86f1c3d9a5d3ca00121d163a9d6a86
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/24303
Reviewed-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Maintainer: Giacomo Travaglini <giacomo.travaglini@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---
 src/arch/arm/faults.cc | 8 ++++++++
 src/arch/arm/faults.hh | 1 +
 2 files changed, 9 insertions(+)

diff --git a/src/arch/arm/faults.cc b/src/arch/arm/faults.cc
index 5a7b8e8ea..bd38fdccb 100644
--- a/src/arch/arm/faults.cc
+++ b/src/arch/arm/faults.cc
@@ -1541,6 +1541,14 @@ PCAlignmentFault::routeToHyp(ThreadContext *tc) const
 SPAlignmentFault::SPAlignmentFault()
 {}
 
+bool
+SPAlignmentFault::routeToHyp(ThreadContext *tc) const
+{
+    assert(from64);
+    HCR hcr  = tc->readMiscRegNoEffect(MISCREG_HCR_EL2);
+    return EL2Enabled(tc) && hcr.tge==1;
+}
+
 SystemError::SystemError()
 {}
 
diff --git a/src/arch/arm/faults.hh b/src/arch/arm/faults.hh
index 3f61bc722..508fd034e 100644
--- a/src/arch/arm/faults.hh
+++ b/src/arch/arm/faults.hh
@@ -571,6 +571,7 @@ class SPAlignmentFault : public ArmFaultVals<SPAlignmentFault>
 {
   public:
     SPAlignmentFault();
+    bool routeToHyp(ThreadContext *tc) const override;
 };
 
 /// System error (AArch64 only)
-- 
2.30.2