From: Miao Wang <shankerwangmiao@xxxxxxxxx> To avoid arch-specific code in general ACPI initialization flow, we introduce a weak symbol acpi_arch_init. Currently, arm64 can utillize this to insert its specific flow. In the future, other architectures can also have chance to define their own arch-specific acpi initialization process if necessary. Signed-off-by: Miao Wang <shankerwangmiao@xxxxxxxxx> Reviewed-by: Sunil V L <sunilvl@xxxxxxxxxxxxxxxx> Reviewed-by: Sudeep Holla <sudeep.holla@xxxxxxx> --- Changes from v1 - Change acpi_arch_init from a static inline stub to a weak function according to Haijun Guo's advice --- Changes from v2: - Add __init attribute to the weak acpi_arch_init stub - Link to v2: https://lore.kernel.org/r/20240807-intro-acpi-arch-init-v2-1-9231e23a7721@xxxxxxxxx --- drivers/acpi/arm64/init.c | 2 +- drivers/acpi/bus.c | 4 +++- include/linux/acpi.h | 6 +----- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/acpi/arm64/init.c b/drivers/acpi/arm64/init.c index d0c8aed90fd1..7a47d8095a7d 100644 --- a/drivers/acpi/arm64/init.c +++ b/drivers/acpi/arm64/init.c @@ -2,7 +2,7 @@ #include <linux/acpi.h> #include "init.h" -void __init acpi_arm_init(void) +void __init acpi_arch_init(void) { if (IS_ENABLED(CONFIG_ACPI_AGDI)) acpi_agdi_init(); diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c index 284bc2e03580..3b319b163d82 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -1431,6 +1431,8 @@ static int __init acpi_bus_init(void) struct kobject *acpi_kobj; EXPORT_SYMBOL_GPL(acpi_kobj); +void __weak __init acpi_arch_init(void) { } + static int __init acpi_init(void) { int result; @@ -1458,7 +1460,7 @@ static int __init acpi_init(void) acpi_viot_early_init(); acpi_hest_init(); acpi_ghes_init(); - acpi_arm_init(); + acpi_arch_init(); acpi_scan_init(); acpi_ec_init(); acpi_debugfs_init(); diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 0687a442fec7..52862c377747 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -1523,11 +1523,7 @@ static inline int find_acpi_cpu_topology_hetero_id(unsigned int cpu) } #endif -#ifdef CONFIG_ARM64 -void acpi_arm_init(void); -#else -static inline void acpi_arm_init(void) { } -#endif +void acpi_arch_init(void); #ifdef CONFIG_ACPI_PCC void acpi_init_pcc(void); --- base-commit: d4560686726f7a357922f300fc81f5964be8df04 change-id: 20240807-intro-acpi-arch-init-fc99fe33e62d Best regards, -- Miao Wang <shankerwangmiao@xxxxxxxxx>
