summaryrefslogtreecommitdiff
path: root/arch/arm64
diff options
context:
space:
mode:
authorWill Deacon <will.deacon@arm.com>2013-05-17 17:41:22 +0100
committerCatalin Marinas <catalin.marinas@arm.com>2013-05-17 18:24:19 +0100
commit3126976be64bfb4c87297cb022ca815212079aec (patch)
tree57b76f1074134c968d930e99a3346ebb3484c0d6 /arch/arm64
parent02e3cba685efe61f0c3b10f1622c6a229ac93a61 (diff)
downloadlinux-3.10-3126976be64bfb4c87297cb022ca815212079aec.tar.gz
linux-3.10-3126976be64bfb4c87297cb022ca815212079aec.tar.bz2
linux-3.10-3126976be64bfb4c87297cb022ca815212079aec.zip
arm64: debug: fix mdscr.ss check when enabling debug exceptions
When we take an exception at EL1, we only want to enable debug exceptions if we're not currently stepping, otherwise we can easily get stuck in a loop stepping into interrupt handlers. Unfortunately, the current code tests the wrong bit in the mdscr, so fix that. Signed-off-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/include/asm/assembler.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
index c8eedc60498..5aceb83b3f5 100644
--- a/arch/arm64/include/asm/assembler.h
+++ b/arch/arm64/include/asm/assembler.h
@@ -82,7 +82,7 @@
.macro enable_dbg_if_not_stepping, tmp
mrs \tmp, mdscr_el1
- tbnz \tmp, #1, 9990f
+ tbnz \tmp, #0, 9990f
enable_dbg
9990:
.endm