diff options
authorSudeep Holla <sudeep.holla@arm.com>2016-04-04 14:46:51 +0100
committerAlex Shi <alex.shi@linaro.org>2016-05-24 22:39:33 +0800
commit5e0afcbbc11bc9adeddcdccf7be32b8dfbdd1ad8 (patch)
parentd6c1376ab351962a53fa73542abdaef73172eace (diff)
arm64: KVM: unregister notifiers in hyp mode teardown path
Commit 1e947bad0b63 ("arm64: KVM: Skip HYP setup when already running in HYP") re-organized the hyp init code and ended up leaving the CPU hotplug and PM notifier even if hyp mode initialization fails. Since KVM is not yet supported with ACPI, the above mentioned commit breaks CPU hotplug in ACPI boot. This patch fixes teardown_hyp_mode to properly unregister both CPU hotplug and PM notifiers in the teardown path. Fixes: 1e947bad0b63 ("arm64: KVM: Skip HYP setup when already running in HYP") Cc: Christoffer Dall <christoffer.dall@linaro.org> Cc: Marc Zyngier <marc.zyngier@arm.com> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org> (cherry picked from commit 06a71a24bae57a07afee9cda6b00495347d8a448) Signed-off-by: Alex Shi <alex.shi@linaro.org>
1 files changed, 10 insertions, 3 deletions
diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index d10c75ba44e8..18e72bbc8195 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -989,10 +989,17 @@ static void __init hyp_cpu_pm_init(void)
+static void __init hyp_cpu_pm_exit(void)
+ cpu_pm_unregister_notifier(&hyp_init_cpu_pm_nb);
static inline void hyp_cpu_pm_init(void)
+static inline void hyp_cpu_pm_exit(void)
static void teardown_common_resources(void)
@@ -1018,9 +1025,7 @@ static int init_subsystems(void)
* Register CPU Hotplug notifier
- cpu_notifier_register_begin();
- err = __register_cpu_notifier(&hyp_init_cpu_nb);
- cpu_notifier_register_done();
+ err = register_cpu_notifier(&hyp_init_cpu_nb);
if (err) {
kvm_err("Cannot register KVM init CPU notifier (%d)\n", err);
return err;
@@ -1070,6 +1075,8 @@ static void teardown_hyp_mode(void)
free_page(per_cpu(kvm_arm_hyp_stack_page, cpu));
+ unregister_cpu_notifier(&hyp_init_cpu_nb);
+ hyp_cpu_pm_exit();
static int init_vhe_mode(void)