From: lorenzo.pieralisi@arm.com (Lorenzo Pieralisi)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH] arm64: cpu hotplug: ensure we mask out CPU_TASKS_FROZEN in notifiers
Date: Mon, 14 Sep 2015 19:08:08 +0100 [thread overview]
Message-ID: <20150914180808.GA12541@red-moon> (raw)
In-Reply-To: <1442249991-13345-1-git-send-email-will.deacon@arm.com>
On Mon, Sep 14, 2015 at 05:59:51PM +0100, Will Deacon wrote:
> We have a couple of CPU hotplug notifiers for resetting the CPU debug
> state to a sane value when a CPU comes online.
>
> This patch ensures that we mask out CPU_TASKS_FROZEN so that we don't
> miss any online events occuring due to suspend/resume.
>
> Signed-off-by: Will Deacon <will.deacon@arm.com>
> ---
> arch/arm64/kernel/debug-monitors.c | 2 +-
> arch/arm64/kernel/hw_breakpoint.c | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
>
> diff --git a/arch/arm64/kernel/debug-monitors.c b/arch/arm64/kernel/debug-monitors.c
> index 9b3b62ac9c24..cebf78661a55 100644
> --- a/arch/arm64/kernel/debug-monitors.c
> +++ b/arch/arm64/kernel/debug-monitors.c
> @@ -134,7 +134,7 @@ static int os_lock_notify(struct notifier_block *self,
> unsigned long action, void *data)
> {
> int cpu = (unsigned long)data;
> - if (action == CPU_ONLINE)
> + if ((action & ~CPU_TASKS_FROZEN) == CPU_ONLINE)
> smp_call_function_single(cpu, clear_os_lock, NULL, 1);
> return NOTIFY_OK;
> }
> diff --git a/arch/arm64/kernel/hw_breakpoint.c b/arch/arm64/kernel/hw_breakpoint.c
> index 565244fd57ff..2926c3dd6479 100644
> --- a/arch/arm64/kernel/hw_breakpoint.c
> +++ b/arch/arm64/kernel/hw_breakpoint.c
> @@ -878,7 +878,7 @@ static int hw_breakpoint_reset_notify(struct notifier_block *self,
> void *hcpu)
> {
> int cpu = (long)hcpu;
> - if (action == CPU_ONLINE)
> + if ((action & ~CPU_TASKS_FROZEN) == CPU_ONLINE)
> smp_call_function_single(cpu, hw_breakpoint_reset, NULL, 1);
> return NOTIFY_OK;
> }
> --
> 2.1.4
>
prev parent reply other threads:[~2015-09-14 18:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-14 16:59 [PATCH] arm64: cpu hotplug: ensure we mask out CPU_TASKS_FROZEN in notifiers Will Deacon
2015-09-14 18:08 ` Lorenzo Pieralisi [this message]
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=20150914180808.GA12541@red-moon \
--to=lorenzo.pieralisi@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).