Commit 734ada1b authored by James Morse's avatar James Morse Committed by liwei
Browse files

ACPI: processor: Register all CPUs from acpi_processor_get_info()

maillist inclusion
category: feature
bugzilla: https://gitee.com/openeuler/kernel/issues/I8XMTL


CVE: NA

---------------------------------

To allow ACPI to skip the call to arch_register_cpu() when the _STA
value indicates the CPU can't be brought online right now, move the
arch_register_cpu() call into acpi_processor_get_info().

Systems can still be booted with 'acpi=off', or not include an
ACPI description at all. For these, the CPUs continue to be
registered by cpu_dev_register_generic().

This moves the CPU register logic back to a subsys_initcall(),
while the memory nodes will have been registered earlier.

Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Reviewed-by: default avatarGavin Shan <gshan@redhat.com>
Tested-by: default avatarMiguel Luis <miguel.luis@oracle.com>
Tested-by: default avatarVishnu Pajjuri <vishnu@os.amperecomputing.com>
Tested-by: default avatarJianyong Wu <jianyong.wu@arm.com>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarJonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: default avatarliwei <liwei728@huawei.com>
parent b6e0a37a
Loading
Loading
Loading
Loading
+12 −0
Original line number Diff line number Diff line
@@ -314,6 +314,18 @@ static int acpi_processor_get_info(struct acpi_device *device)
			cpufreq_add_device("acpi-cpufreq");
	}

	/*
	 * Register CPUs that are present. get_cpu_device() is used to skip
	 * duplicate CPU descriptions from firmware.
	 */
	if (!invalid_logical_cpuid(pr->id) && cpu_present(pr->id) &&
	    !get_cpu_device(pr->id)) {
		int ret = arch_register_cpu(pr->id);

		if (ret)
			return ret;
	}

	/*
	 *  Extra Processor objects may be enumerated on MP systems with
	 *  less than the max # of CPUs. They should be ignored _iff
+5 −1
Original line number Diff line number Diff line
@@ -553,7 +553,11 @@ static void __init cpu_dev_register_generic(void)
{
	int i, ret;

	if (!IS_ENABLED(CONFIG_GENERIC_CPU_DEVICES))
	/*
	 * When ACPI is enabled, CPUs are registered via
	 * acpi_processor_get_info().
	 */
	if (!IS_ENABLED(CONFIG_GENERIC_CPU_DEVICES) || !acpi_disabled)
		return;

	for_each_present_cpu(i) {