From fd5c3edc970cc0c9c11e2d71d11e7eb888d5bc1a Mon Sep 17 00:00:00 2001
From: Micah Elizabeth Scott <micah@scanlime.org>
Date: Fri, 11 Oct 2013 11:41:37 -0700
Subject: [PATCH] More ADI fault handling
---
testjig/production/arm_debug.cpp | 56 +++++++++++++++++++++++++++++++
testjig/production/arm_debug.h | 12 +++++--
testjig/production/production.ino | 4 +++
3 files changed, 69 insertions(+), 3 deletions(-)
diff --git a/testjig/production/arm_debug.cpp b/testjig/production/arm_debug.cpp
index 463ad42..293b4fb 100644
--- a/testjig/production/arm_debug.cpp
+++ b/testjig/production/arm_debug.cpp
@@ -253,6 +253,8 @@ bool ARMDebug::dpWrite(unsigned addr, bool APnDP, uint32_t data)
wireWriteIdle();
log(LOG_ERROR, "FAULT response during write (addr=%x APnDP=%d data=%08x)",
addr, APnDP, data);
+ if (!handleFault())
+ log(LOG_ERROR, "Error during fault recovery!");
return false;
default:
@@ -304,6 +306,8 @@ bool ARMDebug::dpRead(unsigned addr, bool APnDP, uint32_t &data)
wireWriteTurnaround();
wireWriteIdle();
log(LOG_ERROR, "FAULT response during read (addr=%x APnDP=%d)", addr, APnDP);
+ if (!handleFault())
+ log(LOG_ERROR, "Error during fault recovery!");
return false;
default:
@@ -318,6 +322,39 @@ bool ARMDebug::dpRead(unsigned addr, bool APnDP, uint32_t &data)
return false;
}
+bool ARMDebug::handleFault()
+{
+ // Read CTRLSTAT to see what the fault was, and set appropriate ABORT bits
+
+ uint32_t ctrlstat;
+ uint32_t abortbits = 0;
+
+ if (!dpRead(CTRLSTAT, false, ctrlstat))
+ return false;
+
+ if (ctrlstat & (1 << 7)) {
+ log(LOG_ERROR, "FAULT: Detected WDATAERR");
+ abortbits |= 1 << 3;
+ }
+ if (ctrlstat & (1 << 5)) {
+ log(LOG_ERROR, "FAULT: Detected STICKYERR");
+ abortbits |= 1 << 2;
+ }
+ if (ctrlstat & (1 << 4)) {
+ log(LOG_ERROR, "FAULT: Detected STICKCMP");
+ abortbits |= 1 << 1;
+ }
+ if (ctrlstat & (1 << 1)) {
+ log(LOG_ERROR, "FAULT: Detected STICKORUN");
+ abortbits |= 1 << 4;
+ }
+
+ if (abortbits && !dpWrite(ABORT, false, abortbits))
+ return false;
+
+ return true;
+}
+
uint8_t ARMDebug::packHeader(unsigned addr, bool APnDP, bool RnW)
{
bool a2 = (addr >> 2) & 1;
@@ -412,3 +449,22 @@ void ARMDebug::log(int level, const char *fmt, ...)
Serial.println(buffer);
}
}
+
+bool ARMDebug::halt()
+{
+ // Write to DHCSR (Debug Halting Control and Status Register)
+ // http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.ddi0337e/CEGCJAHJ.html
+ return memStore(0xE000EDF0, 0xA05F0003);
+}
+
+bool ARMDebug::unhalt()
+{
+ return memStore(0xE000EDF0, 0xA05F0000);
+}
+
+bool ARMDebug::sysReset()
+{
+ // Write to AIRCR (Application Interrupt and Reset Control Register)
+ // http://infocenter.arm.com/help/index.jsp?topic=/com.arm.doc.dui0552a/Cihehdge.html
+ return memStore(0xE000ED0C, 0x05FA0004);
+}
diff --git a/testjig/production/arm_debug.h b/testjig/production/arm_debug.h
index 63ae27c..5a66fd2 100644
--- a/testjig/production/arm_debug.h
+++ b/testjig/production/arm_debug.h
@@ -48,14 +48,17 @@ public:
*/
bool begin(unsigned clockPin, unsigned dataPin, LogLevel logLevel = LOG_NORMAL);
- /// Memory store
+ // Memory operations (AHB bus)
bool memStore(uint32_t addr, uint32_t data);
bool memStore(uint32_t addr, uint32_t *data, unsigned count);
-
- /// Memory load
bool memLoad(uint32_t addr, uint32_t &data);
bool memLoad(uint32_t addr, uint32_t *data, unsigned count);
+ // CPU core operations
+ bool halt();
+ bool unhalt();
+ bool sysReset();
+
private:
uint8_t clockPin, dataPin;
LogLevel logLevel;
@@ -76,6 +79,9 @@ protected:
void wireReadTurnaround();
void wireWriteIdle();
+ // Error diagnostics and recovert
+ bool handleFault();
+
// Packet assembly tools
uint8_t packHeader(unsigned addr, bool APnDP, bool RnW);
bool evenParity(uint32_t word);
diff --git a/testjig/production/production.ino b/testjig/production/production.ino
index 24c5b06..0cd0e61 100644
--- a/testjig/production/production.ino
+++ b/testjig/production/production.ino
@@ -39,6 +39,10 @@ void loop()
if (!target.begin(swclkPin, swdioPin, target.LOG_TRACE_MEM))
return;
+ if (!target.halt())
+ return;
+ if (!target.sysReset())
+ return;
uint32_t data;
if (!target.memLoad(0x00000000, data))
--
GitLab