cmd: exception: arm64: fix undefined, add faults

The arm64 version of the exception command was just defining the
undefined exception, but actually copied the AArch32 instruction.

Replace that with an encoding that is guaranteed to be and stay
undefined. Also add instructions to trigger unaligned access faults and
a breakpoint.
This brings ARM64 on par with ARM(32) for the exception command.

Signed-off-by: Andre Przywara <andre.przywara@arm.com>

diff --git a/cmd/arm/exception64.c b/cmd/arm/exception64.c
index d5de50a08030dd14e2a70f0bd4d0607c87304187..589a23115b0481f8167fc93c71cc4b5fcb2c6f52 100644 (file)
--- a/cmd/arm/exception64.c
+++ b/cmd/arm/exception64.c
@@ -7,19 +7,73 @@
 
 #include <common.h>
 #include <command.h>
+#include <linux/bitops.h>
 
 static int do_undefined(struct cmd_tbl *cmdtp, int flag, int argc,
                        char *const argv[])
 {
        /*
-        * 0xe7f...f.   is undefined in ARM mode
-        * 0xde..       is undefined in Thumb mode
+        * Instructions starting with the upper 16 bits all 0 are permanently
+        * undefined. The lower 16 bits can be used for some kind of immediate.
+        * --- ARMv8 ARM (ARM DDI 0487G.a C6.2.339: "UDF")
         */
-       asm volatile (".word 0xe7f7defb\n");
+       asm volatile (".word 0x00001234\n");
+
+       return CMD_RET_FAILURE;
+}
+
+/*
+ * The ID_AA64MMFR2_EL1 register name is only know to binutils for ARMv8.2
+ * and later architecture revisions. However the register is valid regardless
+ * of binutils architecture support or the core the code is running on, so
+ * just use the generic encoding.
+ */
+#define ID_AA64MMFR2_EL1 "S3_0_C0_C7_2"
+
+static int do_unaligned(struct cmd_tbl *cmdtp, int flag, int argc,
+                       char *const argv[])
+{
+       uint64_t reg;
+
+       /*
+        * The unaligned LDAR access below is only guaranteed to generate an
+        * alignment fault on cores not implementing FEAT_LSE2. To avoid false
+        * negatives, check this condition before we exectute LDAR.
+        */
+       asm ("mrs %0, "ID_AA64MMFR2_EL1"\n" : "=r" (reg));
+       if (reg & GENMASK(35, 32)) {
+               printf("unaligned access check only supported on pre-v8.4 cores\n");
+               return CMD_RET_FAILURE;
+       }
+
+       /*
+        * The load acquire instruction requires the data source to be
+        * naturally aligned, and will fault even if strict alignment fault
+        * checking is disabled (but only without FEAT_LSE2).
+        * --- ARMv8 ARM (ARM DDI 0487G.a B2.5.2: "Alignment of data accesses")
+        */
+       asm volatile (
+               "mov    x1, sp\n\t"
+               "orr    x1, x1, #3\n\t"
+               "ldar   x0, [x1]\n"
+               ::: "x0", "x1" );
+
+       return CMD_RET_FAILURE;
+}
+
+static int do_breakpoint(struct cmd_tbl *cmdtp, int flag, int argc,
+                        char *const argv[])
+{
+       asm volatile ("brk      #123\n");
+
        return CMD_RET_FAILURE;
 }
 
 static struct cmd_tbl cmd_sub[] = {
+       U_BOOT_CMD_MKENT(breakpoint, CONFIG_SYS_MAXARGS, 1, do_breakpoint,
+                        "", ""),
+       U_BOOT_CMD_MKENT(unaligned, CONFIG_SYS_MAXARGS, 1, do_unaligned,
+                        "", ""),
        U_BOOT_CMD_MKENT(undefined, CONFIG_SYS_MAXARGS, 1, do_undefined,
                         "", ""),
 };
@@ -27,7 +81,9 @@ static struct cmd_tbl cmd_sub[] = {
 static char exception_help_text[] =
        "<ex>\n"
        "  The following exceptions are available:\n"
-       "  undefined  - undefined instruction\n"
+       "  breakpoint - breakpoint instruction exception\n"
+       "  unaligned  - unaligned LDAR data abort\n"
+       "  undefined  - undefined instruction exception\n"
        ;
 
 #include <exception.h>