From: Julien Grall <jgrall@amazon.com>
Date: Mon, 14 Mar 2022 22:57:54 +0000 (+0000)
Subject: Revert "xen/arm64: io: Handle the abort due to access to stage1 translation table"
X-Git-Tag: archive/raspbian/4.17.0-1+rpi1^2~33^2~831
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=133ba7ae7619290964025b5fedd1ee940a37f374;p=xen.git

Revert "xen/arm64: io: Handle the abort due to access to stage1 translation table"

This reverts commit fef5531fd8f311b347970568d77e7bf4feffd7fb.

This depends on patch 9e5a68a6652cc54ce3cb3b0ce208eeed79d5aeb5 which
will need to be reverted as it break boot on arm32.

https://lore.kernel.org/xen-devel/osstest-168589-mainreport@xen.org/T/#u

Signed-off-by: Julien Grall <jgrall@amazon.com>
---

diff --git a/xen/arch/arm/io.c b/xen/arch/arm/io.c
index 53729a342b..fd903b7b03 100644
--- a/xen/arch/arm/io.c
+++ b/xen/arch/arm/io.c
@@ -128,17 +128,6 @@ void try_decode_instruction(const struct cpu_user_regs *regs,
         return;
     }
 
-    /*
-     * At this point, we know that the stage1 translation table is either in
-     * an emulated MMIO region or its address is invalid. This is not
-     * expected by Xen and thus it forwards the abort to the guest.
-     */
-    if ( info->dabt.s1ptw )
-    {
-        info->dabt_instr.state = INSTR_ERROR;
-        return;
-    }
-
     /*
      * Armv8 processor does not provide a valid syndrome for decoding some
      * instructions. So in order to process these instructions, Xen must