Skip to content

Commit b398a91

Browse files
James Morsectmarinas
authored andcommitted
ACPI: processor: Register deferred CPUs from acpi_processor_get_info()
The arm64 specific arch_register_cpu() call may defer CPU registration until the ACPI interpreter is available and the _STA method can be evaluated. If this occurs, then a second attempt is made in acpi_processor_get_info(). Note that the arm64 specific call has not yet been added so for now this will be called for the original hotplug case. For architectures that do not defer until the ACPI Processor driver loads (e.g. x86), for initially present CPUs there will already be a CPU device. If present do not try to register again. Systems can still be booted with 'acpi=off', or not include an ACPI description at all as in these cases arch_register_cpu() will not have deferred registration when first called. This moves the CPU register logic back to a subsys_initcall(), while the memory nodes will have been registered earlier. Note this is where the call was prior to the cleanup series so there should be no side effects of moving it back again for this specific case. [PATCH 00/21] Initial cleanups for vCPU HP. https://lore.kernel.org/all/ZVyz%[email protected]/ commit 5b95f94 ("x86/topology: Switch over to GENERIC_CPU_DEVICES") Signed-off-by: James Morse <[email protected]> Signed-off-by: Russell King (Oracle) <[email protected]> Reviewed-by: Gavin Shan <[email protected]> Tested-by: Miguel Luis <[email protected]> Tested-by: Vishnu Pajjuri <[email protected]> Tested-by: Jianyong Wu <[email protected]> Reviewed-by: Hanjun Guo <[email protected]> Acked-by: Rafael J. Wysocki <[email protected]> Co-developed-by: Jonathan Cameron <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Catalin Marinas <[email protected]>
1 parent 36b9216 commit b398a91

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

drivers/acpi/acpi_processor.c

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -359,14 +359,14 @@ static int acpi_processor_get_info(struct acpi_device *device)
359359
}
360360

361361
/*
362-
* Extra Processor objects may be enumerated on MP systems with
363-
* less than the max # of CPUs. They should be ignored _iff
364-
* they are physically not present.
365-
*
366-
* NOTE: Even if the processor has a cpuid, it may not be present
367-
* because cpuid <-> apicid mapping is persistent now.
362+
* This code is not called unless we know the CPU is present and
363+
* enabled. The two paths are:
364+
* a) Initially present CPUs on architectures that do not defer
365+
* their arch_register_cpu() calls until this point.
366+
* b) Hotplugged CPUs (enabled bit in _STA has transitioned from not
367+
* enabled to enabled)
368368
*/
369-
if (invalid_logical_cpuid(pr->id) || !cpu_present(pr->id))
369+
if (!get_cpu_device(pr->id))
370370
ret = acpi_processor_hotadd_init(pr, device);
371371
else
372372
ret = acpi_processor_set_per_cpu(pr, device);

0 commit comments

Comments
 (0)