diff mbox series

ACPI: Move AMBA bus scan handling into arm64 specific directory

Message ID 20230727133347.648102-1-sudeep.holla@arm.com (mailing list archive)
State Mainlined, archived
Headers show
Series ACPI: Move AMBA bus scan handling into arm64 specific directory | expand

Commit Message

Sudeep Holla July 27, 2023, 1:33 p.m. UTC
Commit fcea0ccf4fd7 ("ACPI: bus: Consolidate all arm specific
initialisation into acpi_arm_init()") moved all of the ARM-specific
initialization into acpi_arm_init(). However, acpi_amba.c being outside
of drivers/acpi/arm64 got ignored and hence acpi_amba_init() was not
moved into acpi_arm_init().

Move the AMBA platform bus support into arm64 specific folder and make
acpi_amba_init() part of acpi_arm_init().

Cc: Lorenzo Pieralisi <lpieralisi@kernel.org>
Cc: Hanjun Guo <guohanjun@huawei.com>
Cc: Rafael J. Wysocki <rafael@kernel.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
---
 drivers/acpi/Makefile                      | 1 -
 drivers/acpi/arm64/Makefile                | 1 +
 drivers/acpi/{acpi_amba.c => arm64/amba.c} | 2 +-
 drivers/acpi/arm64/init.c                  | 2 ++
 drivers/acpi/arm64/init.h                  | 1 +
 drivers/acpi/internal.h                    | 5 -----
 drivers/acpi/scan.c                        | 1 -
 7 files changed, 5 insertions(+), 8 deletions(-)
 rename drivers/acpi/{acpi_amba.c => arm64/amba.c} (99%)

Hi Rafael and others,

While I was trying to just add drivers/acpi/acpi_amba.c under ACPI for
ARM64 entry in the MAINTAINERS, I realised it could be moved as part of
acpi_arm_init() which got completely missed last time. So I took that path
instead of add the file in the entry explicitly.

This may have to wait until the coresight changes land or if those changes
can be applied as git understands the file movement this can be applied.

Regards,
Sudeep

Comments

Rafael J. Wysocki July 27, 2023, 1:50 p.m. UTC | #1
On Thu, Jul 27, 2023 at 3:33 PM Sudeep Holla <sudeep.holla@arm.com> wrote:
>
> Commit fcea0ccf4fd7 ("ACPI: bus: Consolidate all arm specific
> initialisation into acpi_arm_init()") moved all of the ARM-specific
> initialization into acpi_arm_init(). However, acpi_amba.c being outside
> of drivers/acpi/arm64 got ignored and hence acpi_amba_init() was not
> moved into acpi_arm_init().
>
> Move the AMBA platform bus support into arm64 specific folder and make
> acpi_amba_init() part of acpi_arm_init().
>
> Cc: Lorenzo Pieralisi <lpieralisi@kernel.org>
> Cc: Hanjun Guo <guohanjun@huawei.com>
> Cc: Rafael J. Wysocki <rafael@kernel.org>
> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

or please let me know if you want me to take care of this.

> ---
>  drivers/acpi/Makefile                      | 1 -
>  drivers/acpi/arm64/Makefile                | 1 +
>  drivers/acpi/{acpi_amba.c => arm64/amba.c} | 2 +-
>  drivers/acpi/arm64/init.c                  | 2 ++
>  drivers/acpi/arm64/init.h                  | 1 +
>  drivers/acpi/internal.h                    | 5 -----
>  drivers/acpi/scan.c                        | 1 -
>  7 files changed, 5 insertions(+), 8 deletions(-)
>  rename drivers/acpi/{acpi_amba.c => arm64/amba.c} (99%)
>
> Hi Rafael and others,
>
> While I was trying to just add drivers/acpi/acpi_amba.c under ACPI for
> ARM64 entry in the MAINTAINERS, I realised it could be moved as part of
> acpi_arm_init() which got completely missed last time. So I took that path
> instead of add the file in the entry explicitly.
>
> This may have to wait until the coresight changes land or if those changes
> can be applied as git understands the file movement this can be applied.
>
> Regards,
> Sudeep
>
> diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
> index 3fc5a0d54f6e..eaa09bf52f17 100644
> --- a/drivers/acpi/Makefile
> +++ b/drivers/acpi/Makefile
> @@ -50,7 +50,6 @@ acpi-$(CONFIG_PCI)            += acpi_lpss.o
>  acpi-y                         += acpi_apd.o
>  acpi-y                         += acpi_platform.o
>  acpi-y                         += acpi_pnp.o
> -acpi-$(CONFIG_ARM_AMBA)        += acpi_amba.o
>  acpi-y                         += power.o
>  acpi-y                         += event.o
>  acpi-y                         += evged.o
> diff --git a/drivers/acpi/arm64/Makefile b/drivers/acpi/arm64/Makefile
> index f81fe24894b2..143debc1ba4a 100644
> --- a/drivers/acpi/arm64/Makefile
> +++ b/drivers/acpi/arm64/Makefile
> @@ -3,4 +3,5 @@ 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-$(CONFIG_ARM_AMBA)         += amba.o
>  obj-y                          += dma.o init.o
> diff --git a/drivers/acpi/acpi_amba.c b/drivers/acpi/arm64/amba.c
> similarity index 99%
> rename from drivers/acpi/acpi_amba.c
> rename to drivers/acpi/arm64/amba.c
> index f5b443ab01c2..b2a7631d7ac7 100644
> --- a/drivers/acpi/acpi_amba.c
> +++ b/drivers/acpi/arm64/amba.c
> @@ -17,7 +17,7 @@
>  #include <linux/kernel.h>
>  #include <linux/module.h>
>
> -#include "internal.h"
> +#include "init.h"
>
>  static const struct acpi_device_id amba_id_list[] = {
>         {"ARMH0061", 0}, /* PL061 GPIO Device */
> diff --git a/drivers/acpi/arm64/init.c b/drivers/acpi/arm64/init.c
> index d3ce53dda122..d0c8aed90fd1 100644
> --- a/drivers/acpi/arm64/init.c
> +++ b/drivers/acpi/arm64/init.c
> @@ -10,4 +10,6 @@ void __init acpi_arm_init(void)
>                 acpi_apmt_init();
>         if (IS_ENABLED(CONFIG_ACPI_IORT))
>                 acpi_iort_init();
> +       if (IS_ENABLED(CONFIG_ARM_AMBA))
> +               acpi_amba_init();
>  }
> diff --git a/drivers/acpi/arm64/init.h b/drivers/acpi/arm64/init.h
> index a1715a2a34e9..dcc277977194 100644
> --- a/drivers/acpi/arm64/init.h
> +++ b/drivers/acpi/arm64/init.h
> @@ -4,3 +4,4 @@
>  void __init acpi_agdi_init(void);
>  void __init acpi_apmt_init(void);
>  void __init acpi_iort_init(void);
> +void __init acpi_amba_init(void);
> diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
> index f4148dc50b9c..21ec31b78216 100644
> --- a/drivers/acpi/internal.h
> +++ b/drivers/acpi/internal.h
> @@ -28,11 +28,6 @@ void acpi_processor_init(void);
>  void acpi_platform_init(void);
>  void acpi_pnp_init(void);
>  void acpi_int340x_thermal_init(void);
> -#ifdef CONFIG_ARM_AMBA
> -void acpi_amba_init(void);
> -#else
> -static inline void acpi_amba_init(void) {}
> -#endif
>  int acpi_sysfs_init(void);
>  void acpi_gpe_apply_masked_gpes(void);
>  void acpi_container_init(void);
> diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
> index 5b145f1aaa1b..902763430d56 100644
> --- a/drivers/acpi/scan.c
> +++ b/drivers/acpi/scan.c
> @@ -2615,7 +2615,6 @@ void __init acpi_scan_init(void)
>         acpi_watchdog_init();
>         acpi_pnp_init();
>         acpi_int340x_thermal_init();
> -       acpi_amba_init();
>         acpi_init_lpit();
>
>         acpi_scan_add_handler(&generic_device_handler);
> --
> 2.41.0
>
Sudeep Holla July 27, 2023, 2:06 p.m. UTC | #2
On Thu, Jul 27, 2023 at 03:50:20PM +0200, Rafael J. Wysocki wrote:
> On Thu, Jul 27, 2023 at 3:33 PM Sudeep Holla <sudeep.holla@arm.com> wrote:
> >
> > Commit fcea0ccf4fd7 ("ACPI: bus: Consolidate all arm specific
> > initialisation into acpi_arm_init()") moved all of the ARM-specific
> > initialization into acpi_arm_init(). However, acpi_amba.c being outside
> > of drivers/acpi/arm64 got ignored and hence acpi_amba_init() was not
> > moved into acpi_arm_init().
> >
> > Move the AMBA platform bus support into arm64 specific folder and make
> > acpi_amba_init() part of acpi_arm_init().
> >
> > Cc: Lorenzo Pieralisi <lpieralisi@kernel.org>
> > Cc: Hanjun Guo <guohanjun@huawei.com>
> > Cc: Rafael J. Wysocki <rafael@kernel.org>
> > Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> 
> Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> 
> or please let me know if you want me to take care of this.
>

Since all the change are in drivers/acpi, I prefer you take this.
But for next merge window, the only issue I see is the conflict with
the coresight change that triggered this work. But git should be able
to manage that or I can check with Greg, I am fine either way. Let me
know your opinion/preference.
Rafael J. Wysocki Aug. 1, 2023, 12:03 p.m. UTC | #3
On Thu, Jul 27, 2023 at 4:06 PM Sudeep Holla <sudeep.holla@arm.com> wrote:
>
> On Thu, Jul 27, 2023 at 03:50:20PM +0200, Rafael J. Wysocki wrote:
> > On Thu, Jul 27, 2023 at 3:33 PM Sudeep Holla <sudeep.holla@arm.com> wrote:
> > >
> > > Commit fcea0ccf4fd7 ("ACPI: bus: Consolidate all arm specific
> > > initialisation into acpi_arm_init()") moved all of the ARM-specific
> > > initialization into acpi_arm_init(). However, acpi_amba.c being outside
> > > of drivers/acpi/arm64 got ignored and hence acpi_amba_init() was not
> > > moved into acpi_arm_init().
> > >
> > > Move the AMBA platform bus support into arm64 specific folder and make
> > > acpi_amba_init() part of acpi_arm_init().
> > >
> > > Cc: Lorenzo Pieralisi <lpieralisi@kernel.org>
> > > Cc: Hanjun Guo <guohanjun@huawei.com>
> > > Cc: Rafael J. Wysocki <rafael@kernel.org>
> > > Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>
> >
> > Acked-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
> >
> > or please let me know if you want me to take care of this.
> >
>
> Since all the change are in drivers/acpi, I prefer you take this.
> But for next merge window, the only issue I see is the conflict with
> the coresight change that triggered this work. But git should be able
> to manage that or I can check with Greg, I am fine either way. Let me
> know your opinion/preference.

Applied as 6.6 material, thanks!
diff mbox series

Patch

diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 3fc5a0d54f6e..eaa09bf52f17 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -50,7 +50,6 @@  acpi-$(CONFIG_PCI)		+= acpi_lpss.o
 acpi-y				+= acpi_apd.o
 acpi-y				+= acpi_platform.o
 acpi-y				+= acpi_pnp.o
-acpi-$(CONFIG_ARM_AMBA)	+= acpi_amba.o
 acpi-y				+= power.o
 acpi-y				+= event.o
 acpi-y				+= evged.o
diff --git a/drivers/acpi/arm64/Makefile b/drivers/acpi/arm64/Makefile
index f81fe24894b2..143debc1ba4a 100644
--- a/drivers/acpi/arm64/Makefile
+++ b/drivers/acpi/arm64/Makefile
@@ -3,4 +3,5 @@  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-$(CONFIG_ARM_AMBA)		+= amba.o
 obj-y				+= dma.o init.o
diff --git a/drivers/acpi/acpi_amba.c b/drivers/acpi/arm64/amba.c
similarity index 99%
rename from drivers/acpi/acpi_amba.c
rename to drivers/acpi/arm64/amba.c
index f5b443ab01c2..b2a7631d7ac7 100644
--- a/drivers/acpi/acpi_amba.c
+++ b/drivers/acpi/arm64/amba.c
@@ -17,7 +17,7 @@ 
 #include <linux/kernel.h>
 #include <linux/module.h>
 
-#include "internal.h"
+#include "init.h"
 
 static const struct acpi_device_id amba_id_list[] = {
 	{"ARMH0061", 0}, /* PL061 GPIO Device */
diff --git a/drivers/acpi/arm64/init.c b/drivers/acpi/arm64/init.c
index d3ce53dda122..d0c8aed90fd1 100644
--- a/drivers/acpi/arm64/init.c
+++ b/drivers/acpi/arm64/init.c
@@ -10,4 +10,6 @@  void __init acpi_arm_init(void)
 		acpi_apmt_init();
 	if (IS_ENABLED(CONFIG_ACPI_IORT))
 		acpi_iort_init();
+	if (IS_ENABLED(CONFIG_ARM_AMBA))
+		acpi_amba_init();
 }
diff --git a/drivers/acpi/arm64/init.h b/drivers/acpi/arm64/init.h
index a1715a2a34e9..dcc277977194 100644
--- a/drivers/acpi/arm64/init.h
+++ b/drivers/acpi/arm64/init.h
@@ -4,3 +4,4 @@ 
 void __init acpi_agdi_init(void);
 void __init acpi_apmt_init(void);
 void __init acpi_iort_init(void);
+void __init acpi_amba_init(void);
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index f4148dc50b9c..21ec31b78216 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -28,11 +28,6 @@  void acpi_processor_init(void);
 void acpi_platform_init(void);
 void acpi_pnp_init(void);
 void acpi_int340x_thermal_init(void);
-#ifdef CONFIG_ARM_AMBA
-void acpi_amba_init(void);
-#else
-static inline void acpi_amba_init(void) {}
-#endif
 int acpi_sysfs_init(void);
 void acpi_gpe_apply_masked_gpes(void);
 void acpi_container_init(void);
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c
index 5b145f1aaa1b..902763430d56 100644
--- a/drivers/acpi/scan.c
+++ b/drivers/acpi/scan.c
@@ -2615,7 +2615,6 @@  void __init acpi_scan_init(void)
 	acpi_watchdog_init();
 	acpi_pnp_init();
 	acpi_int340x_thermal_init();
-	acpi_amba_init();
 	acpi_init_lpit();
 
 	acpi_scan_add_handler(&generic_device_handler);