[PATCH v2] ACPI: bus: Consolidate all arm specific initialisation into acpi_arm_init()
Shaoqin Huang
shahuang at redhat.com
Tue Jun 6 05:02:24 PDT 2023
Looks good.
On 6/6/23 17:35, Sudeep Holla wrote:
> Move all of the ARM-specific initialization into one function namely
> acpi_arm_init(), so it is not necessary to modify/update bus.c every
> time a new piece of it is added.
>
> Cc: Lorenzo Pieralisi <lpieralisi at kernel.org>
> Cc: Rafael J. Wysocki <rafael at kernel.org>
> Suggested-by: Rafael J. Wysocki <rafael.j.wysocki at intel.com>
> Reviewed-by: Robin Murphy <robin.murphy at arm.com>
> Reviewed-by: Hanjun Guo <guohanjun at huawei.com>
> Link: https://lore.kernel.org/r/CAJZ5v0iBZRZmV_oU+VurqxnVMbFN_ttqrL=cLh0sUH+=u0PYsw@mail.gmail.com
> Signed-off-by: Sudeep Holla <sudeep.holla at arm.com>
Reviewed-by: Shaoqin Huang <shahuang at redhat.com>
> ---
> drivers/acpi/arm64/Makefile | 2 +-
> drivers/acpi/arm64/agdi.c | 2 +-
> drivers/acpi/arm64/apmt.c | 2 +-
> drivers/acpi/arm64/init.c | 13 +++++++++++++
> drivers/acpi/arm64/init.h | 6 ++++++
> drivers/acpi/arm64/iort.c | 1 +
> drivers/acpi/bus.c | 7 +------
> include/linux/acpi.h | 6 ++++++
> include/linux/acpi_agdi.h | 13 -------------
> include/linux/acpi_apmt.h | 19 -------------------
> include/linux/acpi_iort.h | 2 --
> 11 files changed, 30 insertions(+), 43 deletions(-)
> create mode 100644 drivers/acpi/arm64/init.c
> create mode 100644 drivers/acpi/arm64/init.h
> delete mode 100644 include/linux/acpi_agdi.h
> delete mode 100644 include/linux/acpi_apmt.h
>
> v1[1]->v2:
> - Used IS_ENABLED and made the init functions' declarations
> unconditional
> - Added review tags
>
> [1] https://lore.kernel.org/all/20230605103550.2427459-1-sudeep.holla@arm.com
>
> diff --git a/drivers/acpi/arm64/Makefile b/drivers/acpi/arm64/Makefile
> index e21a9e84e394..f81fe24894b2 100644
> --- a/drivers/acpi/arm64/Makefile
> +++ b/drivers/acpi/arm64/Makefile
> @@ -3,4 +3,4 @@ obj-$(CONFIG_ACPI_AGDI) += agdi.o
> obj-$(CONFIG_ACPI_IORT) += iort.o
> obj-$(CONFIG_ACPI_GTDT) += gtdt.o
> obj-$(CONFIG_ACPI_APMT) += apmt.o
> -obj-y += dma.o
> +obj-y += dma.o init.o
> diff --git a/drivers/acpi/arm64/agdi.c b/drivers/acpi/arm64/agdi.c
> index f605302395c3..8b3c7d42b41b 100644
> --- a/drivers/acpi/arm64/agdi.c
> +++ b/drivers/acpi/arm64/agdi.c
> @@ -9,11 +9,11 @@
> #define pr_fmt(fmt) "ACPI: AGDI: " fmt
>
> #include <linux/acpi.h>
> -#include <linux/acpi_agdi.h>
> #include <linux/arm_sdei.h>
> #include <linux/io.h>
> #include <linux/kernel.h>
> #include <linux/platform_device.h>
> +#include "init.h"
>
> struct agdi_data {
> int sdei_event;
> diff --git a/drivers/acpi/arm64/apmt.c b/drivers/acpi/arm64/apmt.c
> index 8cab69fa5d59..e5c3bc99fc79 100644
> --- a/drivers/acpi/arm64/apmt.c
> +++ b/drivers/acpi/arm64/apmt.c
> @@ -10,10 +10,10 @@
> #define pr_fmt(fmt) "ACPI: APMT: " fmt
>
> #include <linux/acpi.h>
> -#include <linux/acpi_apmt.h>
> #include <linux/init.h>
> #include <linux/kernel.h>
> #include <linux/platform_device.h>
> +#include "init.h"
>
> #define DEV_NAME "arm-cs-arch-pmu"
>
> diff --git a/drivers/acpi/arm64/init.c b/drivers/acpi/arm64/init.c
> new file mode 100644
> index 000000000000..d3ce53dda122
> --- /dev/null
> +++ b/drivers/acpi/arm64/init.c
> @@ -0,0 +1,13 @@
> +// SPDX-License-Identifier: GPL-2.0-only
> +#include <linux/acpi.h>
> +#include "init.h"
> +
> +void __init acpi_arm_init(void)
> +{
> + if (IS_ENABLED(CONFIG_ACPI_AGDI))
> + acpi_agdi_init();
> + if (IS_ENABLED(CONFIG_ACPI_APMT))
> + acpi_apmt_init();
> + if (IS_ENABLED(CONFIG_ACPI_IORT))
> + acpi_iort_init();
> +}
> diff --git a/drivers/acpi/arm64/init.h b/drivers/acpi/arm64/init.h
> new file mode 100644
> index 000000000000..a1715a2a34e9
> --- /dev/null
> +++ b/drivers/acpi/arm64/init.h
> @@ -0,0 +1,6 @@
> +/* SPDX-License-Identifier: GPL-2.0-only */
> +#include <linux/init.h>
> +
> +void __init acpi_agdi_init(void);
> +void __init acpi_apmt_init(void);
> +void __init acpi_iort_init(void);
> diff --git a/drivers/acpi/arm64/iort.c b/drivers/acpi/arm64/iort.c
> index 38fb84974f35..3631230a61c8 100644
> --- a/drivers/acpi/arm64/iort.c
> +++ b/drivers/acpi/arm64/iort.c
> @@ -19,6 +19,7 @@
> #include <linux/platform_device.h>
> #include <linux/slab.h>
> #include <linux/dma-map-ops.h>
> +#include "init.h"
>
> #define IORT_TYPE_MASK(type) (1 << (type))
> #define IORT_MSI_TYPE (1 << ACPI_IORT_NODE_ITS_GROUP)
> diff --git a/drivers/acpi/bus.c b/drivers/acpi/bus.c
> index d161ff707de4..7a1eaf8c7bde 100644
> --- a/drivers/acpi/bus.c
> +++ b/drivers/acpi/bus.c
> @@ -26,9 +26,6 @@
> #include <asm/mpspec.h>
> #include <linux/dmi.h>
> #endif
> -#include <linux/acpi_agdi.h>
> -#include <linux/acpi_apmt.h>
> -#include <linux/acpi_iort.h>
> #include <linux/acpi_viot.h>
> #include <linux/pci.h>
> #include <acpi/apei.h>
> @@ -1408,7 +1405,7 @@ static int __init acpi_init(void)
> acpi_init_ffh();
>
> pci_mmcfg_late_init();
> - acpi_iort_init();
> + acpi_arm_init();
> acpi_viot_early_init();
> acpi_hest_init();
> acpi_ghes_init();
> @@ -1420,8 +1417,6 @@ static int __init acpi_init(void)
> acpi_debugger_init();
> acpi_setup_sb_notify_handler();
> acpi_viot_init();
> - acpi_agdi_init();
> - acpi_apmt_init();
> return 0;
> }
>
> diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> index 7b71dd74baeb..5ef126a0a50f 100644
> --- a/include/linux/acpi.h
> +++ b/include/linux/acpi.h
> @@ -1507,6 +1507,12 @@ 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_ACPI_PCC
> void acpi_init_pcc(void);
> #else
> diff --git a/include/linux/acpi_agdi.h b/include/linux/acpi_agdi.h
> deleted file mode 100644
> index f477f0b452fa..000000000000
> --- a/include/linux/acpi_agdi.h
> +++ /dev/null
> @@ -1,13 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0-only */
> -
> -#ifndef __ACPI_AGDI_H__
> -#define __ACPI_AGDI_H__
> -
> -#include <linux/acpi.h>
> -
> -#ifdef CONFIG_ACPI_AGDI
> -void __init acpi_agdi_init(void);
> -#else
> -static inline void acpi_agdi_init(void) {}
> -#endif
> -#endif /* __ACPI_AGDI_H__ */
> diff --git a/include/linux/acpi_apmt.h b/include/linux/acpi_apmt.h
> deleted file mode 100644
> index 40bd634d082f..000000000000
> --- a/include/linux/acpi_apmt.h
> +++ /dev/null
> @@ -1,19 +0,0 @@
> -/* SPDX-License-Identifier: GPL-2.0
> - *
> - * ARM CoreSight PMU driver.
> - * Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES.
> - *
> - */
> -
> -#ifndef __ACPI_APMT_H__
> -#define __ACPI_APMT_H__
> -
> -#include <linux/acpi.h>
> -
> -#ifdef CONFIG_ACPI_APMT
> -void acpi_apmt_init(void);
> -#else
> -static inline void acpi_apmt_init(void) { }
> -#endif /* CONFIG_ACPI_APMT */
> -
> -#endif /* __ACPI_APMT_H__ */
> diff --git a/include/linux/acpi_iort.h b/include/linux/acpi_iort.h
> index b43be0987b19..e4e7bb6fa720 100644
> --- a/include/linux/acpi_iort.h
> +++ b/include/linux/acpi_iort.h
> @@ -27,7 +27,6 @@ int iort_register_domain_token(int trans_id, phys_addr_t base,
> void iort_deregister_domain_token(int trans_id);
> struct fwnode_handle *iort_find_domain_token(int trans_id);
> #ifdef CONFIG_ACPI_IORT
> -void acpi_iort_init(void);
> u32 iort_msi_map_id(struct device *dev, u32 id);
> struct irq_domain *iort_get_device_domain(struct device *dev, u32 id,
> enum irq_domain_bus_token bus_token);
> @@ -43,7 +42,6 @@ int iort_iommu_configure_id(struct device *dev, const u32 *id_in);
> void iort_iommu_get_resv_regions(struct device *dev, struct list_head *head);
> phys_addr_t acpi_iort_dma_get_max_cpu_address(void);
> #else
> -static inline void acpi_iort_init(void) { }
> static inline u32 iort_msi_map_id(struct device *dev, u32 id)
> { return id; }
> static inline struct irq_domain *iort_get_device_domain(
> --
> 2.40.1
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
>
--
Shaoqin
More information about the linux-arm-kernel
mailing list