| Message ID | E1rDOhH-00DvlO-UP@rmk-PC.armlinux.org.uk |
|---|---|
| State | New |
| Headers | show |
| Series | ACPI/arm64: add support for virtual cpu hotplug | expand |
On Wed, 13 Dec 2023 12:50:43 +0000 Russell King (Oracle) <rmk+kernel@armlinux.org.uk> wrote: > From: James Morse <james.morse@arm.com> > > The kbuild robot points out that configurations without HOTPLUG_CPU > selected can try to build acpi_processor_post_eject() without success > as arch_unregister_cpu() is not defined. > > Check this explicitly. This will be merged into: > | ACPI: Add post_eject to struct acpi_scan_handler for cpu hotplug > for any subsequent posting. > > Reported-by: kbuild test robot <lkp@intel.com> > Signed-off-by: James Morse <james.morse@arm.com> > Tested-by: Miguel Luis <miguel.luis@oracle.com> > Tested-by: Vishnu Pajjuri <vishnu@os.amperecomputing.com> > Tested-by: Jianyong Wu <jianyong.wu@arm.com> > --- > This should probably be squashed into an earlier patch. Agreed. If not Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
On Mon, 18 Dec 2023 12:58:07 +0000 "Russell King (Oracle)" <linux@armlinux.org.uk> wrote: > On Fri, Dec 15, 2023 at 04:50:09PM +0000, Jonathan Cameron wrote: > > On Wed, 13 Dec 2023 12:50:43 +0000 > > Russell King (Oracle) <rmk+kernel@armlinux.org.uk> wrote: > > > > > From: James Morse <james.morse@arm.com> > > > > > > The kbuild robot points out that configurations without HOTPLUG_CPU > > > selected can try to build acpi_processor_post_eject() without success > > > as arch_unregister_cpu() is not defined. > > > > > > Check this explicitly. This will be merged into: > > > | ACPI: Add post_eject to struct acpi_scan_handler for cpu hotplug > > > for any subsequent posting. > > > > > > Reported-by: kbuild test robot <lkp@intel.com> > > > Signed-off-by: James Morse <james.morse@arm.com> > > > Tested-by: Miguel Luis <miguel.luis@oracle.com> > > > Tested-by: Vishnu Pajjuri <vishnu@os.amperecomputing.com> > > > Tested-by: Jianyong Wu <jianyong.wu@arm.com> > > > --- > > > This should probably be squashed into an earlier patch. > > > > Agreed. If not > > Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> > > I'm not convinced that "ACPI: Add post_eject to struct acpi_scan_handler > for cpu hotplug" is the correct commit to squash this into. > > As far as acpi_processor.c is concerned, This commit merely renames > acpi_processor_remove() to be acpi_processor_post_eject(). The function > references arch_unregister_cpu() before and after this change, and its > build is dependent on CONFIG_ACPI_HOTPLUG_PRESENT_CPU being defined. > > Commit "ACPI: convert acpi_processor_post_eject() to use IS_ENABLED()" > removed the ifdef CONFIG_ACPI_HOTPLUG_PRESENT_CPU surrounding > acpi_processor_post_eject, and that symbol depends on > CONFIG_HOTPLUG_CPU, so I think this commit is also fine. > > Commit "ACPI: Check _STA present bit before making CPUs not present" > rewrites the function - the original body gets called > acpi_processor_make_not_present() and a new acpi_processor_post_eject() > is created. At this point, it doesn't reference arch_unregister_cpu(). > > Commit "ACPI: add support to register CPUs based on the _STA enabled > bit" adds a reference to arch_unregister_cpu() in this new > acpi_processor_post_eject() - so I think this is the correct commit > this change should be merged into. That or where that change ends up given your earlier suggestion to move that change as well. I find it hard to care as long as the bisection issue is squashed by the change. If we make the code drop out before the build issue is introduced that's fine because we are arguing we shouldn't be running it anyway so such protection is fine if not necessary for build fix purposes. J >
diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index 5dabb426481f..ea12e70dfd39 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -537,7 +537,7 @@ static void acpi_processor_post_eject(struct acpi_device *device) unsigned long long sta; acpi_status status; - if (!device) + if (!IS_ENABLED(CONFIG_HOTPLUG_CPU) || !device) return; pr = acpi_driver_data(device);