From: Matthias Welwarsky <matthias.welwarsky@sysgo.com>
Date: Sat, 3 Sep 2016 14:35:59 +0000 (+0200)
Subject: aarch64: fix reading of MPIDR
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=f2a271e2643e8a57881d5db7aceb21fc36140bc2;p=openocd

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 902d2901..e516518a 100644
--- 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;