| Message ID | 20241121-intro-acpi-arch-init-v4-1-b1fb517e7d8b@gmail.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [v4] ACPI: introduce acpi_arch_init | expand |
On Thu, Nov 21, 2024 at 3:25 PM Miao Wang via B4 Relay <devnull+shankerwangmiao.gmail.com@kernel.org> wrote: > > From: Miao Wang <shankerwangmiao@gmail.com> > > To avoid arch-specific code in general ACPI initialization flow, > we introduce a weak symbol acpi_arch_init. Currently, arm64 and > riscv can utillize this to insert their arch-specific flow. In > the future, other architectures can also have chance to define > their own arch-specific acpi initialization process if necessary. > > Reviewed-by: Sunil V L <sunilvl@ventanamicro.com> > Reviewed-by: Sudeep Holla <sudeep.holla@arm.com> > Acked-by: Hanjun Guo <guohanjun@huawei.com> > Signed-off-by: Miao Wang <shankerwangmiao@gmail.com> > --- > 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@gmail.com > --- > Changes in v4: > - Rebased to recent Linus's tree > - Consolidate acpi_arm_init and acpi_riscv_init into acpi_arch_init > - Link to v3: https://lore.kernel.org/r/20240808-intro-acpi-arch-init-v3-1-ba510859baff@gmail.com > --- > drivers/acpi/arm64/init.c | 2 +- > drivers/acpi/bus.c | 5 +++-- > drivers/acpi/riscv/init.c | 2 +- > include/linux/acpi.h | 12 +----------- > 4 files changed, 6 insertions(+), 15 deletions(-) > > diff --git a/drivers/acpi/arm64/init.c b/drivers/acpi/arm64/init.c > index d0c8aed90fd16f9a7fe62b8c551c0cd091cb91ec..7a47d8095a7dd5f3dac6e0754d6271bf6de269ff 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 16917dc3ad604cc537d05bb2c0034ff5a9181fd0..058910af82bca689577909e8967073ca3198b3c8 100644 > --- a/drivers/acpi/bus.c > +++ b/drivers/acpi/bus.c > @@ -1434,6 +1434,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; > @@ -1461,8 +1463,7 @@ static int __init acpi_init(void) > acpi_viot_early_init(); > acpi_hest_init(); > acpi_ghes_init(); > - acpi_arm_init(); > - acpi_riscv_init(); > + acpi_arch_init(); > acpi_scan_init(); > acpi_ec_init(); > acpi_debugfs_init(); > diff --git a/drivers/acpi/riscv/init.c b/drivers/acpi/riscv/init.c > index 5ef97905a72759ea2aab3195e56b7ee580eded96..673e4d5dd752719ae7ed0017c8b5b1c688cf9b4b 100644 > --- a/drivers/acpi/riscv/init.c > +++ b/drivers/acpi/riscv/init.c > @@ -7,7 +7,7 @@ > #include <linux/acpi.h> > #include "init.h" > > -void __init acpi_riscv_init(void) > +void __init acpi_arch_init(void) > { > riscv_acpi_init_gsi_mapping(); > } > diff --git a/include/linux/acpi.h b/include/linux/acpi.h > index 7dd24acd9ffeedbe47ac392bd939309408c0afa3..05f39fbfa4856d2e6b7d45d9580cc82963764d55 100644 > --- a/include/linux/acpi.h > +++ b/include/linux/acpi.h > @@ -1530,17 +1530,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 > - > -#ifdef CONFIG_RISCV > -void acpi_riscv_init(void); > -#else > -static inline void acpi_riscv_init(void) { } > -#endif > +void acpi_arch_init(void); > > #ifdef CONFIG_ACPI_PCC > void acpi_init_pcc(void); > > --- Applied as 6.13-rc material, thanks!
diff --git a/drivers/acpi/arm64/init.c b/drivers/acpi/arm64/init.c index d0c8aed90fd16f9a7fe62b8c551c0cd091cb91ec..7a47d8095a7dd5f3dac6e0754d6271bf6de269ff 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 16917dc3ad604cc537d05bb2c0034ff5a9181fd0..058910af82bca689577909e8967073ca3198b3c8 100644 --- a/drivers/acpi/bus.c +++ b/drivers/acpi/bus.c @@ -1434,6 +1434,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; @@ -1461,8 +1463,7 @@ static int __init acpi_init(void) acpi_viot_early_init(); acpi_hest_init(); acpi_ghes_init(); - acpi_arm_init(); - acpi_riscv_init(); + acpi_arch_init(); acpi_scan_init(); acpi_ec_init(); acpi_debugfs_init(); diff --git a/drivers/acpi/riscv/init.c b/drivers/acpi/riscv/init.c index 5ef97905a72759ea2aab3195e56b7ee580eded96..673e4d5dd752719ae7ed0017c8b5b1c688cf9b4b 100644 --- a/drivers/acpi/riscv/init.c +++ b/drivers/acpi/riscv/init.c @@ -7,7 +7,7 @@ #include <linux/acpi.h> #include "init.h" -void __init acpi_riscv_init(void) +void __init acpi_arch_init(void) { riscv_acpi_init_gsi_mapping(); } diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 7dd24acd9ffeedbe47ac392bd939309408c0afa3..05f39fbfa4856d2e6b7d45d9580cc82963764d55 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -1530,17 +1530,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 - -#ifdef CONFIG_RISCV -void acpi_riscv_init(void); -#else -static inline void acpi_riscv_init(void) { } -#endif +void acpi_arch_init(void); #ifdef CONFIG_ACPI_PCC void acpi_init_pcc(void);