diff mbox series

[1/3] ACPI: Add LoongArch support for ACPI_PROCESSOR/ACPI_NUMA

Message ID 20210705124206.1228958-2-chenhuacai@loongson.cn (mailing list archive)
State Mainlined, archived
Headers show
Series ACPI: Add LoongArch-related definitions | expand

Commit Message

Huacai Chen July 5, 2021, 12:42 p.m. UTC
We are preparing to add new Loongson (based on LoongArch, not MIPS)
support. LoongArch use ACPI other than DT as its boot protocol, so
add its support for ACPI_PROCESSOR/ACPI_NUMA.

Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
---
 drivers/acpi/Kconfig      | 4 ++--
 drivers/acpi/numa/Kconfig | 2 +-
 drivers/acpi/numa/srat.c  | 2 +-
 include/linux/acpi.h      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

Comments

Rafael J. Wysocki July 14, 2021, 12:30 p.m. UTC | #1
On Mon, Jul 5, 2021 at 2:41 PM Huacai Chen <chenhuacai@loongson.cn> wrote:
>
> We are preparing to add new Loongson (based on LoongArch, not MIPS)
> support. LoongArch use ACPI other than DT as its boot protocol, so
> add its support for ACPI_PROCESSOR/ACPI_NUMA.
>
> Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
> ---
>  drivers/acpi/Kconfig      | 4 ++--
>  drivers/acpi/numa/Kconfig | 2 +-
>  drivers/acpi/numa/srat.c  | 2 +-
>  include/linux/acpi.h      | 2 +-
>  4 files changed, 5 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
> index fe0bb6277e4d..90afa44efcba 100644
> --- a/drivers/acpi/Kconfig
> +++ b/drivers/acpi/Kconfig
> @@ -280,9 +280,9 @@ config ACPI_CPPC_LIB
>
>  config ACPI_PROCESSOR
>         tristate "Processor"
> -       depends on X86 || IA64 || ARM64
> +       depends on X86 || IA64 || ARM64 || LOONGARCH
>         select ACPI_PROCESSOR_IDLE
> -       select ACPI_CPU_FREQ_PSS if X86 || IA64
> +       select ACPI_CPU_FREQ_PSS if X86 || IA64 || LOONGARCH
>         default y
>         help
>           This driver adds support for the ACPI Processor package. It is required
> diff --git a/drivers/acpi/numa/Kconfig b/drivers/acpi/numa/Kconfig
> index fcf2e556d69d..39b1f34c21df 100644
> --- a/drivers/acpi/numa/Kconfig
> +++ b/drivers/acpi/numa/Kconfig
> @@ -2,7 +2,7 @@
>  config ACPI_NUMA
>         bool "NUMA support"
>         depends on NUMA
> -       depends on (X86 || IA64 || ARM64)
> +       depends on (X86 || IA64 || ARM64 || LOONGARCH)
>         default y if IA64 || ARM64
>
>  config ACPI_HMAT
> diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c
> index 6021a1013442..b8795fc49097 100644
> --- a/drivers/acpi/numa/srat.c
> +++ b/drivers/acpi/numa/srat.c
> @@ -206,7 +206,7 @@ int __init srat_disabled(void)
>         return acpi_numa < 0;
>  }
>
> -#if defined(CONFIG_X86) || defined(CONFIG_ARM64)
> +#if defined(CONFIG_X86) || defined(CONFIG_ARM64) || defined(CONFIG_LOONGARCH)
>  /*
>   * Callback for SLIT parsing.  pxm_to_node() returns NUMA_NO_NODE for
>   * I/O localities since SRAT does not list them.  I/O localities are
> diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> index 6bb36fd6ba31..3ba8511cbede 100644
> --- a/include/linux/acpi.h
> +++ b/include/linux/acpi.h
> @@ -249,7 +249,7 @@ void acpi_table_print_madt_entry (struct acpi_subtable_header *madt);
>  /* the following numa functions are architecture-dependent */
>  void acpi_numa_slit_init (struct acpi_table_slit *slit);
>
> -#if defined(CONFIG_X86) || defined(CONFIG_IA64)
> +#if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_LOONGARCH)
>  void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa);
>  #else
>  static inline void
> --

