Commit 2f1a6fbb authored by Nicholas Piggin's avatar Nicholas Piggin Committed by Ingo Molnar
Browse files

power/suspend: Add function to disable secondaries for suspend 



This adds a function to disable secondary CPUs for suspend that are
not necessarily non-zero / non-boot CPUs. Platforms will be able to
use this to suspend using non-zero CPUs.

Signed-off-by: default avatarNicholas Piggin <npiggin@gmail.com>
Signed-off-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Rafael J . Wysocki <rafael.j.wysocki@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: linuxppc-dev@lists.ozlabs.org
Link: https://lkml.kernel.org/r/20190411033448.20842-3-npiggin@gmail.com


Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parent 77a5352b

include/linux/cpu.h

+12 −0
Original line number Diff line number Diff line
@@ -137,9 +137,21 @@ static inline int disable_nonboot_cpus(void) 
	return freeze_secondary_cpus(0);

}

extern void enable_nonboot_cpus(void);



static inline int suspend_disable_secondary_cpus(void)

{

	return freeze_secondary_cpus(0);

}

static inline void suspend_enable_secondary_cpus(void)

{

	return enable_nonboot_cpus();

}



#else /* !CONFIG_PM_SLEEP_SMP */

static inline int disable_nonboot_cpus(void) { return 0; }

static inline void enable_nonboot_cpus(void) {}

static inline int suspend_disable_secondary_cpus(void) { return 0; }

static inline void suspend_enable_secondary_cpus(void) { }

#endif /* !CONFIG_PM_SLEEP_SMP */



void cpu_startup_entry(enum cpuhp_state state);

kernel/kexec_core.c

+2 −2
Original line number Diff line number Diff line
@@ -1150,7 +1150,7 @@ int kernel_kexec(void) 
		error = dpm_suspend_end(PMSG_FREEZE);

		if (error)

			goto Resume_devices;

		error = disable_nonboot_cpus();

		error = suspend_disable_secondary_cpus();

		if (error)

			goto Enable_cpus;

		local_irq_disable();
@@ -1183,7 +1183,7 @@ int kernel_kexec(void) 
 Enable_irqs:

		local_irq_enable();

 Enable_cpus:

		enable_nonboot_cpus();

		suspend_enable_secondary_cpus();

		dpm_resume_start(PMSG_RESTORE);

 Resume_devices:

		dpm_resume_end(PMSG_RESTORE);

kernel/power/hibernate.c

+6 −6
Original line number Diff line number Diff line
@@ -281,7 +281,7 @@ static int create_image(int platform_mode) 
	if (error || hibernation_test(TEST_PLATFORM))

		goto Platform_finish;



	error = disable_nonboot_cpus();

	error = suspend_disable_secondary_cpus();

	if (error || hibernation_test(TEST_CPUS))

		goto Enable_cpus;
@@ -323,7 +323,7 @@ static int create_image(int platform_mode) 
	local_irq_enable();



 Enable_cpus:

	enable_nonboot_cpus();

	suspend_enable_secondary_cpus();



 Platform_finish:

	platform_finish(platform_mode);
@@ -417,7 +417,7 @@ int hibernation_snapshot(int platform_mode) 


int __weak hibernate_resume_nonboot_cpu_disable(void)

{

	return disable_nonboot_cpus();

	return suspend_disable_secondary_cpus();

}



/**
@@ -486,7 +486,7 @@ static int resume_target_kernel(bool platform_mode) 
	local_irq_enable();



 Enable_cpus:

	enable_nonboot_cpus();

	suspend_enable_secondary_cpus();



 Cleanup:

	platform_restore_cleanup(platform_mode);
@@ -564,7 +564,7 @@ int hibernation_platform_enter(void) 
	if (error)

		goto Platform_finish;



	error = disable_nonboot_cpus();

	error = suspend_disable_secondary_cpus();

	if (error)

		goto Enable_cpus;
@@ -586,7 +586,7 @@ int hibernation_platform_enter(void) 
	local_irq_enable();



 Enable_cpus:

	enable_nonboot_cpus();

	suspend_enable_secondary_cpus();



 Platform_finish:

	hibernation_ops->finish();

kernel/power/suspend.c

+2 −2
Original line number Diff line number Diff line
@@ -428,7 +428,7 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) 
	if (suspend_test(TEST_PLATFORM))

		goto Platform_wake;



	error = disable_nonboot_cpus();

	error = suspend_disable_secondary_cpus();

	if (error || suspend_test(TEST_CPUS))

		goto Enable_cpus;
@@ -458,7 +458,7 @@ static int suspend_enter(suspend_state_t state, bool *wakeup) 
	BUG_ON(irqs_disabled());



 Enable_cpus:

	enable_nonboot_cpus();

	suspend_enable_secondary_cpus();



 Platform_wake:

	platform_resume_noirq(state);

CRA Git | Maintained and supported by SUSTech CRA and CCSE