From: Julien Grall <julien.grall@arm.com>
Date: Wed, 22 Jun 2016 13:21:03 +0000 (+0100)
Subject: xen/arm: traps: Data Abort are always unconditional
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~771
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=950e6bcc335db96003cb360109a82c8b51e2957f;p=xen.git

xen/arm: traps: Data Abort are always unconditional

The HSR encoding for an exception from a data abort does not contain a
conditional code (see G6-4264 in ARM DDI 0487A.i) because they are
always conditional.

So drop the pointless condition check.

Signed-off-by: Julien Grall <julien.grall@arm.com>
Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>
---

diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c
index f7edd23be4..33261222e0 100644
--- a/xen/arch/arm/traps.c
+++ b/xen/arch/arm/traps.c
@@ -2436,12 +2436,6 @@ static void do_trap_data_abort_guest(struct cpu_user_regs *regs,
     int rc;
     mmio_info_t info;
 
-    if ( !check_conditional_instr(regs, hsr) )
-    {
-        advance_pc(regs, hsr);
-        return;
-    }
-
     info.dabt = dabt;
 #ifdef CONFIG_ARM_32
     info.gva = READ_CP32(HDFAR);