xen/arm: traps: Data Abort are always unconditional
authorJulien Grall <julien.grall@arm.com>
Wed, 22 Jun 2016 13:21:03 +0000 (14:21 +0100)
committerStefano Stabellini <sstabellini@kernel.org>
Thu, 14 Jul 2016 11:13:14 +0000 (12:13 +0100)
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>
xen/arch/arm/traps.c

index f7edd23be49a9e392b8fc5bfe2725197a949ce80..33261222e0b521d3d31580e97b4b6d7dc44eff8b 100644 (file)
@@ -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);