Does this patch alone make sense without the other two in the series?
If so, I can queue it up for 5.15, so please let me know.

Thanks!
Huacai Chen July 15, 2021, 4:49 a.m. UTC | #2
Hi, Rafael,


&gt; -----原始邮件-----
&gt; 发件人: "Rafael J. Wysocki" <rafael@kernel.org>
&gt; 发送时间: 2021-07-14 20:30:33 (星期三)
&gt; 收件人: "Huacai Chen" <chenhuacai@loongson.cn>
&gt; 抄送: "Rafael J . Wysocki" <rjw@rjwysocki.net>, "Len Brown" <lenb@kernel.org>, "Robert Moore" <robert.moore@intel.com>, "Erik Kaneda" <erik.kaneda@intel.com>, "ACPI Devel Maling List" <linux-acpi@vger.kernel.org>, "open list:ACPI COMPONENT ARCHITECTURE (ACPICA)" <devel@acpica.org>, "Xuefeng Li" <lixuefeng@loongson.cn>, "Jiaxun Yang" <jiaxun.yang@flygoat.com>
&gt; 主题: Re: [PATCH 1/3] ACPI: Add LoongArch support for ACPI_PROCESSOR/ACPI_NUMA
&gt; 
&gt; On Mon, Jul 5, 2021 at 2:41 PM Huacai Chen <chenhuacai@loongson.cn> wrote:
&gt; &gt;
&gt; &gt; We are preparing to add new Loongson (based on LoongArch, not MIPS)
&gt; &gt; support. LoongArch use ACPI other than DT as its boot protocol, so
&gt; &gt; add its support for ACPI_PROCESSOR/ACPI_NUMA.
&gt; &gt;
&gt; &gt; Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
&gt; &gt; ---
&gt; &gt;  drivers/acpi/Kconfig      | 4 ++--
&gt; &gt;  drivers/acpi/numa/Kconfig | 2 +-
&gt; &gt;  drivers/acpi/numa/srat.c  | 2 +-
&gt; &gt;  include/linux/acpi.h      | 2 +-
&gt; &gt;  4 files changed, 5 insertions(+), 5 deletions(-)
&gt; &gt;
&gt; &gt; diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
&gt; &gt; index fe0bb6277e4d..90afa44efcba 100644
&gt; &gt; --- a/drivers/acpi/Kconfig
&gt; &gt; +++ b/drivers/acpi/Kconfig
&gt; &gt; @@ -280,9 +280,9 @@ config ACPI_CPPC_LIB
&gt; &gt;
&gt; &gt;  config ACPI_PROCESSOR
&gt; &gt;         tristate "Processor"
&gt; &gt; -       depends on X86 || IA64 || ARM64
&gt; &gt; +       depends on X86 || IA64 || ARM64 || LOONGARCH
&gt; &gt;         select ACPI_PROCESSOR_IDLE
&gt; &gt; -       select ACPI_CPU_FREQ_PSS if X86 || IA64
&gt; &gt; +       select ACPI_CPU_FREQ_PSS if X86 || IA64 || LOONGARCH
&gt; &gt;         default y
&gt; &gt;         help
&gt; &gt;           This driver adds support for the ACPI Processor package. It is required
&gt; &gt; diff --git a/drivers/acpi/numa/Kconfig b/drivers/acpi/numa/Kconfig
&gt; &gt; index fcf2e556d69d..39b1f34c21df 100644
&gt; &gt; --- a/drivers/acpi/numa/Kconfig
&gt; &gt; +++ b/drivers/acpi/numa/Kconfig
&gt; &gt; @@ -2,7 +2,7 @@
&gt; &gt;  config ACPI_NUMA
&gt; &gt;         bool "NUMA support"
&gt; &gt;         depends on NUMA
&gt; &gt; -       depends on (X86 || IA64 || ARM64)
&gt; &gt; +       depends on (X86 || IA64 || ARM64 || LOONGARCH)
&gt; &gt;         default y if IA64 || ARM64
&gt; &gt;
&gt; &gt;  config ACPI_HMAT
&gt; &gt; diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c
&gt; &gt; index 6021a1013442..b8795fc49097 100644
&gt; &gt; --- a/drivers/acpi/numa/srat.c
&gt; &gt; +++ b/drivers/acpi/numa/srat.c
&gt; &gt; @@ -206,7 +206,7 @@ int __init srat_disabled(void)
&gt; &gt;         return acpi_numa &lt; 0;
&gt; &gt;  }
&gt; &gt;
&gt; &gt; -#if defined(CONFIG_X86) || defined(CONFIG_ARM64)
&gt; &gt; +#if defined(CONFIG_X86) || defined(CONFIG_ARM64) || defined(CONFIG_LOONGARCH)
&gt; &gt;  /*
&gt; &gt;   * Callback for SLIT parsing.  pxm_to_node() returns NUMA_NO_NODE for
&gt; &gt;   * I/O localities since SRAT does not list them.  I/O localities are
&gt; &gt; diff --git a/include/linux/acpi.h b/include/linux/acpi.h
&gt; &gt; index 6bb36fd6ba31..3ba8511cbede 100644
&gt; &gt; --- a/include/linux/acpi.h
&gt; &gt; +++ b/include/linux/acpi.h
&gt; &gt; @@ -249,7 +249,7 @@ void acpi_table_print_madt_entry (struct acpi_subtable_header *madt);
&gt; &gt;  /* the following numa functions are architecture-dependent */
&gt; &gt;  void acpi_numa_slit_init (struct acpi_table_slit *slit);
&gt; &gt;
&gt; &gt; -#if defined(CONFIG_X86) || defined(CONFIG_IA64)
&gt; &gt; +#if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_LOONGARCH)
&gt; &gt;  void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa);
&gt; &gt;  #else
&gt; &gt;  static inline void
&gt; &gt; --
&gt; 
&gt; Does this patch alone make sense without the other two in the series?
&gt; If so, I can queue it up for 5.15, so please let me know.
Yes, this patch has no dependency with other two.

