lkml.org 
[lkml]   [2023]   [Feb]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[RFC PATCH 16/32] ACPI: Rename acpi_processor_hotadd_init and remove pre-processor guards
    Date
    acpi_processor_hotadd_init() will make a CPU present by mapping it
    based on its hardware id.

    'hotadd_init' is ambiguous once there are two different behaviours
    for cpu hotplug. This is for toggling the _STA present bit. Subsequent
    patches will add support for toggling the _STA enabled bit, named
    acpi_processor_make_enabled().

    Rename it acpi_processor_make_present() to make it clear this is
    for CPUs that were not previously present.

    Expose the function prototypes it uses to allow the preprocessor
    guards to be removed. The IS_ENABLED() check will let the compiler
    dead-code elimination pass remove this if it isn't going to be
    used.

    Signed-off-by: James Morse <james.morse@arm.com>
    ---
    drivers/acpi/acpi_processor.c | 14 +++++---------
    include/linux/acpi.h | 2 --
    2 files changed, 5 insertions(+), 11 deletions(-)

    diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c
    index 682721594820..6ab55f109417 100644
    --- a/drivers/acpi/acpi_processor.c
    +++ b/drivers/acpi/acpi_processor.c
    @@ -149,13 +149,15 @@ static int acpi_processor_errata(void)
    }

    /* Initialization */
    -#ifdef CONFIG_ACPI_HOTPLUG_PRESENT_CPU
    -static int acpi_processor_hotadd_init(struct acpi_processor *pr)
    +static int acpi_processor_make_present(struct acpi_processor *pr)
    {
    unsigned long long sta;
    acpi_status status;
    int ret;

    + if (!IS_ENABLED(CONFIG_ACPI_HOTPLUG_PRESENT_CPU))
    + return -ENODEV;
    +
    if (invalid_phys_cpuid(pr->phys_id))
    return -ENODEV;

    @@ -189,12 +191,6 @@ static int acpi_processor_hotadd_init(struct acpi_processor *pr)
    cpu_maps_update_done();
    return ret;
    }
    -#else
    -static inline int acpi_processor_hotadd_init(struct acpi_processor *pr)
    -{
    - return -ENODEV;
    -}
    -#endif /* CONFIG_ACPI_HOTPLUG_PRESENT_CPU */

    static int acpi_processor_get_info(struct acpi_device *device)
    {
    @@ -287,7 +283,7 @@ static int acpi_processor_get_info(struct acpi_device *device)
    * because cpuid <-> apicid mapping is persistent now.
    */
    if (invalid_logical_cpuid(pr->id) || !cpu_present(pr->id)) {
    - int ret = acpi_processor_hotadd_init(pr);
    + int ret = acpi_processor_make_present(pr);

    if (ret)
    return ret;
    diff --git a/include/linux/acpi.h b/include/linux/acpi.h
    index 0bc1eacd0dfc..a59bca4dbcd5 100644
    --- a/include/linux/acpi.h
    +++ b/include/linux/acpi.h
    @@ -327,12 +327,10 @@ static inline int acpi_processor_evaluate_cst(acpi_handle handle, u32 cpu,
    }
    #endif

    -#ifdef CONFIG_ACPI_HOTPLUG_PRESENT_CPU
    /* Arch dependent functions for cpu hotplug support */
    int acpi_map_cpu(acpi_handle handle, phys_cpuid_t physid, u32 acpi_id,
    int *pcpu);
    int acpi_unmap_cpu(int cpu);
    -#endif /* CONFIG_ACPI_HOTPLUG_PRESENT_CPU */

    #ifdef CONFIG_ACPI_HOTPLUG_IOAPIC
    int acpi_get_ioapic_id(acpi_handle handle, u32 gsi_base, u64 *phys_addr);
    --
    2.30.2
    \
     
     \ /
      Last update: 2023-03-27 00:09    [W:4.229 / U:0.012 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site