diff mbox series

[v4,3/4] ACPI: NUMA: change the ACPI_NUMA to a hidden option

Message ID f1f96377b8ecd6e3183f28abf5c9ac21cb9855ea.1718268003.git.haibo1.xu@intel.com (mailing list archive)
State Accepted
Commit adc3e82d253786a5b63c821108709de23317a90d
Headers show
Series Add ACPI NUMA support for RISC-V | expand

Checks

Context Check Description
conchuod/vmtest-for-next-PR success PR summary
conchuod/patch-3-test-1 success .github/scripts/patches/tests/build_rv32_defconfig.sh
conchuod/patch-3-test-2 success .github/scripts/patches/tests/build_rv64_clang_allmodconfig.sh
conchuod/patch-3-test-3 success .github/scripts/patches/tests/build_rv64_gcc_allmodconfig.sh
conchuod/patch-3-test-4 success .github/scripts/patches/tests/build_rv64_nommu_k210_defconfig.sh
conchuod/patch-3-test-5 success .github/scripts/patches/tests/build_rv64_nommu_virt_defconfig.sh
conchuod/patch-3-test-6 success .github/scripts/patches/tests/checkpatch.sh
conchuod/patch-3-test-7 success .github/scripts/patches/tests/dtb_warn_rv64.sh
conchuod/patch-3-test-8 success .github/scripts/patches/tests/header_inline.sh
conchuod/patch-3-test-9 success .github/scripts/patches/tests/kdoc.sh
conchuod/patch-3-test-10 success .github/scripts/patches/tests/module_param.sh
conchuod/patch-3-test-11 success .github/scripts/patches/tests/verify_fixes.sh
conchuod/patch-3-test-12 success .github/scripts/patches/tests/verify_signedoff.sh

Commit Message

Xu, Haibo1 June 13, 2024, 8:54 a.m. UTC 
x86/arm64/loongarch would select ACPI_NUMA by default and riscv
would do the same thing, so change it to a hidden option and the
select statements except for the X86_64_ACPI_NUMA can also go away.

Suggested-by: Arnd Bergmann <arnd@arndb.de>
Suggested-by: Sunil V L <sunilvl@ventanamicro.com>
Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>
---
 arch/arm64/Kconfig        | 1 -
 arch/loongarch/Kconfig    | 1 -
 drivers/acpi/numa/Kconfig | 5 +----
 3 files changed, 1 insertion(+), 6 deletions(-)

Comments

Haibo Xu June 17, 2024, 1:34 p.m. UTC | #1 
@Catalin Marinas @Huacai Chen

Could you please have a look at this patch for the ACPI_NUMA config on
ARM64 and LOONGARCH respectively.

Thanks!