Huacai
&gt; 
&gt; Thanks!
</chenhuacai@loongson.cn></chenhuacai@loongson.cn></jiaxun.yang@flygoat.com></lixuefeng@loongson.cn></devel@acpica.org></linux-acpi@vger.kernel.org></erik.kaneda@intel.com></robert.moore@intel.com></lenb@kernel.org></rjw@rjwysocki.net></chenhuacai@loongson.cn></rafael@kernel.org>
Rafael J. Wysocki July 16, 2021, 5:11 p.m. UTC | #3
On Thu, Jul 15, 2021 at 6:49 AM 陈华才 <chenhuacai@loongson.cn> wrote:
>
> Hi, Rafael,
>
>
> &gt; -----原始邮件-----
> &gt; 发件人: "Rafael J. Wysocki" <rafael@kernel.org>
> &gt; 发送时间: 2021-07-14 20:30:33 (星期三)
> &gt; 收件人: "Huacai Chen" <chenhuacai@loongson.cn>
> &gt; 抄送: "Rafael J . Wysocki" <rjw@rjwysocki.net>, "Len Brown" <lenb@kernel.org>, "Robert Moore" <robert.moore@intel.com>, "Erik Kaneda" <erik.kaneda@intel.com>, "ACPI Devel Maling List" <linux-acpi@vger.kernel.org>, "open list:ACPI COMPONENT ARCHITECTURE (ACPICA)" <devel@acpica.org>, "Xuefeng Li" <lixuefeng@loongson.cn>, "Jiaxun Yang" <jiaxun.yang@flygoat.com>
> &gt; 主题: Re: [PATCH 1/3] ACPI: Add LoongArch support for ACPI_PROCESSOR/ACPI_NUMA
> &gt;
> &gt; On Mon, Jul 5, 2021 at 2:41 PM Huacai Chen <chenhuacai@loongson.cn> wrote:
> &gt; &gt;
> &gt; &gt; We are preparing to add new Loongson (based on LoongArch, not MIPS)
> &gt; &gt; support. LoongArch use ACPI other than DT as its boot protocol, so
> &gt; &gt; add its support for ACPI_PROCESSOR/ACPI_NUMA.
> &gt; &gt;
> &gt; &gt; Signed-off-by: Huacai Chen <chenhuacai@loongson.cn>
> &gt; &gt; ---
> &gt; &gt;  drivers/acpi/Kconfig      | 4 ++--
> &gt; &gt;  drivers/acpi/numa/Kconfig | 2 +-
> &gt; &gt;  drivers/acpi/numa/srat.c  | 2 +-
> &gt; &gt;  include/linux/acpi.h      | 2 +-
> &gt; &gt;  4 files changed, 5 insertions(+), 5 deletions(-)
> &gt; &gt;
> &gt; &gt; diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
> &gt; &gt; index fe0bb6277e4d..90afa44efcba 100644
> &gt; &gt; --- a/drivers/acpi/Kconfig
> &gt; &gt; +++ b/drivers/acpi/Kconfig
> &gt; &gt; @@ -280,9 +280,9 @@ config ACPI_CPPC_LIB
> &gt; &gt;
> &gt; &gt;  config ACPI_PROCESSOR
> &gt; &gt;         tristate "Processor"
> &gt; &gt; -       depends on X86 || IA64 || ARM64
> &gt; &gt; +       depends on X86 || IA64 || ARM64 || LOONGARCH
> &gt; &gt;         select ACPI_PROCESSOR_IDLE
> &gt; &gt; -       select ACPI_CPU_FREQ_PSS if X86 || IA64
> &gt; &gt; +       select ACPI_CPU_FREQ_PSS if X86 || IA64 || LOONGARCH
> &gt; &gt;         default y
> &gt; &gt;         help
> &gt; &gt;           This driver adds support for the ACPI Processor package. It is required
> &gt; &gt; diff --git a/drivers/acpi/numa/Kconfig b/drivers/acpi/numa/Kconfig
> &gt; &gt; index fcf2e556d69d..39b1f34c21df 100644
> &gt; &gt; --- a/drivers/acpi/numa/Kconfig
> &gt; &gt; +++ b/drivers/acpi/numa/Kconfig
> &gt; &gt; @@ -2,7 +2,7 @@
> &gt; &gt;  config ACPI_NUMA
> &gt; &gt;         bool "NUMA support"
> &gt; &gt;         depends on NUMA
> &gt; &gt; -       depends on (X86 || IA64 || ARM64)
> &gt; &gt; +       depends on (X86 || IA64 || ARM64 || LOONGARCH)
> &gt; &gt;         default y if IA64 || ARM64
> &gt; &gt;
> &gt; &gt;  config ACPI_HMAT
> &gt; &gt; diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c
> &gt; &gt; index 6021a1013442..b8795fc49097 100644
> &gt; &gt; --- a/drivers/acpi/numa/srat.c
> &gt; &gt; +++ b/drivers/acpi/numa/srat.c
> &gt; &gt; @@ -206,7 +206,7 @@ int __init srat_disabled(void)
> &gt; &gt;         return acpi_numa &lt; 0;
> &gt; &gt;  }
> &gt; &gt;
> &gt; &gt; -#if defined(CONFIG_X86) || defined(CONFIG_ARM64)
> &gt; &gt; +#if defined(CONFIG_X86) || defined(CONFIG_ARM64) || defined(CONFIG_LOONGARCH)
> &gt; &gt;  /*
> &gt; &gt;   * Callback for SLIT parsing.  pxm_to_node() returns NUMA_NO_NODE for
> &gt; &gt;   * I/O localities since SRAT does not list them.  I/O localities are
> &gt; &gt; diff --git a/include/linux/acpi.h b/include/linux/acpi.h
> &gt; &gt; index 6bb36fd6ba31..3ba8511cbede 100644
> &gt; &gt; --- a/include/linux/acpi.h
> &gt; &gt; +++ b/include/linux/acpi.h
> &gt; &gt; @@ -249,7 +249,7 @@ void acpi_table_print_madt_entry (struct acpi_subtable_header *madt);
> &gt; &gt;  /* the following numa functions are architecture-dependent */
> &gt; &gt;  void acpi_numa_slit_init (struct acpi_table_slit *slit);
> &gt; &gt;
> &gt; &gt; -#if defined(CONFIG_X86) || defined(CONFIG_IA64)
> &gt; &gt; +#if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_LOONGARCH)
> &gt; &gt;  void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa);
> &gt; &gt;  #else
> &gt; &gt;  static inline void
> &gt; &gt; --
> &gt;
> &gt; Does this patch alone make sense without the other two in the series?
> &gt; If so, I can queue it up for 5.15, so please let me know.
> Yes, this patch has no dependency with other two.

