From: Qais Yousef <qais.yousef@arm.com>
To: Thomas Gleixner <tglx@linutronix.de>
Cc: "Paul E . McKenney" <paulmck@kernel.org>,
Qais Yousef <qais.yousef@arm.com>,
Catalin Marinas <catalin.marinas@arm.com>,
Will Deacon <will@kernel.org>,
Steve Capper <steve.capper@arm.com>,
Richard Fontana <rfontana@redhat.com>,
James Morse <james.morse@arm.com>,
Mark Rutland <mark.rutland@arm.com>,
Josh Poimboeuf <jpoimboe@redhat.com>,
Ingo Molnar <mingo@kernel.org>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Nicholas Piggin <npiggin@gmail.com>,
Daniel Lezcano <daniel.lezcano@linaro.org>,
Jiri Kosina <jkosina@suse.cz>,
Pavankumar Kondeti <pkondeti@codeaurora.org>,
Zhenzhong Duan <zhenzhong.duan@oracle.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v3 06/15] arm64: hibernate.c: Create a new function to handle cpu_up(sleep_cpu)
Date: Sun, 23 Feb 2020 19:29:33 +0000 [thread overview]
Message-ID: <20200223192942.18420-7-qais.yousef@arm.com> (raw)
In-Reply-To: <20200223192942.18420-1-qais.yousef@arm.com>
In preparation to make cpu_up/down private - move the user in arm64
hibernate.c to use a new generic function that provides what arm64
needs.
Signed-off-by: Qais Yousef <qais.yousef@arm.com>
CC: Catalin Marinas <catalin.marinas@arm.com>
CC: Will Deacon <will@kernel.org>
CC: Steve Capper <steve.capper@arm.com>
CC: Richard Fontana <rfontana@redhat.com>
CC: James Morse <james.morse@arm.com>
CC: Mark Rutland <mark.rutland@arm.com>
CC: Thomas Gleixner <tglx@linutronix.de>
CC: Josh Poimboeuf <jpoimboe@redhat.com>
CC: Ingo Molnar <mingo@kernel.org>
CC: "Peter Zijlstra (Intel)" <peterz@infradead.org>
CC: Nicholas Piggin <npiggin@gmail.com>
CC: Daniel Lezcano <daniel.lezcano@linaro.org>
CC: Jiri Kosina <jkosina@suse.cz>
CC: Pavankumar Kondeti <pkondeti@codeaurora.org>
CC: Zhenzhong Duan <zhenzhong.duan@oracle.com>
CC: linux-arm-kernel@lists.infradead.org
CC: linux-kernel@vger.kernel.org
---
arch/arm64/kernel/hibernate.c | 13 +++++--------
include/linux/cpu.h | 1 +
kernel/cpu.c | 24 ++++++++++++++++++++++++
3 files changed, 30 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/kernel/hibernate.c b/arch/arm64/kernel/hibernate.c
index 590963c9c609..5b73e92c99e3 100644
--- a/arch/arm64/kernel/hibernate.c
+++ b/arch/arm64/kernel/hibernate.c
@@ -166,14 +166,11 @@ int arch_hibernation_header_restore(void *addr)
sleep_cpu = -EINVAL;
return -EINVAL;
}
- if (!cpu_online(sleep_cpu)) {
- pr_info("Hibernated on a CPU that is offline! Bringing CPU up.\n");
- ret = cpu_up(sleep_cpu);
- if (ret) {
- pr_err("Failed to bring hibernate-CPU up!\n");
- sleep_cpu = -EINVAL;
- return ret;
- }
+
+ ret = bringup_hibernate_cpu(sleep_cpu);
+ if (ret) {
+ sleep_cpu = -EINVAL;
+ return ret;
}
resume_hdr = *hdr;
diff --git a/include/linux/cpu.h b/include/linux/cpu.h
index 64a246e9c8db..aebe8186cb07 100644
--- a/include/linux/cpu.h
+++ b/include/linux/cpu.h
@@ -93,6 +93,7 @@ int add_cpu(unsigned int cpu);
void notify_cpu_starting(unsigned int cpu);
extern void cpu_maps_update_begin(void);
extern void cpu_maps_update_done(void);
+extern int bringup_hibernate_cpu(unsigned int sleep_cpu);
#else /* CONFIG_SMP */
#define cpuhp_tasks_frozen 0
diff --git a/kernel/cpu.c b/kernel/cpu.c
index 03c727195b65..bf39c5bfb6d9 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -1275,6 +1275,30 @@ int add_cpu(unsigned int cpu)
}
EXPORT_SYMBOL_GPL(add_cpu);
+/**
+ * bringup_hibernate_cpu - Bring up the CPU that we hibernated on
+ * @sleep_cpu: The cpu we hibernated on and should be brought up.
+ *
+ * On some archs like arm64, we can hibernate on any CPU, but on wake up the
+ * CPU we hibernated on might be offline as a side effect of using maxcpus= for
+ * example.
+ */
+int bringup_hibernate_cpu(unsigned int sleep_cpu)
+{
+ int ret;
+
+ if (!cpu_online(sleep_cpu)) {
+ pr_info("Hibernated on a CPU that is offline! Bringing CPU up.\n");
+ ret = cpu_up(sleep_cpu);
+ if (ret) {
+ pr_err("Failed to bring hibernate-CPU up!\n");
+ return ret;
+ }
+ }
+
+ return 0;
+}
+
#ifdef CONFIG_PM_SLEEP_SMP
static cpumask_var_t frozen_cpus;
--
2.17.1
next prev parent reply other threads:[~2020-02-23 19:30 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200223192942.18420-1-qais.yousef@arm.com>
2020-02-23 19:29 ` [PATCH v3 01/15] cpu: Add new {add,remove}_cpu() functions Qais Yousef
2020-02-23 19:29 ` [PATCH v3 02/15] smp: Create a new function to shutdown nonboot cpus Qais Yousef
2020-02-23 19:29 ` [PATCH v3 03/15] ia64: Replace cpu_down with smp_shutdown_nonboot_cpus() Qais Yousef
2020-02-23 19:29 ` [PATCH v3 04/15] arm: Don't use disable_nonboot_cpus() Qais Yousef
2020-03-20 11:04 ` Qais Yousef
2020-03-20 13:07 ` Russell King - ARM Linux admin
2020-03-20 13:41 ` Qais Yousef
2020-02-23 19:29 ` [PATCH v3 05/15] arm64: " Qais Yousef
2020-03-17 11:21 ` Catalin Marinas
2020-03-20 14:07 ` Qais Yousef
2020-02-23 19:29 ` Qais Yousef [this message]
2020-03-17 11:21 ` [PATCH v3 06/15] arm64: hibernate.c: Create a new function to handle cpu_up(sleep_cpu) Catalin Marinas
2020-02-23 19:29 ` [PATCH v3 07/15] x86: Replace cpu_up/down with add/remove_cpu Qais Yousef
2020-02-23 19:29 ` [PATCH v3 08/15] powerpc: " Qais Yousef
2020-02-23 19:29 ` [PATCH v3 09/15] sparc: " Qais Yousef
2020-02-23 19:29 ` [PATCH v3 10/15] parisc: " Qais Yousef
2020-02-23 19:29 ` [PATCH v3 11/15] driver: xen: Replace cpu_up/down with device_online/offline Qais Yousef
2020-02-23 19:29 ` [PATCH v3 12/15] firmware: psci: Replace cpu_up/down with add/remove_cpu Qais Yousef
2020-02-23 19:29 ` [PATCH v3 13/15] torture: " Qais Yousef
2020-02-24 2:53 ` Paul E. McKenney
2020-02-23 19:29 ` [PATCH v3 14/15] smp: Create a new function to bringup nonboot cpus online Qais Yousef
2020-02-23 19:29 ` [PATCH v3 15/15] cpu: Hide cpu_up/down Qais Yousef
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=20200223192942.18420-7-qais.yousef@arm.com \
--to=qais.yousef@arm.com \
--cc=catalin.marinas@arm.com \
--cc=daniel.lezcano@linaro.org \
--cc=james.morse@arm.com \
--cc=jkosina@suse.cz \
--cc=jpoimboe@redhat.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mark.rutland@arm.com \
--cc=mingo@kernel.org \
--cc=npiggin@gmail.com \
--cc=paulmck@kernel.org \
--cc=peterz@infradead.org \
--cc=pkondeti@codeaurora.org \
--cc=rfontana@redhat.com \
--cc=steve.capper@arm.com \
--cc=tglx@linutronix.de \
--cc=will@kernel.org \
--cc=zhenzhong.duan@oracle.com \
/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).