From 52ac2b2f7c2ac246597230e0bfe6af7228f34cd2 Mon Sep 17 00:00:00 2001 From: Richard Henderson Date: Tue, 18 Dec 2018 04:17:07 -0500 Subject: [PATCH] target/arm: Fix HCR_EL2.TGE check in arm_phys_excp_target_el The enable for TGE has already occurred within arm_hcr_el2_amo and friends. Moreover, when E2H is also set, the sense is supposed to be reversed, which has also already occurred within the helpers. Backports commit 619959c3583dad325c36f09ce670e7d091382cae from qemu --- qemu/target/arm/helper.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/qemu/target/arm/helper.c b/qemu/target/arm/helper.c index fc3bb8b2..2320a2ee 100644 --- a/qemu/target/arm/helper.c +++ b/qemu/target/arm/helper.c @@ -5719,9 +5719,6 @@ uint32_t arm_phys_excp_target_el(CPUState *cs, uint32_t excp_idx, break; }; - /* If HCR.TGE is set then HCR is treated as being 1 */ - hcr |= ((env->cp15.hcr_el2 & HCR_TGE) == HCR_TGE); - /* Perform a table-lookup for the target EL given the current state */ target_el = target_el_table[is64][scr][rw][hcr][secure][cur_el];