Merge "fix(zynqmp): enable A53 workaround(errata 1530924)" into lts-v2.8
diff --git a/Makefile b/Makefile
index c3123b7..df23548 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@
#
VERSION_MAJOR := 2
VERSION_MINOR := 8
-VERSION_PATCH := 0
+VERSION_PATCH := 1
VERSION := ${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}
# Default goal is build all images
diff --git a/docs/change-log.md b/docs/change-log.md
index 1aad6bb..8c3b113 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -3,6 +3,16 @@
This document contains a summary of the new features, changes, fixes and known
issues in each release of Trusted Firmware-A.
+## [lts-2.8.1](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/refs/tags/lts-v2.8.0..refs/tags/lts-v2.8.1) (2023-02-28)
+
+### Resolved issues (since lts-v2.8.0)
+
+- **Libraries**
+
+ - **el3_runtime**
+
+ - Revert "fix(el3_runtime): allow SErrors when executing in EL3" ([51120a499](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/51120a499ee7682ce659e613e197597e9376aae7))
+
## [lts-2.8.0](https://review.trustedfirmware.org/plugins/gitiles/TF-A/trusted-firmware-a/+/refs/tags/v2.8.0..refs/tags/lts-v2.8.0) (2023-02-10)
### Resolved issues (since v2.8)
diff --git a/lib/el3_runtime/aarch64/context.S b/lib/el3_runtime/aarch64/context.S
index 60501f6..b126b9c 100644
--- a/lib/el3_runtime/aarch64/context.S
+++ b/lib/el3_runtime/aarch64/context.S
@@ -788,15 +788,6 @@
#endif /* CTX_INCLUDE_FPREGS */
/*
- * Set SCR_EL3.EA bit to enable SErrors at EL3
- */
- .macro enable_serror_at_el3
- mrs x8, scr_el3
- orr x8, x8, #SCR_EA_BIT
- msr scr_el3, x8
- .endm
-
- /*
* Set the PSTATE bits not set when the exception was taken as
* described in the AArch64.TakeException() pseudocode function
* in ARM DDI 0487F.c page J1-7635 to a default value.
@@ -926,7 +917,6 @@
*/
func prepare_el3_entry
save_gp_pmcr_pauth_regs
- enable_serror_at_el3
/*
* Set the PSTATE bits not described in the Aarch64.TakeException
* pseudocode to their default values.