* [PATCH v2 1/4] ACPI: x86: Introduce a Makefile
2024-04-04 18:23 [PATCH v2 0/4] ACPI: x86: Move x86 stuff into dedicated folder Andy Shevchenko
@ 2024-04-04 18:23 ` Andy Shevchenko
2024-04-04 18:23 ` [PATCH v2 2/4] ACPI: x86: Move acpi_cmos_rtc to x86 folder Andy Shevchenko
` (3 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Andy Shevchenko @ 2024-04-04 18:23 UTC (permalink / raw)
To: Zhang Rui, Andy Shevchenko, Rafael J. Wysocki, linux-kernel,
linux-acpi
Cc: Rafael J. Wysocki, Len Brown
There will be more modules coming here, so, introduce a separate
Makefile and include it in parent one via obj-$(CONFIG_X86).
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/acpi/Makefile | 4 +---
drivers/acpi/x86/Makefile | 4 ++++
2 files changed, 5 insertions(+), 3 deletions(-)
create mode 100644 drivers/acpi/x86/Makefile
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index d69d5444acdb..0db88aab309f 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -56,9 +56,6 @@ acpi-y += evged.o
acpi-y += sysfs.o
acpi-y += property.o
acpi-$(CONFIG_X86) += acpi_cmos_rtc.o
-acpi-$(CONFIG_X86) += x86/apple.o
-acpi-$(CONFIG_X86) += x86/utils.o
-acpi-$(CONFIG_X86) += x86/s2idle.o
acpi-$(CONFIG_DEBUG_FS) += debugfs.o
acpi-y += acpi_lpat.o
acpi-$(CONFIG_ACPI_FPDT) += acpi_fpdt.o
@@ -133,3 +130,4 @@ obj-$(CONFIG_ARM64) += arm64/
obj-$(CONFIG_ACPI_VIOT) += viot.o
obj-$(CONFIG_RISCV) += riscv/
+obj-$(CONFIG_X86) += x86/
diff --git a/drivers/acpi/x86/Makefile b/drivers/acpi/x86/Makefile
new file mode 100644
index 000000000000..bd17dd2c2c5b
--- /dev/null
+++ b/drivers/acpi/x86/Makefile
@@ -0,0 +1,4 @@
+obj-$(CONFIG_ACPI) += acpi-x86.o
+acpi-x86-y += apple.o
+acpi-x86-y += s2idle.o
+acpi-x86-y += utils.o
--
2.43.0.rc1.1.gbec44491f096
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2 2/4] ACPI: x86: Move acpi_cmos_rtc to x86 folder
2024-04-04 18:23 [PATCH v2 0/4] ACPI: x86: Move x86 stuff into dedicated folder Andy Shevchenko
2024-04-04 18:23 ` [PATCH v2 1/4] ACPI: x86: Introduce a Makefile Andy Shevchenko
@ 2024-04-04 18:23 ` Andy Shevchenko
2024-04-04 18:23 ` [PATCH v2 3/4] ACPI: x86: Move blacklist " Andy Shevchenko
` (2 subsequent siblings)
4 siblings, 0 replies; 10+ messages in thread
From: Andy Shevchenko @ 2024-04-04 18:23 UTC (permalink / raw)
To: Zhang Rui, Andy Shevchenko, Rafael J. Wysocki, linux-kernel,
linux-acpi
Cc: Rafael J. Wysocki, Len Brown
acpi_cmos_rtc is built solely for x86, move it to the respective folder.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/acpi/Makefile | 1 -
drivers/acpi/x86/Makefile | 1 +
drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} | 2 +-
3 files changed, 2 insertions(+), 2 deletions(-)
rename drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} (98%)
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 0db88aab309f..413c18e2bf61 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -55,7 +55,6 @@ acpi-y += event.o
acpi-y += evged.o
acpi-y += sysfs.o
acpi-y += property.o
-acpi-$(CONFIG_X86) += acpi_cmos_rtc.o
acpi-$(CONFIG_DEBUG_FS) += debugfs.o
acpi-y += acpi_lpat.o
acpi-$(CONFIG_ACPI_FPDT) += acpi_fpdt.o
diff --git a/drivers/acpi/x86/Makefile b/drivers/acpi/x86/Makefile
index bd17dd2c2c5b..b97b1bcf8404 100644
--- a/drivers/acpi/x86/Makefile
+++ b/drivers/acpi/x86/Makefile
@@ -1,4 +1,5 @@
obj-$(CONFIG_ACPI) += acpi-x86.o
acpi-x86-y += apple.o
+acpi-x86-y += cmos_rtc.o
acpi-x86-y += s2idle.o
acpi-x86-y += utils.o
diff --git a/drivers/acpi/acpi_cmos_rtc.c b/drivers/acpi/x86/cmos_rtc.c
similarity index 98%
rename from drivers/acpi/acpi_cmos_rtc.c
rename to drivers/acpi/x86/cmos_rtc.c
index 9b55d1593d16..51643ff6fe5f 100644
--- a/drivers/acpi/acpi_cmos_rtc.c
+++ b/drivers/acpi/x86/cmos_rtc.c
@@ -15,7 +15,7 @@
#include <linux/module.h>
#include <linux/mc146818rtc.h>
-#include "internal.h"
+#include "../internal.h"
static const struct acpi_device_id acpi_cmos_rtc_ids[] = {
{ "PNP0B00" },
--
2.43.0.rc1.1.gbec44491f096
^ permalink raw reply related [flat|nested] 10+ messages in thread* [PATCH v2 3/4] ACPI: x86: Move blacklist to x86 folder
2024-04-04 18:23 [PATCH v2 0/4] ACPI: x86: Move x86 stuff into dedicated folder Andy Shevchenko
2024-04-04 18:23 ` [PATCH v2 1/4] ACPI: x86: Introduce a Makefile Andy Shevchenko
2024-04-04 18:23 ` [PATCH v2 2/4] ACPI: x86: Move acpi_cmos_rtc to x86 folder Andy Shevchenko
@ 2024-04-04 18:23 ` Andy Shevchenko
2024-04-05 14:44 ` Kuppuswamy Sathyanarayanan
2024-04-04 18:23 ` [PATCH v2 4/4] ACPI: x86: Move LPSS " Andy Shevchenko
2024-04-05 14:45 ` [PATCH v2 0/4] ACPI: x86: Move x86 stuff into dedicated folder Kuppuswamy Sathyanarayanan
4 siblings, 1 reply; 10+ messages in thread
From: Andy Shevchenko @ 2024-04-04 18:23 UTC (permalink / raw)
To: Zhang Rui, Andy Shevchenko, Rafael J. Wysocki, linux-kernel,
linux-acpi
Cc: Rafael J. Wysocki, Len Brown
blacklist is built solely for x86, move it to the respective folder.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/acpi/Makefile | 1 -
drivers/acpi/x86/Makefile | 2 ++
drivers/acpi/{ => x86}/blacklist.c | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
rename drivers/acpi/{ => x86}/blacklist.c (99%)
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 413c18e2bf61..6f4187a34f41 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -14,7 +14,6 @@ tables.o: $(src)/../../include/$(CONFIG_ACPI_CUSTOM_DSDT_FILE) ;
endif
obj-$(CONFIG_ACPI) += tables.o
-obj-$(CONFIG_X86) += blacklist.o
#
# ACPI Core Subsystem (Interpreter)
diff --git a/drivers/acpi/x86/Makefile b/drivers/acpi/x86/Makefile
index b97b1bcf8404..1f3c5fa84f9e 100644
--- a/drivers/acpi/x86/Makefile
+++ b/drivers/acpi/x86/Makefile
@@ -3,3 +3,5 @@ acpi-x86-y += apple.o
acpi-x86-y += cmos_rtc.o
acpi-x86-y += s2idle.o
acpi-x86-y += utils.o
+
+obj-$(CONFIG_X86) += blacklist.o
diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/x86/blacklist.c
similarity index 99%
rename from drivers/acpi/blacklist.c
rename to drivers/acpi/x86/blacklist.c
index a558d24fb788..55214d0a12b1 100644
--- a/drivers/acpi/blacklist.c
+++ b/drivers/acpi/x86/blacklist.c
@@ -17,7 +17,7 @@
#include <linux/acpi.h>
#include <linux/dmi.h>
-#include "internal.h"
+#include "../internal.h"
#ifdef CONFIG_DMI
static const struct dmi_system_id acpi_rev_dmi_table[] __initconst;
--
2.43.0.rc1.1.gbec44491f096
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v2 3/4] ACPI: x86: Move blacklist to x86 folder
2024-04-04 18:23 ` [PATCH v2 3/4] ACPI: x86: Move blacklist " Andy Shevchenko
@ 2024-04-05 14:44 ` Kuppuswamy Sathyanarayanan
2024-04-05 15:19 ` Andy Shevchenko
0 siblings, 1 reply; 10+ messages in thread
From: Kuppuswamy Sathyanarayanan @ 2024-04-05 14:44 UTC (permalink / raw)
To: Andy Shevchenko, Zhang Rui, Rafael J. Wysocki, linux-kernel,
linux-acpi
Cc: Rafael J. Wysocki, Len Brown
On 4/4/24 11:23 AM, Andy Shevchenko wrote:
> blacklist is built solely for x86, move it to the respective folder.
Don't you need #ifdef CONFIG_X86 for acpi_blacklisted() in
include/linux/acpi.h
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
> drivers/acpi/Makefile | 1 -
> drivers/acpi/x86/Makefile | 2 ++
> drivers/acpi/{ => x86}/blacklist.c | 2 +-
> 3 files changed, 3 insertions(+), 2 deletions(-)
> rename drivers/acpi/{ => x86}/blacklist.c (99%)
>
> diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
> index 413c18e2bf61..6f4187a34f41 100644
> --- a/drivers/acpi/Makefile
> +++ b/drivers/acpi/Makefile
> @@ -14,7 +14,6 @@ tables.o: $(src)/../../include/$(CONFIG_ACPI_CUSTOM_DSDT_FILE) ;
> endif
>
> obj-$(CONFIG_ACPI) += tables.o
> -obj-$(CONFIG_X86) += blacklist.o
>
> #
> # ACPI Core Subsystem (Interpreter)
> diff --git a/drivers/acpi/x86/Makefile b/drivers/acpi/x86/Makefile
> index b97b1bcf8404..1f3c5fa84f9e 100644
> --- a/drivers/acpi/x86/Makefile
> +++ b/drivers/acpi/x86/Makefile
> @@ -3,3 +3,5 @@ acpi-x86-y += apple.o
> acpi-x86-y += cmos_rtc.o
> acpi-x86-y += s2idle.o
> acpi-x86-y += utils.o
> +
> +obj-$(CONFIG_X86) += blacklist.o
> diff --git a/drivers/acpi/blacklist.c b/drivers/acpi/x86/blacklist.c
> similarity index 99%
> rename from drivers/acpi/blacklist.c
> rename to drivers/acpi/x86/blacklist.c
> index a558d24fb788..55214d0a12b1 100644
> --- a/drivers/acpi/blacklist.c
> +++ b/drivers/acpi/x86/blacklist.c
> @@ -17,7 +17,7 @@
> #include <linux/acpi.h>
> #include <linux/dmi.h>
>
> -#include "internal.h"
> +#include "../internal.h"
>
> #ifdef CONFIG_DMI
> static const struct dmi_system_id acpi_rev_dmi_table[] __initconst;
--
Sathyanarayanan Kuppuswamy
Linux Kernel Developer
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v2 3/4] ACPI: x86: Move blacklist to x86 folder
2024-04-05 14:44 ` Kuppuswamy Sathyanarayanan
@ 2024-04-05 15:19 ` Andy Shevchenko
2024-04-05 15:29 ` Kuppuswamy Sathyanarayanan
0 siblings, 1 reply; 10+ messages in thread
From: Andy Shevchenko @ 2024-04-05 15:19 UTC (permalink / raw)
To: Kuppuswamy Sathyanarayanan
Cc: Zhang Rui, Rafael J. Wysocki, linux-kernel, linux-acpi,
Rafael J. Wysocki, Len Brown
On Fri, Apr 05, 2024 at 07:44:15AM -0700, Kuppuswamy Sathyanarayanan wrote:
>
> On 4/4/24 11:23 AM, Andy Shevchenko wrote:
> > blacklist is built solely for x86, move it to the respective folder.
>
> Don't you need #ifdef CONFIG_X86 for acpi_blacklisted() in
> include/linux/acpi.h
It's unrelated to this series.
It was like that before and this series doesn't change this aspect.
AFAICS the API is called from x86 only, that's why it's not a problem,
but strictly speaking you are right. Feel free to submit a patch.
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 10+ messages in thread
* Re: [PATCH v2 3/4] ACPI: x86: Move blacklist to x86 folder
2024-04-05 15:19 ` Andy Shevchenko
@ 2024-04-05 15:29 ` Kuppuswamy Sathyanarayanan
0 siblings, 0 replies; 10+ messages in thread
From: Kuppuswamy Sathyanarayanan @ 2024-04-05 15:29 UTC (permalink / raw)
To: Andy Shevchenko
Cc: Zhang Rui, Rafael J. Wysocki, linux-kernel, linux-acpi,
Rafael J. Wysocki, Len Brown
On 4/5/24 8:19 AM, Andy Shevchenko wrote:
> On Fri, Apr 05, 2024 at 07:44:15AM -0700, Kuppuswamy Sathyanarayanan wrote:
>> On 4/4/24 11:23 AM, Andy Shevchenko wrote:
>>> blacklist is built solely for x86, move it to the respective folder.
>> Don't you need #ifdef CONFIG_X86 for acpi_blacklisted() in
>> include/linux/acpi.h
> It's unrelated to this series.
> It was like that before and this series doesn't change this aspect.
>
> AFAICS the API is called from x86 only, that's why it's not a problem,
> but strictly speaking you are right. Feel free to submit a patch.
>
Agree.
--
Sathyanarayanan Kuppuswamy
Linux Kernel Developer
^ permalink raw reply [flat|nested] 10+ messages in thread
* [PATCH v2 4/4] ACPI: x86: Move LPSS to x86 folder
2024-04-04 18:23 [PATCH v2 0/4] ACPI: x86: Move x86 stuff into dedicated folder Andy Shevchenko
` (2 preceding siblings ...)
2024-04-04 18:23 ` [PATCH v2 3/4] ACPI: x86: Move blacklist " Andy Shevchenko
@ 2024-04-04 18:23 ` Andy Shevchenko
2024-04-05 14:45 ` [PATCH v2 0/4] ACPI: x86: Move x86 stuff into dedicated folder Kuppuswamy Sathyanarayanan
4 siblings, 0 replies; 10+ messages in thread
From: Andy Shevchenko @ 2024-04-04 18:23 UTC (permalink / raw)
To: Zhang Rui, Andy Shevchenko, Rafael J. Wysocki, linux-kernel,
linux-acpi
Cc: Rafael J. Wysocki, Len Brown
LPSS is built solely for x86, move it to the respective folder.
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
drivers/acpi/Makefile | 1 -
drivers/acpi/internal.h | 3 ++-
drivers/acpi/x86/Makefile | 1 +
drivers/acpi/{acpi_lpss.c => x86/lpss.c} | 2 +-
4 files changed, 4 insertions(+), 3 deletions(-)
rename drivers/acpi/{acpi_lpss.c => x86/lpss.c} (99%)
diff --git a/drivers/acpi/Makefile b/drivers/acpi/Makefile
index 6f4187a34f41..39ea5cfa8326 100644
--- a/drivers/acpi/Makefile
+++ b/drivers/acpi/Makefile
@@ -45,7 +45,6 @@ acpi-y += ec.o
acpi-$(CONFIG_ACPI_DOCK) += dock.o
acpi-$(CONFIG_PCI) += pci_root.o pci_link.o pci_irq.o
obj-$(CONFIG_ACPI_MCFG) += pci_mcfg.o
-acpi-$(CONFIG_PCI) += acpi_lpss.o
acpi-y += acpi_apd.o
acpi-y += acpi_platform.o
acpi-y += acpi_pnp.o
diff --git a/drivers/acpi/internal.h b/drivers/acpi/internal.h
index ca72a0dc5715..60c483836756 100644
--- a/drivers/acpi/internal.h
+++ b/drivers/acpi/internal.h
@@ -69,7 +69,8 @@ void acpi_debugfs_init(void);
#else
static inline void acpi_debugfs_init(void) { return; }
#endif
-#ifdef CONFIG_PCI
+
+#if defined(CONFIG_X86) && defined(CONFIG_PCI)
void acpi_lpss_init(void);
#else
static inline void acpi_lpss_init(void) {}
diff --git a/drivers/acpi/x86/Makefile b/drivers/acpi/x86/Makefile
index 1f3c5fa84f9e..63c99509ed9d 100644
--- a/drivers/acpi/x86/Makefile
+++ b/drivers/acpi/x86/Makefile
@@ -1,6 +1,7 @@
obj-$(CONFIG_ACPI) += acpi-x86.o
acpi-x86-y += apple.o
acpi-x86-y += cmos_rtc.o
+acpi-x86-$(CONFIG_PCI) += lpss.o
acpi-x86-y += s2idle.o
acpi-x86-y += utils.o
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/x86/lpss.c
similarity index 99%
rename from drivers/acpi/acpi_lpss.c
rename to drivers/acpi/x86/lpss.c
index a3d2d94be5c0..148e29c2c526 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/x86/lpss.c
@@ -25,7 +25,7 @@
#include <linux/suspend.h>
#include <linux/delay.h>
-#include "internal.h"
+#include "../internal.h"
#ifdef CONFIG_X86_INTEL_LPSS
--
2.43.0.rc1.1.gbec44491f096
^ permalink raw reply related [flat|nested] 10+ messages in thread* Re: [PATCH v2 0/4] ACPI: x86: Move x86 stuff into dedicated folder
2024-04-04 18:23 [PATCH v2 0/4] ACPI: x86: Move x86 stuff into dedicated folder Andy Shevchenko
` (3 preceding siblings ...)
2024-04-04 18:23 ` [PATCH v2 4/4] ACPI: x86: Move LPSS " Andy Shevchenko
@ 2024-04-05 14:45 ` Kuppuswamy Sathyanarayanan
2024-04-05 15:20 ` Andy Shevchenko
4 siblings, 1 reply; 10+ messages in thread
From: Kuppuswamy Sathyanarayanan @ 2024-04-05 14:45 UTC (permalink / raw)
To: Andy Shevchenko, Zhang Rui, Rafael J. Wysocki, linux-kernel,
linux-acpi
Cc: Rafael J. Wysocki, Len Brown
On 4/4/24 11:23 AM, Andy Shevchenko wrote:
> Move x86 related modules (which are solely for x86) to the dedicated
> folder.
> Note, there are more modules, but they are related to tables and
> potentially might be used for other architectures in the future.
> Hence touched only non-table related code.
Except the blacklisted patch Nit, rest looks good to me.
Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
>
> In v2:
> - fixed acpi_lpss_init() stub visibility (LKP)
>
> Andy Shevchenko (4):
> ACPI: x86: Introduce a Makefile
> ACPI: x86: Move acpi_cmos_rtc to x86 folder
> ACPI: x86: Move blacklist to x86 folder
> ACPI: x86: Move LPSS to x86 folder
>
> drivers/acpi/Makefile | 7 +------
> drivers/acpi/internal.h | 3 ++-
> drivers/acpi/x86/Makefile | 8 ++++++++
> drivers/acpi/{ => x86}/blacklist.c | 2 +-
> drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} | 2 +-
> drivers/acpi/{acpi_lpss.c => x86/lpss.c} | 2 +-
> 6 files changed, 14 insertions(+), 10 deletions(-)
> create mode 100644 drivers/acpi/x86/Makefile
> rename drivers/acpi/{ => x86}/blacklist.c (99%)
> rename drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} (98%)
> rename drivers/acpi/{acpi_lpss.c => x86/lpss.c} (99%)
>
--
Sathyanarayanan Kuppuswamy
Linux Kernel Developer
^ permalink raw reply [flat|nested] 10+ messages in thread* Re: [PATCH v2 0/4] ACPI: x86: Move x86 stuff into dedicated folder
2024-04-05 14:45 ` [PATCH v2 0/4] ACPI: x86: Move x86 stuff into dedicated folder Kuppuswamy Sathyanarayanan
@ 2024-04-05 15:20 ` Andy Shevchenko
0 siblings, 0 replies; 10+ messages in thread
From: Andy Shevchenko @ 2024-04-05 15:20 UTC (permalink / raw)
To: Kuppuswamy Sathyanarayanan
Cc: Zhang Rui, Rafael J. Wysocki, linux-kernel, linux-acpi,
Rafael J. Wysocki, Len Brown
On Fri, Apr 05, 2024 at 07:45:29AM -0700, Kuppuswamy Sathyanarayanan wrote:
>
> On 4/4/24 11:23 AM, Andy Shevchenko wrote:
> > Move x86 related modules (which are solely for x86) to the dedicated
> > folder.
> > Note, there are more modules, but they are related to tables and
> > potentially might be used for other architectures in the future.
> > Hence touched only non-table related code.
>
> Except the blacklisted patch Nit, rest looks good to me.
Not sure how that related (see my reply).
> Reviewed-by: Kuppuswamy Sathyanarayanan <sathyanarayanan.kuppuswamy@linux.intel.com>
Thank you!
--
With Best Regards,
Andy Shevchenko
^ permalink raw reply [flat|nested] 10+ messages in thread