Commit 56555855 authored by Qais Yousef's avatar Qais Yousef Committed by Thomas Gleixner
Browse files

cpu/hotplug: Remove disable_nonboot_cpus() 



The single user could have called freeze_secondary_cpus() directly.

Since this function was a source of confusion, remove it as it's
just a pointless wrapper.

While at it, rename enable_nonboot_cpus() to thaw_secondary_cpus() to
preserve the naming symmetry.

Done automatically via:

	git grep -l enable_nonboot_cpus | xargs sed -i 's/enable_nonboot_cpus/thaw_secondary_cpus/g'

Signed-off-by: default avatarQais Yousef <qais.yousef@arm.com>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Cc: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Link: https://lkml.kernel.org/r/20200430114004.17477-1-qais.yousef@arm.com
parent 182e073f

Documentation/power/suspend-and-cpuhotplug.rst

+3 −3
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ More details follow:: 
                                        |

                                        |

                                        v

                              disable_nonboot_cpus()

                              freeze_secondary_cpus()

                                   /* start */

                                        |

                                        v
@@ -83,7 +83,7 @@ More details follow:: 
                            Release cpu_add_remove_lock

                                        |

                                        v

                       /* disable_nonboot_cpus() complete */

                       /* freeze_secondary_cpus() complete */

                                        |

                                        v

                                   Do suspend
@@ -93,7 +93,7 @@ More details follow:: 
Resuming back is likewise, with the counterparts being (in the order of

execution during resume):



* enable_nonboot_cpus() which involves::

* thaw_secondary_cpus() which involves::



   |  Acquire cpu_add_remove_lock

   |  Decrease cpu_hotplug_disabled, thereby enabling regular cpu hotplug

arch/x86/kernel/smpboot.c

+2 −2
Original line number Diff line number Diff line
@@ -1376,12 +1376,12 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) 
	speculative_store_bypass_ht_init();

}



void arch_enable_nonboot_cpus_begin(void)

void arch_thaw_secondary_cpus_begin(void)

{

	set_mtrr_aps_delayed_init();

}



void arch_enable_nonboot_cpus_end(void)

void arch_thaw_secondary_cpus_end(void)

{

	mtrr_aps_init();

}

arch/x86/power/cpu.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ int hibernate_resume_nonboot_cpu_disable(void) 
	if (ret)

		return ret;

	smp_ops.play_dead = resume_play_dead;

	ret = disable_nonboot_cpus();

	ret = freeze_secondary_cpus(0);

	smp_ops.play_dead = play_dead;

	return ret;

}

include/linux/cpu.h

+3 −9
Original line number Diff line number Diff line
@@ -150,12 +150,7 @@ static inline int freeze_secondary_cpus(int primary) 
	return __freeze_secondary_cpus(primary, true);

}



static inline int disable_nonboot_cpus(void)

{

	return __freeze_secondary_cpus(0, false);

}



void enable_nonboot_cpus(void);

extern void thaw_secondary_cpus(void);



static inline int suspend_disable_secondary_cpus(void)

{
@@ -168,12 +163,11 @@ static inline int suspend_disable_secondary_cpus(void) 
}

static inline void suspend_enable_secondary_cpus(void)

{

	return enable_nonboot_cpus();

	return thaw_secondary_cpus();

}



#else /* !CONFIG_PM_SLEEP_SMP */

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

static inline void enable_nonboot_cpus(void) {}

static inline void thaw_secondary_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 */

include/linux/smp.h

+2 −2
Original line number Diff line number Diff line
@@ -227,8 +227,8 @@ static inline int get_boot_cpu_id(void) 
 */

extern void arch_disable_smp_support(void);



extern void arch_enable_nonboot_cpus_begin(void);

extern void arch_enable_nonboot_cpus_end(void);

extern void arch_thaw_secondary_cpus_begin(void);

extern void arch_thaw_secondary_cpus_end(void);



void smp_setup_processor_id(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE