| commit | 570f9b701ed942e71ac7f42a4a2c23f2c5350d4b | [log] [tgz] |
|---|---|---|
| author | Andrew Walbran <qwandor@google.com> | Tue Nov 13 17:51:50 2018 +0000 |
| committer | Andrew Walbran <qwandor@google.com> | Tue Nov 13 17:51:50 2018 +0000 |
| tree | a32ca5433f26557c27f12ad95b7e8232b7b27f32 | |
| parent | 83f6132b85524bd6578f5e7fe05d92bf9ab8398a [diff] |
Restore the right values to CPTR_EL2 and CNTHCTL_EL2. Change-Id: I414417e2aa3d09857f0fc0c6d0996e35f292655e
diff --git a/src/arch/aarch64/exceptions.S b/src/arch/aarch64/exceptions.S index 947ad28..ebbc23e 100644 --- a/src/arch/aarch64/exceptions.S +++ b/src/arch/aarch64/exceptions.S
@@ -364,8 +364,8 @@ msr hcr_el2, x23 ldp x24, x25, [x0, #16 * 12] - msr cptr_el2, x22 - msr cnthctl_el2, x23 + msr cptr_el2, x24 + msr cnthctl_el2, x25 ldr x26, [x0, #16 * 13] msr vttbr_el2, x26