On Thu, Jun 13, 2024 at 4:37 PM Haibo Xu <haibo1.xu@intel.com> wrote:
>
> x86/arm64/loongarch would select ACPI_NUMA by default and riscv
> would do the same thing, so change it to a hidden option and the
> select statements except for the X86_64_ACPI_NUMA can also go away.
>
> Suggested-by: Arnd Bergmann <arnd@arndb.de>
> Suggested-by: Sunil V L <sunilvl@ventanamicro.com>
> Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
> Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>
> ---
>  arch/arm64/Kconfig        | 1 -
>  arch/loongarch/Kconfig    | 1 -
>  drivers/acpi/numa/Kconfig | 5 +----
>  3 files changed, 1 insertion(+), 6 deletions(-)
>
> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
> index 5d91259ee7b5..5079ad4e21a5 100644
> --- a/arch/arm64/Kconfig
> +++ b/arch/arm64/Kconfig
> @@ -1484,7 +1484,6 @@ config HOTPLUG_CPU
>  config NUMA
>         bool "NUMA Memory Allocation and Scheduler Support"
>         select GENERIC_ARCH_NUMA
> -       select ACPI_NUMA if ACPI
>         select OF_NUMA
>         select HAVE_SETUP_PER_CPU_AREA
>         select NEED_PER_CPU_EMBED_FIRST_CHUNK
> diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig
> index e38139c576ee..8d9e06e4ad84 100644
> --- a/arch/loongarch/Kconfig
> +++ b/arch/loongarch/Kconfig
> @@ -470,7 +470,6 @@ config NR_CPUS
>  config NUMA
>         bool "NUMA Support"
>         select SMP
> -       select ACPI_NUMA if ACPI
>         help
>           Say Y to compile the kernel with NUMA (Non-Uniform Memory Access)
>           support.  This option improves performance on systems with more
> diff --git a/drivers/acpi/numa/Kconfig b/drivers/acpi/numa/Kconfig
> index 849c2bd820b9..f33194d1e43f 100644
> --- a/drivers/acpi/numa/Kconfig
> +++ b/drivers/acpi/numa/Kconfig
> @@ -1,9 +1,6 @@
>  # SPDX-License-Identifier: GPL-2.0
>  config ACPI_NUMA
> -       bool "NUMA support"
> -       depends on NUMA
> -       depends on (X86 || ARM64 || LOONGARCH)
> -       default y if ARM64
> +       def_bool NUMA && !X86
>
>  config ACPI_HMAT
>         bool "ACPI Heterogeneous Memory Attribute Table Support"
> --
> 2.34.1
>
Will Deacon June 18, 2024, 3:18 p.m. UTC | #2 
On Mon, Jun 17, 2024 at 09:34:18PM +0800, Haibo Xu wrote:
> @Catalin Marinas @Huacai Chen
> 
> Could you please have a look at this patch for the ACPI_NUMA config on
> ARM64 and LOONGARCH respectively.
> 
> Thanks!
> 
> On Thu, Jun 13, 2024 at 4:37 PM Haibo Xu <haibo1.xu@intel.com> wrote:
> >
> > x86/arm64/loongarch would select ACPI_NUMA by default and riscv
> > would do the same thing, so change it to a hidden option and the
> > select statements except for the X86_64_ACPI_NUMA can also go away.
> >
> > Suggested-by: Arnd Bergmann <arnd@arndb.de>
> > Suggested-by: Sunil V L <sunilvl@ventanamicro.com>
> > Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
> > Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>
> > ---
> >  arch/arm64/Kconfig        | 1 -
> >  arch/loongarch/Kconfig    | 1 -
> >  drivers/acpi/numa/Kconfig | 5 +----
> >  3 files changed, 1 insertion(+), 6 deletions(-)

This looks fine from an arm64 perspective:

Acked-by: Will Deacon <will@kernel.org>

Will
Haibo Xu June 19, 2024, 1:17 a.m. UTC | #3 
On Tue, Jun 18, 2024 at 11:18 PM Will Deacon <will@kernel.org> wrote:
>
> On Mon, Jun 17, 2024 at 09:34:18PM +0800, Haibo Xu wrote:
> > @Catalin Marinas @Huacai Chen
> >
> > Could you please have a look at this patch for the ACPI_NUMA config on
> > ARM64 and LOONGARCH respectively.
> >
> > Thanks!
> >
> > On Thu, Jun 13, 2024 at 4:37 PM Haibo Xu <haibo1.xu@intel.com> wrote:
> > >
> > > x86/arm64/loongarch would select ACPI_NUMA by default and riscv
> > > would do the same thing, so change it to a hidden option and the
> > > select statements except for the X86_64_ACPI_NUMA can also go away.
> > >
> > > Suggested-by: Arnd Bergmann <arnd@arndb.de>
> > > Suggested-by: Sunil V L <sunilvl@ventanamicro.com>
> > > Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
> > > Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>
> > > ---
> > >  arch/arm64/Kconfig        | 1 -
> > >  arch/loongarch/Kconfig    | 1 -
> > >  drivers/acpi/numa/Kconfig | 5 +----
> > >  3 files changed, 1 insertion(+), 6 deletions(-)
>
> This looks fine from an arm64 perspective:
>
> Acked-by: Will Deacon <will@kernel.org>
>