OK, applied as 5.15 material.

Thanks!
diff mbox series

Patch

diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
index fe0bb6277e4d..90afa44efcba 100644
--- a/drivers/acpi/Kconfig
+++ b/drivers/acpi/Kconfig
@@ -280,9 +280,9 @@  config ACPI_CPPC_LIB
 
 config ACPI_PROCESSOR
 	tristate "Processor"
-	depends on X86 || IA64 || ARM64
+	depends on X86 || IA64 || ARM64 || LOONGARCH
 	select ACPI_PROCESSOR_IDLE
-	select ACPI_CPU_FREQ_PSS if X86 || IA64
+	select ACPI_CPU_FREQ_PSS if X86 || IA64 || LOONGARCH
 	default y
 	help
 	  This driver adds support for the ACPI Processor package. It is required
diff --git a/drivers/acpi/numa/Kconfig b/drivers/acpi/numa/Kconfig
index fcf2e556d69d..39b1f34c21df 100644
--- a/drivers/acpi/numa/Kconfig
+++ b/drivers/acpi/numa/Kconfig
@@ -2,7 +2,7 @@ 
 config ACPI_NUMA
 	bool "NUMA support"
 	depends on NUMA
-	depends on (X86 || IA64 || ARM64)
+	depends on (X86 || IA64 || ARM64 || LOONGARCH)
 	default y if IA64 || ARM64
 
 config ACPI_HMAT
