aarch64: fix reading of MPIDR

read MPIDR register through correct MSR instruction.

Change-Id: I7e2d00c2871191c4168b177a7a809443b0db4c82
Signed-off-by: Matthias Welwarsky <matthias.welwarsky@sysgo.com>

diff --git a/src/target/armv8.c b/src/target/armv8.c
index 902d29016b004d4ab0402017212728e1091ae0f5..e516518ad4faf5f8eb23cfe21c13991eb9253845 100644 (file)
--- a/src/target/armv8.c
+++ b/src/target/armv8.c
@@ -33,6 +33,7 @@
 #include <string.h>
 #include <unistd.h>
 
+#include "armv8_opcodes.h"
 #include "arm_opcodes.h"
 #include "target.h"
 #include "target_type.h"
@@ -351,7 +352,7 @@ static int armv8_read_mpidr(struct target *target)
        /* MRC p15,0,<Rd>,c0,c0,5; read Multiprocessor ID register*/
 
        retval = dpm->instr_read_data_r0(dpm,
-                       ARMV4_5_MRC(15, 0, 0, 0, 0, 5),
+                       ARMV8_MRS(SYSTEM_MPIDR, 0),
                        &mpidr);
        if (retval != ERROR_OK)
                goto done;