Thank you, Will!

> Will
Huacai Chen June 19, 2024, 2:24 a.m. UTC | #4 
On Wed, Jun 19, 2024 at 9:18 AM Haibo Xu <xiaobo55x@gmail.com> wrote:
>
> On Tue, Jun 18, 2024 at 11:18 PM Will Deacon <will@kernel.org> wrote:
> >
> > On Mon, Jun 17, 2024 at 09:34:18PM +0800, Haibo Xu wrote:
> > > @Catalin Marinas @Huacai Chen
> > >
> > > Could you please have a look at this patch for the ACPI_NUMA config on
> > > ARM64 and LOONGARCH respectively.
> > >
> > > Thanks!
> > >
> > > On Thu, Jun 13, 2024 at 4:37 PM Haibo Xu <haibo1.xu@intel.com> wrote:
> > > >
> > > > x86/arm64/loongarch would select ACPI_NUMA by default and riscv
> > > > would do the same thing, so change it to a hidden option and the
> > > > select statements except for the X86_64_ACPI_NUMA can also go away.
> > > >
> > > > Suggested-by: Arnd Bergmann <arnd@arndb.de>
> > > > Suggested-by: Sunil V L <sunilvl@ventanamicro.com>
> > > > Signed-off-by: Haibo Xu <haibo1.xu@intel.com>
> > > > Reviewed-by: Sunil V L <sunilvl@ventanamicro.com>
> > > > ---
> > > >  arch/arm64/Kconfig        | 1 -
> > > >  arch/loongarch/Kconfig    | 1 -
> > > >  drivers/acpi/numa/Kconfig | 5 +----
> > > >  3 files changed, 1 insertion(+), 6 deletions(-)
> >
> > This looks fine from an arm64 perspective:
> >
> > Acked-by: Will Deacon <will@kernel.org>
Looks fine for LoongArch:

Acked-by: Huacai Chen <chenhuacai@loongson.cn>
> >
>
> Thank you, Will!
>
> > Will
diff mbox series

Patch

diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 5d91259ee7b5..5079ad4e21a5 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -1484,7 +1484,6 @@  config HOTPLUG_CPU
 config NUMA
 	bool "NUMA Memory Allocation and Scheduler Support"
 	select GENERIC_ARCH_NUMA
-	select ACPI_NUMA if ACPI
 	select OF_NUMA
 	select HAVE_SETUP_PER_CPU_AREA
 	select NEED_PER_CPU_EMBED_FIRST_CHUNK
diff --git a/arch/loongarch/Kconfig b/arch/loongarch/Kconfig
index e38139c576ee..8d9e06e4ad84 100644
--- a/arch/loongarch/Kconfig
+++ b/arch/loongarch/Kconfig
@@ -470,7 +470,6 @@  config NR_CPUS
 config NUMA
 	bool "NUMA Support"
 	select SMP
-	select ACPI_NUMA if ACPI
 	help
 	  Say Y to compile the kernel with NUMA (Non-Uniform Memory Access)
 	  support.  This option improves performance on systems with more
diff --git a/drivers/acpi/numa/Kconfig b/drivers/acpi/numa/Kconfig
index 849c2bd820b9..f33194d1e43f 100644
--- a/drivers/acpi/numa/Kconfig
+++ b/drivers/acpi/numa/Kconfig
@@ -1,9 +1,6 @@ 
 # SPDX-License-Identifier: GPL-2.0
 config ACPI_NUMA
-	bool "NUMA support"
-	depends on NUMA
-	depends on (X86 || ARM64 || LOONGARCH)
-	default y if ARM64
+	def_bool NUMA && !X86
 
 config ACPI_HMAT
 	bool "ACPI Heterogeneous Memory Attribute Table Support"