From: alex.bennee@linaro.org (Alex Bennée)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH REPOST 1/3] arm64: Use existing defines for mdscr
Date: Wed, 04 Oct 2017 00:28:15 +0100 [thread overview]
Message-ID: <87zi97yfow.fsf@linaro.org> (raw)
In-Reply-To: <1507050352-15909-2-git-send-email-julien.thierry@arm.com>
Julien Thierry <julien.thierry@arm.com> writes:
> Signed-off-by: Julien Thierry <julien.thierry@arm.com>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will.deacon@arm.com>
> Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: Alex Benn?e <alex.bennee@linaro.org>
>
> ---
> arch/arm64/include/asm/assembler.h | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
> index d58a625..00a4526 100644
> --- a/arch/arm64/include/asm/assembler.h
> +++ b/arch/arm64/include/asm/assembler.h
> @@ -30,6 +30,7 @@
> #include <asm/pgtable-hwdef.h>
> #include <asm/ptrace.h>
> #include <asm/thread_info.h>
> +#include <asm/debug-monitors.h>
>
> /*
> * Enable and disable interrupts.
> @@ -65,7 +66,7 @@
> .macro disable_step_tsk, flgs, tmp
> tbz \flgs, #TIF_SINGLESTEP, 9990f
> mrs \tmp, mdscr_el1
> - bic \tmp, \tmp, #1
> + bic \tmp, \tmp, #DBG_MDSCR_SS
> msr mdscr_el1, \tmp
> isb // Synchronise with enable_dbg
> 9990:
> @@ -75,7 +76,7 @@
> tbz \flgs, #TIF_SINGLESTEP, 9990f
> disable_dbg
> mrs \tmp, mdscr_el1
> - orr \tmp, \tmp, #1
> + orr \tmp, \tmp, #DBG_MDSCR_SS
> msr mdscr_el1, \tmp
> 9990:
> .endm
--
Alex Benn?e
next prev parent reply other threads:[~2017-10-03 23:28 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-03 17:05 [PATCH REPOST 0/3] Fix single step for traps Julien Thierry
2017-10-03 17:05 ` [PATCH REPOST 1/3] arm64: Use existing defines for mdscr Julien Thierry
2017-10-03 23:28 ` Alex Bennée [this message]
2017-10-03 23:28 ` Alex Bennée
2017-10-03 17:05 ` [PATCH REPOST 2/3] arm64: Fix single stepping in kernel traps Julien Thierry
2017-10-03 23:45 ` Alex Bennée
2017-10-04 11:12 ` Julien Thierry
2017-10-04 12:01 ` Alex Bennée
2017-10-03 17:05 ` [PATCH REPOST 3/3] arm64: kvm: Fix single step for guest skipped instructions Julien Thierry
2017-10-04 0:16 ` Alex Bennée
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=87zi97yfow.fsf@linaro.org \
--to=alex.bennee@linaro.org \
--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).