From: Dave.Martin@arm.com (Dave Martin)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v3 3/9] arm64/debug: Eliminate magic number from ESR template definition
Date: Fri, 24 Jul 2015 16:37:43 +0100 [thread overview]
Message-ID: <1437752284-14847-4-git-send-email-Dave.Martin@arm.com> (raw)
In-Reply-To: <1437752284-14847-1-git-send-email-Dave.Martin@arm.com>
<asm/esr.h> has perfectly good constants for defining ESR values
already. Let's use them.
Signed-off-by: Dave Martin <Dave.Martin@arm.com>
Acked-by: Mark Rutland <mark.rutland@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
---
arch/arm64/include/asm/debug-monitors.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/arch/arm64/include/asm/debug-monitors.h b/arch/arm64/include/asm/debug-monitors.h
index ab7d5a8..ff09058 100644
--- a/arch/arm64/include/asm/debug-monitors.h
+++ b/arch/arm64/include/asm/debug-monitors.h
@@ -18,6 +18,7 @@
#ifdef __KERNEL__
+#include <asm/esr.h>
#include <asm/insn.h>
/* Low-level stepping controls. */
@@ -45,7 +46,8 @@
/*
* ESR values expected for dynamic and compile time BRK instruction
*/
-#define DBG_ESR_VAL_BRK(x) (0xf2000000 | ((x) & 0xffff))
+#define DBG_ESR_VAL_BRK(x) \
+ ((ESR_ELx_EC_BRK64 << ESR_ELx_EC_SHIFT) | ESR_ELx_IL | ((x) & 0xffff))
/*
* #imm16 values used for BRK instruction generation
--
1.7.10.4
next prev parent reply other threads:[~2015-07-24 15:37 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-24 15:37 [PATCH v3 0/9] arm64: Use BRK instruction for generic BUG traps Dave Martin
2015-07-24 15:37 ` [PATCH v3 1/9] arm64/debug: Eliminate magic number for size of BRK instruction Dave Martin
2015-07-24 15:37 ` [PATCH v3 2/9] arm64/debug: Mask off all reserved bits from generated ESR values Dave Martin
2015-07-24 15:37 ` Dave Martin [this message]
2015-07-24 15:37 ` [PATCH v3 4/9] arm64/debug: More consistent naming for the BRK ESR template macro Dave Martin
2015-07-24 15:37 ` [PATCH v3 5/9] arm64/debug: Move BRK ESR template macro into <asm/esr.h> Dave Martin
2015-07-24 15:37 ` [PATCH v3 6/9] arm64/debug: Simplify BRK insn opcode declarations Dave Martin
2015-07-24 15:37 ` [PATCH v3 7/9] arm64/debug: Add missing #includes Dave Martin
2015-07-24 15:37 ` [PATCH v3 8/9] arm64/BUG: Use BRK instruction for generic BUG traps Dave Martin
2015-07-24 15:37 ` [PATCH v3 9/9] arm64/BUG: Show explicit backtrace for WARNs Dave Martin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1437752284-14847-4-git-send-email-Dave.Martin@arm.com \
--to=dave.martin@arm.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).