Skip to content

Commit 8d154f2

Browse files
committed
target: don't trigger sticky reset based on PRSR
This seems to happen spuriously even though the CPUs aren't resetting. Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>
1 parent d1a4f90 commit 8d154f2

File tree

1 file changed

+4
-2
lines changed

1 file changed

+4
-2
lines changed

‎src/target/aarch64.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
#include <helper/nvp.h>
2828
#include <helper/time_support.h>
2929
#include "aarch64_system_registers.h"
30+
#include "helper/binarybuffer.h"
3031

3132
enum restart_mode {
3233
RESTART_LAZY,
@@ -207,7 +208,8 @@ static int aarch64_read_prsr(struct target *target, uint32_t *prsr)
207208
if (retval != ERROR_OK)
208209
return retval;
209210

210-
armv8->sticky_reset |= *prsr & PRSR_SR;
211+
/* FIXME: this seems to happen spuriously at least on SDM845/OnePlus 6 and causes havoc! */
212+
// armv8->sticky_reset |= *prsr & PRSR_SR;
211213
return ERROR_OK;
212214
}
213215

@@ -386,7 +388,7 @@ static int aarch64_halt_one(struct target *target, enum halt_mode mode)
386388
int retval = ERROR_OK;
387389
struct armv8_common *armv8 = target_to_armv8(target);
388390

389-
LOG_DEBUG("%s", target_name(target));
391+
// LOG_DEBUG("%s", target_name(target));
390392

391393
/* allow Halting Debug Mode */
392394
retval = aarch64_set_dscr_bits(target, DSCR_HDE, DSCR_HDE);

0 commit comments

Comments
 (0)