From: Julien Grall Date: Thu, 4 Aug 2016 17:50:02 +0000 (+0100) Subject: xen/arm: traps: Simplify the switch in do_trap_*_abort_guest X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~615 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=9193c7ac6c8e54b327a5d99fc40f5bde3e262da9;p=xen.git xen/arm: traps: Simplify the switch in do_trap_*_abort_guest The fault status we care are in the form BBBBxx where xx is the lookup level that gave the fault. We can simplify the code by masking the 2 least significant bits. Signed-off-by: Julien Grall Reviewed-by: Stefano Stabellini --- diff --git a/xen/arch/arm/traps.c b/xen/arch/arm/traps.c index 0f78d2121b..b11d2e5766 100644 --- a/xen/arch/arm/traps.c +++ b/xen/arch/arm/traps.c @@ -2387,9 +2387,9 @@ static void do_trap_instr_abort_guest(struct cpu_user_regs *regs, int rc; register_t gva = READ_SYSREG(FAR_EL2); - switch ( hsr.iabt.ifsc & 0x3f ) + switch ( hsr.iabt.ifsc & ~FSC_LL_MASK ) { - case FSC_FLT_PERM ... FSC_FLT_PERM + 3: + case FSC_FLT_PERM: { paddr_t gpa; const struct npfec npfec = { @@ -2450,9 +2450,9 @@ static void do_trap_data_abort_guest(struct cpu_user_regs *regs, return; /* Try again */ } - switch ( dabt.dfsc & 0x3f ) + switch ( dabt.dfsc & ~FSC_LL_MASK ) { - case FSC_FLT_PERM ... FSC_FLT_PERM + 3: + case FSC_FLT_PERM: { const struct npfec npfec = { .read_access = !dabt.write,