diff --git a/drivers/acpi/numa/srat.c b/drivers/acpi/numa/srat.c
index 6021a1013442..b8795fc49097 100644
--- a/drivers/acpi/numa/srat.c
+++ b/drivers/acpi/numa/srat.c
@@ -206,7 +206,7 @@  int __init srat_disabled(void)
 	return acpi_numa < 0;
 }
 
-#if defined(CONFIG_X86) || defined(CONFIG_ARM64)
+#if defined(CONFIG_X86) || defined(CONFIG_ARM64) || defined(CONFIG_LOONGARCH)
 /*
  * Callback for SLIT parsing.  pxm_to_node() returns NUMA_NO_NODE for
  * I/O localities since SRAT does not list them.  I/O localities are
diff --git a/include/linux/acpi.h b/include/linux/acpi.h
index 6bb36fd6ba31..3ba8511cbede 100644
--- a/include/linux/acpi.h
+++ b/include/linux/acpi.h
@@ -249,7 +249,7 @@  void acpi_table_print_madt_entry (struct acpi_subtable_header *madt);
 /* the following numa functions are architecture-dependent */
 void acpi_numa_slit_init (struct acpi_table_slit *slit);
 
-#if defined(CONFIG_X86) || defined(CONFIG_IA64)
+#if defined(CONFIG_X86) || defined(CONFIG_IA64) || defined(CONFIG_LOONGARCH)
 void acpi_numa_processor_affinity_init (struct acpi_srat_cpu_affinity *pa);
 #else
 static inline void