aarch64: fix error recovery in aarch64_dpm_prepare

Flush DTRRX with a dummy read if it's full, clear sticky errors
by writing CSE bit to EDRCR register.

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

diff --git a/src/target/aarch64.c b/src/target/aarch64.c
index 4097d116066ee6d8a27b570e993f9a9e75b33f14..fcf600d17c8efef54a472ed0ece00639757aa107 100644 (file)
--- a/src/target/aarch64.c
+++ b/src/target/aarch64.c
@@ -360,10 +360,14 @@ static int aarch64_dpm_prepare(struct arm_dpm *dpm)
        if (dscr & DSCR_DTR_RX_FULL) {
                LOG_ERROR("DSCR_DTR_RX_FULL, dscr 0x%08" PRIx32, dscr);
                /* Clear DCCRX */
-               retval = aarch64_exec_opcode(
-                               a8->armv8_common.arm.target,
-                               0xd5130400,
-                               &dscr);
+               retval = mem_ap_read_u32(a8->armv8_common.debug_ap,
+                       a8->armv8_common.debug_base + CPUV8_DBG_DTRRX, &dscr);
+               if (retval != ERROR_OK)
+                       return retval;
+
+               /* Clear sticky error */
+               retval = mem_ap_write_u32(a8->armv8_common.debug_ap,
+                       a8->armv8_common.debug_base + CPUV8_DBG_DRCR, DRCR_CSE);
                if (retval != ERROR_OK)
                        return retval;
        }