* Re: [PATCH] mm: generalize ZONE_[DMA|DMA32]
2021-05-27 14:30 [PATCH] mm: generalize ZONE_[DMA|DMA32] Kefeng Wang
@ 2021-05-27 14:26 ` Geert Uytterhoeven
2021-05-27 15:13 ` Mike Rapoport
` (3 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Geert Uytterhoeven @ 2021-05-27 14:26 UTC (permalink / raw)
To: Kefeng Wang
Cc: Andrew Morton, alpha, Linux ARM, linux-ia64, linux-m68k,
open list:BROADCOM NVRAM DRIVER, linuxppc-dev, linux-riscv,
linux-s390, sparclinux, Linux MM, Catalin Marinas, Will Deacon,
Thomas Bogendoerfer, David S. Miller, Ingo Molnar,
Borislav Petkov, Palmer Dabbelt, Richard Henderson, Russell King
On Thu, May 27, 2021 at 4:21 PM Kefeng Wang <wangkefeng.wang@huawei.com> wrote:
> ZONE_[DMA|DMA32] configs have duplicate definitions on platforms
> that subscribe them. Instead, just make them generic options which
> can be selected on applicable platforms.
>
> Also only x86/arm64 architectures could enable both ZONE_DMA and
> ZONE_DMA32 if EXPERT, add ARCH_HAS_ZONE_DMA_SET to make dma zone
> configurable and visible on the two architectures.
>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: Palmer Dabbelt <palmer@dabbelt.com>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Russell King <linux@armlinux.org.uk>
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> arch/m68k/Kconfig | 5 +----
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org>
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH] mm: generalize ZONE_[DMA|DMA32]
@ 2021-05-27 14:30 Kefeng Wang
2021-05-27 14:26 ` Geert Uytterhoeven
` (4 more replies)
0 siblings, 5 replies; 9+ messages in thread
From: Kefeng Wang @ 2021-05-27 14:30 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-alpha, linux-arm-kernel, linux-ia64, linux-m68k,
linux-mips, linuxppc-dev, linux-riscv, linux-s390, sparclinux,
linux-mm, Kefeng Wang, Catalin Marinas, Will Deacon,
Geert Uytterhoeven, Thomas Bogendoerfer, David S. Miller,
Ingo Molnar, Borislav Petkov, Palmer Dabbelt, Richard Henderson,
Russell King
ZONE_[DMA|DMA32] configs have duplicate definitions on platforms
that subscribe them. Instead, just make them generic options which
can be selected on applicable platforms.
Also only x86/arm64 architectures could enable both ZONE_DMA and
ZONE_DMA32 if EXPERT, add ARCH_HAS_ZONE_DMA_SET to make dma zone
configurable and visible on the two architectures.
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Russell King <linux@armlinux.org.uk>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
arch/alpha/Kconfig | 5 +----
arch/arm/Kconfig | 3 ---
arch/arm64/Kconfig | 9 +--------
arch/ia64/Kconfig | 4 +---
arch/m68k/Kconfig | 5 +----
arch/microblaze/Kconfig | 4 +---
arch/mips/Kconfig | 7 -------
arch/powerpc/Kconfig | 4 ----
arch/powerpc/platforms/Kconfig.cputype | 1 +
arch/riscv/Kconfig | 5 +----
arch/s390/Kconfig | 4 +---
arch/sparc/Kconfig | 5 +----
arch/x86/Kconfig | 15 ++-------------
mm/Kconfig | 11 +++++++++++
14 files changed, 22 insertions(+), 60 deletions(-)
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 5998106faa60..6a69a14c4825 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -40,6 +40,7 @@ config ALPHA
select MMU_GATHER_NO_RANGE
select SET_FS
select SPARSEMEM_EXTREME if SPARSEMEM
+ select ZONE_DMA
help
The Alpha is a 64-bit general-purpose processor designed and
marketed by the Digital Equipment Corporation of blessed memory,
@@ -65,10 +66,6 @@ config GENERIC_CALIBRATE_DELAY
bool
default y
-config ZONE_DMA
- bool
- default y
-
config GENERIC_ISA_DMA
bool
default y
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 24804f11302d..000c3f80b58e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -218,9 +218,6 @@ config GENERIC_CALIBRATE_DELAY
config ARCH_MAY_HAVE_PC_FDC
bool
-config ZONE_DMA
- bool
-
config ARCH_SUPPORTS_UPROBES
def_bool y
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 9f1d8566bbf9..42794474f37f 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -42,6 +42,7 @@ config ARM64
select ARCH_HAS_SYSCALL_WRAPPER
select ARCH_HAS_TEARDOWN_DMA_OPS if IOMMU_SUPPORT
select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
+ select ARCH_HAS_ZONE_DMA_SET if EXPERT
select ARCH_HAVE_ELF_PROT
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select ARCH_INLINE_READ_LOCK if !PREEMPTION
@@ -307,14 +308,6 @@ config GENERIC_CSUM
config GENERIC_CALIBRATE_DELAY
def_bool y
-config ZONE_DMA
- bool "Support DMA zone" if EXPERT
- default y
-
-config ZONE_DMA32
- bool "Support DMA32 zone" if EXPERT
- default y
-
config ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE
def_bool y
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 279252e3e0f7..fd8503a0088a 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -60,6 +60,7 @@ config IA64
select NUMA if !FLATMEM
select PCI_MSI_ARCH_FALLBACKS if PCI_MSI
select SET_FS
+ select ZONE_DMA32
default y
help
The Itanium Processor Family is Intel's 64-bit successor to
@@ -72,9 +73,6 @@ config 64BIT
select ATA_NONSTANDARD if ATA
default y
-config ZONE_DMA32
- def_bool y
-
config MMU
bool
default y
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 372e4e69c43a..05a729c6ad7f 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -34,6 +34,7 @@ config M68K
select SET_FS
select UACCESS_MEMCPY if !MMU
select VIRT_TO_BUS
+ select ZONE_DMA
config CPU_BIG_ENDIAN
def_bool y
@@ -62,10 +63,6 @@ config TIME_LOW_RES
config NO_IOPORT_MAP
def_bool y
-config ZONE_DMA
- bool
- default y
-
config HZ
int
default 1000 if CLEOPATRA
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 0660f47012bc..14a67a42fcae 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -43,6 +43,7 @@ config MICROBLAZE
select MMU_GATHER_NO_RANGE
select SPARSE_IRQ
select SET_FS
+ select ZONE_DMA
# Endianness selection
choice
@@ -60,9 +61,6 @@ config CPU_LITTLE_ENDIAN
endchoice
-config ZONE_DMA
- def_bool y
-
config ARCH_HAS_ILOG2_U32
def_bool n
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ed51970c08e7..430d5324f1af 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -3277,13 +3277,6 @@ config I8253
select CLKSRC_I8253
select CLKEVT_I8253
select MIPS_EXTERNAL_TIMER
-
-config ZONE_DMA
- bool
-
-config ZONE_DMA32
- bool
-
endmenu
config TRAD_SIGNALS
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 088dd2afcfe4..0f78bb383a12 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -403,10 +403,6 @@ config PPC_ADV_DEBUG_DAC_RANGE
config PPC_DAWR
bool
-config ZONE_DMA
- bool
- default y if PPC_BOOK3E_64
-
config PGTABLE_LEVELS
int
default 2 if !PPC64
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index f998e655b570..7d271de8fcbd 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -111,6 +111,7 @@ config PPC_BOOK3E_64
select PPC_FPU # Make it a choice ?
select PPC_SMP_MUXED_IPI
select PPC_DOORBELL
+ select ZONE_DMA
endchoice
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index a8ad8eb76120..d29643dee126 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -103,6 +103,7 @@ config RISCV
select SYSCTL_EXCEPTION_TRACE
select THREAD_INFO_IN_TASK
select UACCESS_MEMCPY if !MMU
+ select ZONE_DMA32 if 64BIT
config ARCH_MMAP_RND_BITS_MIN
default 18 if 64BIT
@@ -132,10 +133,6 @@ config MMU
Select if you want MMU-based virtualised addressing space
support by paged memory management. If unsure, say 'Y'.
-config ZONE_DMA32
- bool
- default y if 64BIT
-
config VA_BITS
int
default 32 if 32BIT
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index b4c7c34069f8..daab9d56957a 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -2,9 +2,6 @@
config MMU
def_bool y
-config ZONE_DMA
- def_bool y
-
config CPU_BIG_ENDIAN
def_bool y
@@ -210,6 +207,7 @@ config S390
select THREAD_INFO_IN_TASK
select TTY
select VIRT_CPU_ACCOUNTING
+ select ZONE_DMA
# Note: keep the above list sorted alphabetically
config SCHED_OMIT_FRAME_POINTER
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 164a5254c91c..39679664cc9a 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -59,6 +59,7 @@ config SPARC32
select CLZ_TAB
select HAVE_UID16
select OLD_SIGACTION
+ select ZONE_DMA
config SPARC64
def_bool 64BIT
@@ -141,10 +142,6 @@ config HIGHMEM
default y if SPARC32
select KMAP_LOCAL
-config ZONE_DMA
- bool
- default y if SPARC32
-
config GENERIC_ISA_DMA
bool
default y if SPARC32
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0045e1b44190..11cf8a0d6800 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -33,6 +33,7 @@ config X86_64
select NEED_DMA_MAP_STATE
select SWIOTLB
select ARCH_HAS_ELFCORE_COMPAT
+ select ZONE_DMA32
config FORCE_DYNAMIC_FTRACE
def_bool y
@@ -93,6 +94,7 @@ config X86
select ARCH_HAS_SYSCALL_WRAPPER
select ARCH_HAS_UBSAN_SANITIZE_ALL
select ARCH_HAS_DEBUG_WX
+ select ARCH_HAS_ZONE_DMA_SET if EXPERT
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
select ARCH_MIGHT_HAVE_PC_PARPORT
@@ -343,9 +345,6 @@ config ARCH_SUSPEND_POSSIBLE
config ARCH_WANT_GENERAL_HUGETLB
def_bool y
-config ZONE_DMA32
- def_bool y if X86_64
-
config AUDIT_ARCH
def_bool y if X86_64
@@ -393,16 +392,6 @@ config CC_HAS_SANE_STACKPROTECTOR
menu "Processor type and features"
-config ZONE_DMA
- bool "DMA memory allocation support" if EXPERT
- default y
- help
- DMA memory allocation support allows devices with less than 32-bit
- addressing to allocate within the first 16MB of address space.
- Disable if no such devices will be used.
-
- If unsure, say Y.
-
config SMP
bool "Symmetric multi-processing support"
help
diff --git a/mm/Kconfig b/mm/Kconfig
index 02d44e3420f5..68b0cbdc7968 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -789,6 +789,17 @@ config ARCH_HAS_CACHE_LINE_SIZE
config ARCH_HAS_PTE_DEVMAP
bool
+config ARCH_HAS_ZONE_DMA_SET
+ bool
+
+config ZONE_DMA
+ bool "Support DMA zone" if ARCH_HAS_ZONE_DMA_SET
+ default y if ARM64
+
+config ZONE_DMA32
+ bool "Support DMA32 zone" if ARCH_HAS_ZONE_DMA_SET
+ default y if ARM64
+
config ZONE_DEVICE
bool "Device memory (pmem, HMM, etc...) hotplug support"
depends on MEMORY_HOTPLUG
--
2.26.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH] mm: generalize ZONE_[DMA|DMA32]
2021-05-27 14:30 [PATCH] mm: generalize ZONE_[DMA|DMA32] Kefeng Wang
2021-05-27 14:26 ` Geert Uytterhoeven
@ 2021-05-27 15:13 ` Mike Rapoport
2021-05-27 17:06 ` kernel test robot
` (2 subsequent siblings)
4 siblings, 0 replies; 9+ messages in thread
From: Mike Rapoport @ 2021-05-27 15:13 UTC (permalink / raw)
To: Kefeng Wang
Cc: Andrew Morton, linux-alpha, linux-arm-kernel, linux-ia64,
linux-m68k, linux-mips, linuxppc-dev, linux-riscv, linux-s390,
sparclinux, linux-mm, Catalin Marinas, Will Deacon,
Geert Uytterhoeven, Thomas Bogendoerfer, David S. Miller,
Ingo Molnar, Borislav Petkov, Palmer Dabbelt, Richard Henderson,
Russell King
On Thu, May 27, 2021 at 10:30:47PM +0800, Kefeng Wang wrote:
> ZONE_[DMA|DMA32] configs have duplicate definitions on platforms
> that subscribe them. Instead, just make them generic options which
> can be selected on applicable platforms.
>
> Also only x86/arm64 architectures could enable both ZONE_DMA and
> ZONE_DMA32 if EXPERT, add ARCH_HAS_ZONE_DMA_SET to make dma zone
> configurable and visible on the two architectures.
>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: Palmer Dabbelt <palmer@dabbelt.com>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Russell King <linux@armlinux.org.uk>
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Acked-by: Mike Rapoport <rppt@linux.ibm.com>
> ---
> arch/alpha/Kconfig | 5 +----
> arch/arm/Kconfig | 3 ---
> arch/arm64/Kconfig | 9 +--------
> arch/ia64/Kconfig | 4 +---
> arch/m68k/Kconfig | 5 +----
> arch/microblaze/Kconfig | 4 +---
> arch/mips/Kconfig | 7 -------
> arch/powerpc/Kconfig | 4 ----
> arch/powerpc/platforms/Kconfig.cputype | 1 +
> arch/riscv/Kconfig | 5 +----
> arch/s390/Kconfig | 4 +---
> arch/sparc/Kconfig | 5 +----
> arch/x86/Kconfig | 15 ++-------------
> mm/Kconfig | 11 +++++++++++
> 14 files changed, 22 insertions(+), 60 deletions(-)
>
> diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
> index 5998106faa60..6a69a14c4825 100644
> --- a/arch/alpha/Kconfig
> +++ b/arch/alpha/Kconfig
> @@ -40,6 +40,7 @@ config ALPHA
> select MMU_GATHER_NO_RANGE
> select SET_FS
> select SPARSEMEM_EXTREME if SPARSEMEM
> + select ZONE_DMA
> help
> The Alpha is a 64-bit general-purpose processor designed and
> marketed by the Digital Equipment Corporation of blessed memory,
> @@ -65,10 +66,6 @@ config GENERIC_CALIBRATE_DELAY
> bool
> default y
>
> -config ZONE_DMA
> - bool
> - default y
> -
> config GENERIC_ISA_DMA
> bool
> default y
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 24804f11302d..000c3f80b58e 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -218,9 +218,6 @@ config GENERIC_CALIBRATE_DELAY
> config ARCH_MAY_HAVE_PC_FDC
> bool
>
> -config ZONE_DMA
> - bool
> -
> config ARCH_SUPPORTS_UPROBES
> def_bool y
>
> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
> index 9f1d8566bbf9..42794474f37f 100644
> --- a/arch/arm64/Kconfig
> +++ b/arch/arm64/Kconfig
> @@ -42,6 +42,7 @@ config ARM64
> select ARCH_HAS_SYSCALL_WRAPPER
> select ARCH_HAS_TEARDOWN_DMA_OPS if IOMMU_SUPPORT
> select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
> + select ARCH_HAS_ZONE_DMA_SET if EXPERT
> select ARCH_HAVE_ELF_PROT
> select ARCH_HAVE_NMI_SAFE_CMPXCHG
> select ARCH_INLINE_READ_LOCK if !PREEMPTION
> @@ -307,14 +308,6 @@ config GENERIC_CSUM
> config GENERIC_CALIBRATE_DELAY
> def_bool y
>
> -config ZONE_DMA
> - bool "Support DMA zone" if EXPERT
> - default y
> -
> -config ZONE_DMA32
> - bool "Support DMA32 zone" if EXPERT
> - default y
> -
> config ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE
> def_bool y
>
> diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
> index 279252e3e0f7..fd8503a0088a 100644
> --- a/arch/ia64/Kconfig
> +++ b/arch/ia64/Kconfig
> @@ -60,6 +60,7 @@ config IA64
> select NUMA if !FLATMEM
> select PCI_MSI_ARCH_FALLBACKS if PCI_MSI
> select SET_FS
> + select ZONE_DMA32
> default y
> help
> The Itanium Processor Family is Intel's 64-bit successor to
> @@ -72,9 +73,6 @@ config 64BIT
> select ATA_NONSTANDARD if ATA
> default y
>
> -config ZONE_DMA32
> - def_bool y
> -
> config MMU
> bool
> default y
> diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
> index 372e4e69c43a..05a729c6ad7f 100644
> --- a/arch/m68k/Kconfig
> +++ b/arch/m68k/Kconfig
> @@ -34,6 +34,7 @@ config M68K
> select SET_FS
> select UACCESS_MEMCPY if !MMU
> select VIRT_TO_BUS
> + select ZONE_DMA
>
> config CPU_BIG_ENDIAN
> def_bool y
> @@ -62,10 +63,6 @@ config TIME_LOW_RES
> config NO_IOPORT_MAP
> def_bool y
>
> -config ZONE_DMA
> - bool
> - default y
> -
> config HZ
> int
> default 1000 if CLEOPATRA
> diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
> index 0660f47012bc..14a67a42fcae 100644
> --- a/arch/microblaze/Kconfig
> +++ b/arch/microblaze/Kconfig
> @@ -43,6 +43,7 @@ config MICROBLAZE
> select MMU_GATHER_NO_RANGE
> select SPARSE_IRQ
> select SET_FS
> + select ZONE_DMA
>
> # Endianness selection
> choice
> @@ -60,9 +61,6 @@ config CPU_LITTLE_ENDIAN
>
> endchoice
>
> -config ZONE_DMA
> - def_bool y
> -
> config ARCH_HAS_ILOG2_U32
> def_bool n
>
> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> index ed51970c08e7..430d5324f1af 100644
> --- a/arch/mips/Kconfig
> +++ b/arch/mips/Kconfig
> @@ -3277,13 +3277,6 @@ config I8253
> select CLKSRC_I8253
> select CLKEVT_I8253
> select MIPS_EXTERNAL_TIMER
> -
> -config ZONE_DMA
> - bool
> -
> -config ZONE_DMA32
> - bool
> -
> endmenu
>
> config TRAD_SIGNALS
> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
> index 088dd2afcfe4..0f78bb383a12 100644
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@ -403,10 +403,6 @@ config PPC_ADV_DEBUG_DAC_RANGE
> config PPC_DAWR
> bool
>
> -config ZONE_DMA
> - bool
> - default y if PPC_BOOK3E_64
> -
> config PGTABLE_LEVELS
> int
> default 2 if !PPC64
> diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
> index f998e655b570..7d271de8fcbd 100644
> --- a/arch/powerpc/platforms/Kconfig.cputype
> +++ b/arch/powerpc/platforms/Kconfig.cputype
> @@ -111,6 +111,7 @@ config PPC_BOOK3E_64
> select PPC_FPU # Make it a choice ?
> select PPC_SMP_MUXED_IPI
> select PPC_DOORBELL
> + select ZONE_DMA
>
> endchoice
>
> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> index a8ad8eb76120..d29643dee126 100644
> --- a/arch/riscv/Kconfig
> +++ b/arch/riscv/Kconfig
> @@ -103,6 +103,7 @@ config RISCV
> select SYSCTL_EXCEPTION_TRACE
> select THREAD_INFO_IN_TASK
> select UACCESS_MEMCPY if !MMU
> + select ZONE_DMA32 if 64BIT
>
> config ARCH_MMAP_RND_BITS_MIN
> default 18 if 64BIT
> @@ -132,10 +133,6 @@ config MMU
> Select if you want MMU-based virtualised addressing space
> support by paged memory management. If unsure, say 'Y'.
>
> -config ZONE_DMA32
> - bool
> - default y if 64BIT
> -
> config VA_BITS
> int
> default 32 if 32BIT
> diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
> index b4c7c34069f8..daab9d56957a 100644
> --- a/arch/s390/Kconfig
> +++ b/arch/s390/Kconfig
> @@ -2,9 +2,6 @@
> config MMU
> def_bool y
>
> -config ZONE_DMA
> - def_bool y
> -
> config CPU_BIG_ENDIAN
> def_bool y
>
> @@ -210,6 +207,7 @@ config S390
> select THREAD_INFO_IN_TASK
> select TTY
> select VIRT_CPU_ACCOUNTING
> + select ZONE_DMA
> # Note: keep the above list sorted alphabetically
>
> config SCHED_OMIT_FRAME_POINTER
> diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
> index 164a5254c91c..39679664cc9a 100644
> --- a/arch/sparc/Kconfig
> +++ b/arch/sparc/Kconfig
> @@ -59,6 +59,7 @@ config SPARC32
> select CLZ_TAB
> select HAVE_UID16
> select OLD_SIGACTION
> + select ZONE_DMA
>
> config SPARC64
> def_bool 64BIT
> @@ -141,10 +142,6 @@ config HIGHMEM
> default y if SPARC32
> select KMAP_LOCAL
>
> -config ZONE_DMA
> - bool
> - default y if SPARC32
> -
> config GENERIC_ISA_DMA
> bool
> default y if SPARC32
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index 0045e1b44190..11cf8a0d6800 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -33,6 +33,7 @@ config X86_64
> select NEED_DMA_MAP_STATE
> select SWIOTLB
> select ARCH_HAS_ELFCORE_COMPAT
> + select ZONE_DMA32
>
> config FORCE_DYNAMIC_FTRACE
> def_bool y
> @@ -93,6 +94,7 @@ config X86
> select ARCH_HAS_SYSCALL_WRAPPER
> select ARCH_HAS_UBSAN_SANITIZE_ALL
> select ARCH_HAS_DEBUG_WX
> + select ARCH_HAS_ZONE_DMA_SET if EXPERT
> select ARCH_HAVE_NMI_SAFE_CMPXCHG
> select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
> select ARCH_MIGHT_HAVE_PC_PARPORT
> @@ -343,9 +345,6 @@ config ARCH_SUSPEND_POSSIBLE
> config ARCH_WANT_GENERAL_HUGETLB
> def_bool y
>
> -config ZONE_DMA32
> - def_bool y if X86_64
> -
> config AUDIT_ARCH
> def_bool y if X86_64
>
> @@ -393,16 +392,6 @@ config CC_HAS_SANE_STACKPROTECTOR
>
> menu "Processor type and features"
>
> -config ZONE_DMA
> - bool "DMA memory allocation support" if EXPERT
> - default y
> - help
> - DMA memory allocation support allows devices with less than 32-bit
> - addressing to allocate within the first 16MB of address space.
> - Disable if no such devices will be used.
> -
> - If unsure, say Y.
> -
> config SMP
> bool "Symmetric multi-processing support"
> help
> diff --git a/mm/Kconfig b/mm/Kconfig
> index 02d44e3420f5..68b0cbdc7968 100644
> --- a/mm/Kconfig
> +++ b/mm/Kconfig
> @@ -789,6 +789,17 @@ config ARCH_HAS_CACHE_LINE_SIZE
> config ARCH_HAS_PTE_DEVMAP
> bool
>
> +config ARCH_HAS_ZONE_DMA_SET
> + bool
> +
> +config ZONE_DMA
> + bool "Support DMA zone" if ARCH_HAS_ZONE_DMA_SET
> + default y if ARM64
> +
> +config ZONE_DMA32
> + bool "Support DMA32 zone" if ARCH_HAS_ZONE_DMA_SET
> + default y if ARM64
> +
> config ZONE_DEVICE
> bool "Device memory (pmem, HMM, etc...) hotplug support"
> depends on MEMORY_HOTPLUG
> --
> 2.26.2
>
>
> _______________________________________________
> linux-riscv mailing list
> linux-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-riscv
--
Sincerely yours,
Mike.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] mm: generalize ZONE_[DMA|DMA32]
2021-05-27 14:30 [PATCH] mm: generalize ZONE_[DMA|DMA32] Kefeng Wang
2021-05-27 14:26 ` Geert Uytterhoeven
2021-05-27 15:13 ` Mike Rapoport
@ 2021-05-27 17:06 ` kernel test robot
2021-05-27 17:43 ` Catalin Marinas
2021-05-28 7:45 ` [PATCH v2] " Kefeng Wang
4 siblings, 0 replies; 9+ messages in thread
From: kernel test robot @ 2021-05-27 17:06 UTC (permalink / raw)
To: Kefeng Wang, Andrew Morton
Cc: kbuild-all, Linux Memory Management List, linux-alpha,
linux-arm-kernel, linux-ia64, linux-m68k, linux-mips,
linuxppc-dev, linux-riscv, linux-s390
[-- Attachment #1: Type: text/plain, Size: 6084 bytes --]
Hi Kefeng,
Thank you for the patch! Yet something to improve:
[auto build test ERROR on powerpc/next]
[also build test ERROR on arm64/for-next/core m68k/for-next s390/features linus/master v5.13-rc3]
[cannot apply to hnaz-linux-mm/master tip/x86/core sparc-next/master sparc/master next-20210527]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch]
url: https://github.com/0day-ci/linux/commits/Kefeng-Wang/mm-generalize-ZONE_-DMA-DMA32/20210527-222334
base: https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git next
config: i386-allyesconfig (attached as .config)
compiler: gcc-9 (Debian 9.3.0-22) 9.3.0
reproduce (this is a W=1 build):
# https://github.com/0day-ci/linux/commit/de626453e50ab17adeffd9602e997b4b67b80eb2
git remote add linux-review https://github.com/0day-ci/linux
git fetch --no-tags linux-review Kefeng-Wang/mm-generalize-ZONE_-DMA-DMA32/20210527-222334
git checkout de626453e50ab17adeffd9602e997b4b67b80eb2
# save the attached .config to linux build tree
make W=1 ARCH=i386
If you fix the issue, kindly add following tag as appropriate
Reported-by: kernel test robot <lkp@intel.com>
All error/warnings (new ones prefixed by >>):
In file included from include/linux/slab.h:15,
from include/linux/crypto.h:20,
from arch/x86/kernel/asm-offsets.c:9:
>> include/linux/gfp.h:433:2: error: #error GFP_ZONES_SHIFT too large to create GFP_ZONE_TABLE integer
433 | #error GFP_ZONES_SHIFT too large to create GFP_ZONE_TABLE integer
| ^~~~~
include/linux/gfp.h: In function 'gfp_zone':
>> include/linux/gfp.h:444:20: warning: left shift count >= width of type [-Wshift-count-overflow]
444 | | (OPT_ZONE_DMA32 << (___GFP_MOVABLE | ___GFP_DMA32) * GFP_ZONES_SHIFT)\
| ^~
include/linux/gfp.h:469:7: note: in expansion of macro 'GFP_ZONE_TABLE'
469 | z = (GFP_ZONE_TABLE >> (bit * GFP_ZONES_SHIFT)) &
| ^~~~~~~~~~~~~~
--
In file included from include/linux/slab.h:15,
from include/linux/crypto.h:20,
from arch/x86/kernel/asm-offsets.c:9:
>> include/linux/gfp.h:433:2: error: #error GFP_ZONES_SHIFT too large to create GFP_ZONE_TABLE integer
433 | #error GFP_ZONES_SHIFT too large to create GFP_ZONE_TABLE integer
| ^~~~~
include/linux/gfp.h: In function 'gfp_zone':
>> include/linux/gfp.h:444:20: warning: left shift count >= width of type [-Wshift-count-overflow]
444 | | (OPT_ZONE_DMA32 << (___GFP_MOVABLE | ___GFP_DMA32) * GFP_ZONES_SHIFT)\
| ^~
include/linux/gfp.h:469:7: note: in expansion of macro 'GFP_ZONE_TABLE'
469 | z = (GFP_ZONE_TABLE >> (bit * GFP_ZONES_SHIFT)) &
| ^~~~~~~~~~~~~~
make[2]: *** [scripts/Makefile.build:117: arch/x86/kernel/asm-offsets.s] Error 1
make[2]: Target '__build' not remade because of errors.
make[1]: *** [Makefile:1227: prepare0] Error 2
make[1]: Target 'modules_prepare' not remade because of errors.
make: *** [Makefile:215: __sub-make] Error 2
make: Target 'modules_prepare' not remade because of errors.
--
In file included from include/linux/slab.h:15,
from include/linux/crypto.h:20,
from arch/x86/kernel/asm-offsets.c:9:
>> include/linux/gfp.h:433:2: error: #error GFP_ZONES_SHIFT too large to create GFP_ZONE_TABLE integer
433 | #error GFP_ZONES_SHIFT too large to create GFP_ZONE_TABLE integer
| ^~~~~
include/linux/gfp.h: In function 'gfp_zone':
>> include/linux/gfp.h:444:20: warning: left shift count >= width of type [-Wshift-count-overflow]
444 | | (OPT_ZONE_DMA32 << (___GFP_MOVABLE | ___GFP_DMA32) * GFP_ZONES_SHIFT)\
| ^~
include/linux/gfp.h:469:7: note: in expansion of macro 'GFP_ZONE_TABLE'
469 | z = (GFP_ZONE_TABLE >> (bit * GFP_ZONES_SHIFT)) &
| ^~~~~~~~~~~~~~
make[2]: *** [scripts/Makefile.build:117: arch/x86/kernel/asm-offsets.s] Error 1
make[2]: Target '__build' not remade because of errors.
make[1]: *** [Makefile:1227: prepare0] Error 2
make[1]: Target 'prepare' not remade because of errors.
make: *** [Makefile:215: __sub-make] Error 2
make: Target 'prepare' not remade because of errors.
vim +433 include/linux/gfp.h
b11a7b94100cba Dan Williams 2016-03-17 431
b11a7b94100cba Dan Williams 2016-03-17 432 #if 16 * GFP_ZONES_SHIFT > BITS_PER_LONG
b11a7b94100cba Dan Williams 2016-03-17 @433 #error GFP_ZONES_SHIFT too large to create GFP_ZONE_TABLE integer
b70d94ee438b3f Christoph Lameter 2009-06-16 434 #endif
b70d94ee438b3f Christoph Lameter 2009-06-16 435
b70d94ee438b3f Christoph Lameter 2009-06-16 436 #define GFP_ZONE_TABLE ( \
b11a7b94100cba Dan Williams 2016-03-17 437 (ZONE_NORMAL << 0 * GFP_ZONES_SHIFT) \
b11a7b94100cba Dan Williams 2016-03-17 438 | (OPT_ZONE_DMA << ___GFP_DMA * GFP_ZONES_SHIFT) \
b11a7b94100cba Dan Williams 2016-03-17 439 | (OPT_ZONE_HIGHMEM << ___GFP_HIGHMEM * GFP_ZONES_SHIFT) \
b11a7b94100cba Dan Williams 2016-03-17 440 | (OPT_ZONE_DMA32 << ___GFP_DMA32 * GFP_ZONES_SHIFT) \
b11a7b94100cba Dan Williams 2016-03-17 441 | (ZONE_NORMAL << ___GFP_MOVABLE * GFP_ZONES_SHIFT) \
b11a7b94100cba Dan Williams 2016-03-17 442 | (OPT_ZONE_DMA << (___GFP_MOVABLE | ___GFP_DMA) * GFP_ZONES_SHIFT) \
b11a7b94100cba Dan Williams 2016-03-17 443 | (ZONE_MOVABLE << (___GFP_MOVABLE | ___GFP_HIGHMEM) * GFP_ZONES_SHIFT)\
b11a7b94100cba Dan Williams 2016-03-17 @444 | (OPT_ZONE_DMA32 << (___GFP_MOVABLE | ___GFP_DMA32) * GFP_ZONES_SHIFT)\
b70d94ee438b3f Christoph Lameter 2009-06-16 445 )
b70d94ee438b3f Christoph Lameter 2009-06-16 446
---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all@lists.01.org
[-- Attachment #2: .config.gz --]
[-- Type: application/gzip, Size: 65250 bytes --]
[-- Attachment #3: Type: text/plain, Size: 176 bytes --]
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH] mm: generalize ZONE_[DMA|DMA32]
2021-05-27 14:30 [PATCH] mm: generalize ZONE_[DMA|DMA32] Kefeng Wang
` (2 preceding siblings ...)
2021-05-27 17:06 ` kernel test robot
@ 2021-05-27 17:43 ` Catalin Marinas
2021-05-28 7:45 ` [PATCH v2] " Kefeng Wang
4 siblings, 0 replies; 9+ messages in thread
From: Catalin Marinas @ 2021-05-27 17:43 UTC (permalink / raw)
To: Kefeng Wang
Cc: Andrew Morton, linux-alpha, linux-arm-kernel, linux-ia64,
linux-m68k, linux-mips, linuxppc-dev, linux-riscv, linux-s390,
sparclinux, linux-mm, Will Deacon, Geert Uytterhoeven,
Thomas Bogendoerfer, David S. Miller, Ingo Molnar,
Borislav Petkov, Palmer Dabbelt, Richard Henderson, Russell King
On Thu, May 27, 2021 at 10:30:47PM +0800, Kefeng Wang wrote:
> ZONE_[DMA|DMA32] configs have duplicate definitions on platforms
> that subscribe them. Instead, just make them generic options which
> can be selected on applicable platforms.
>
> Also only x86/arm64 architectures could enable both ZONE_DMA and
> ZONE_DMA32 if EXPERT, add ARCH_HAS_ZONE_DMA_SET to make dma zone
> configurable and visible on the two architectures.
>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: Palmer Dabbelt <palmer@dabbelt.com>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Russell King <linux@armlinux.org.uk>
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
For arm64:
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* [PATCH v2] mm: generalize ZONE_[DMA|DMA32]
2021-05-27 14:30 [PATCH] mm: generalize ZONE_[DMA|DMA32] Kefeng Wang
` (3 preceding siblings ...)
2021-05-27 17:43 ` Catalin Marinas
@ 2021-05-28 7:45 ` Kefeng Wang
2021-05-29 23:51 ` Palmer Dabbelt
` (2 more replies)
4 siblings, 3 replies; 9+ messages in thread
From: Kefeng Wang @ 2021-05-28 7:45 UTC (permalink / raw)
To: Andrew Morton
Cc: linux-alpha, linux-arm-kernel, linux-ia64, linux-m68k,
linux-mips, linuxppc-dev, linux-riscv, linux-s390, sparclinux,
linux-mm, Kefeng Wang, Catalin Marinas, Will Deacon,
Geert Uytterhoeven, Thomas Bogendoerfer, David S. Miller,
Ingo Molnar, Borislav Petkov, Palmer Dabbelt, Richard Henderson,
Russell King, Mike Rapoport
ZONE_[DMA|DMA32] configs have duplicate definitions on platforms
that subscribe them. Instead, just make them generic options which
can be selected on applicable platforms.
Also only x86/arm64 architectures could enable both ZONE_DMA and
ZONE_DMA32 if EXPERT, add ARCH_HAS_ZONE_DMA_SET to make dma zone
configurable and visible on the two architectures.
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Will Deacon <will@kernel.org>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Palmer Dabbelt <palmer@dabbelt.com>
Cc: Richard Henderson <rth@twiddle.net>
Cc: Russell King <linux@armlinux.org.uk>
Acked-by: Catalin Marinas <catalin.marinas@arm.com> # for arm64
Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> # for m68k
Acked-by: Mike Rapoport <rppt@linux.ibm.com>
Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
---
v2:
-i386 can't enable ZONE_DMA32, fix it.
-make ZONE_DMA default y on X86 as before.
-collect ACKs
arch/alpha/Kconfig | 5 +----
arch/arm/Kconfig | 3 ---
arch/arm64/Kconfig | 9 +--------
arch/ia64/Kconfig | 4 +---
arch/m68k/Kconfig | 5 +----
arch/microblaze/Kconfig | 4 +---
arch/mips/Kconfig | 7 -------
arch/powerpc/Kconfig | 4 ----
arch/powerpc/platforms/Kconfig.cputype | 1 +
arch/riscv/Kconfig | 5 +----
arch/s390/Kconfig | 4 +---
arch/sparc/Kconfig | 5 +----
arch/x86/Kconfig | 15 ++-------------
mm/Kconfig | 12 ++++++++++++
14 files changed, 23 insertions(+), 60 deletions(-)
diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 5998106faa60..6a69a14c4825 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -40,6 +40,7 @@ config ALPHA
select MMU_GATHER_NO_RANGE
select SET_FS
select SPARSEMEM_EXTREME if SPARSEMEM
+ select ZONE_DMA
help
The Alpha is a 64-bit general-purpose processor designed and
marketed by the Digital Equipment Corporation of blessed memory,
@@ -65,10 +66,6 @@ config GENERIC_CALIBRATE_DELAY
bool
default y
-config ZONE_DMA
- bool
- default y
-
config GENERIC_ISA_DMA
bool
default y
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 24804f11302d..000c3f80b58e 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -218,9 +218,6 @@ config GENERIC_CALIBRATE_DELAY
config ARCH_MAY_HAVE_PC_FDC
bool
-config ZONE_DMA
- bool
-
config ARCH_SUPPORTS_UPROBES
def_bool y
diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
index 9f1d8566bbf9..42794474f37f 100644
--- a/arch/arm64/Kconfig
+++ b/arch/arm64/Kconfig
@@ -42,6 +42,7 @@ config ARM64
select ARCH_HAS_SYSCALL_WRAPPER
select ARCH_HAS_TEARDOWN_DMA_OPS if IOMMU_SUPPORT
select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
+ select ARCH_HAS_ZONE_DMA_SET if EXPERT
select ARCH_HAVE_ELF_PROT
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select ARCH_INLINE_READ_LOCK if !PREEMPTION
@@ -307,14 +308,6 @@ config GENERIC_CSUM
config GENERIC_CALIBRATE_DELAY
def_bool y
-config ZONE_DMA
- bool "Support DMA zone" if EXPERT
- default y
-
-config ZONE_DMA32
- bool "Support DMA32 zone" if EXPERT
- default y
-
config ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE
def_bool y
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 279252e3e0f7..fd8503a0088a 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -60,6 +60,7 @@ config IA64
select NUMA if !FLATMEM
select PCI_MSI_ARCH_FALLBACKS if PCI_MSI
select SET_FS
+ select ZONE_DMA32
default y
help
The Itanium Processor Family is Intel's 64-bit successor to
@@ -72,9 +73,6 @@ config 64BIT
select ATA_NONSTANDARD if ATA
default y
-config ZONE_DMA32
- def_bool y
-
config MMU
bool
default y
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 372e4e69c43a..05a729c6ad7f 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -34,6 +34,7 @@ config M68K
select SET_FS
select UACCESS_MEMCPY if !MMU
select VIRT_TO_BUS
+ select ZONE_DMA
config CPU_BIG_ENDIAN
def_bool y
@@ -62,10 +63,6 @@ config TIME_LOW_RES
config NO_IOPORT_MAP
def_bool y
-config ZONE_DMA
- bool
- default y
-
config HZ
int
default 1000 if CLEOPATRA
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 0660f47012bc..14a67a42fcae 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -43,6 +43,7 @@ config MICROBLAZE
select MMU_GATHER_NO_RANGE
select SPARSE_IRQ
select SET_FS
+ select ZONE_DMA
# Endianness selection
choice
@@ -60,9 +61,6 @@ config CPU_LITTLE_ENDIAN
endchoice
-config ZONE_DMA
- def_bool y
-
config ARCH_HAS_ILOG2_U32
def_bool n
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index ed51970c08e7..430d5324f1af 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -3277,13 +3277,6 @@ config I8253
select CLKSRC_I8253
select CLKEVT_I8253
select MIPS_EXTERNAL_TIMER
-
-config ZONE_DMA
- bool
-
-config ZONE_DMA32
- bool
-
endmenu
config TRAD_SIGNALS
diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
index 088dd2afcfe4..0f78bb383a12 100644
--- a/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@ -403,10 +403,6 @@ config PPC_ADV_DEBUG_DAC_RANGE
config PPC_DAWR
bool
-config ZONE_DMA
- bool
- default y if PPC_BOOK3E_64
-
config PGTABLE_LEVELS
int
default 2 if !PPC64
diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
index f998e655b570..7d271de8fcbd 100644
--- a/arch/powerpc/platforms/Kconfig.cputype
+++ b/arch/powerpc/platforms/Kconfig.cputype
@@ -111,6 +111,7 @@ config PPC_BOOK3E_64
select PPC_FPU # Make it a choice ?
select PPC_SMP_MUXED_IPI
select PPC_DOORBELL
+ select ZONE_DMA
endchoice
diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
index a8ad8eb76120..d29643dee126 100644
--- a/arch/riscv/Kconfig
+++ b/arch/riscv/Kconfig
@@ -103,6 +103,7 @@ config RISCV
select SYSCTL_EXCEPTION_TRACE
select THREAD_INFO_IN_TASK
select UACCESS_MEMCPY if !MMU
+ select ZONE_DMA32 if 64BIT
config ARCH_MMAP_RND_BITS_MIN
default 18 if 64BIT
@@ -132,10 +133,6 @@ config MMU
Select if you want MMU-based virtualised addressing space
support by paged memory management. If unsure, say 'Y'.
-config ZONE_DMA32
- bool
- default y if 64BIT
-
config VA_BITS
int
default 32 if 32BIT
diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
index b4c7c34069f8..daab9d56957a 100644
--- a/arch/s390/Kconfig
+++ b/arch/s390/Kconfig
@@ -2,9 +2,6 @@
config MMU
def_bool y
-config ZONE_DMA
- def_bool y
-
config CPU_BIG_ENDIAN
def_bool y
@@ -210,6 +207,7 @@ config S390
select THREAD_INFO_IN_TASK
select TTY
select VIRT_CPU_ACCOUNTING
+ select ZONE_DMA
# Note: keep the above list sorted alphabetically
config SCHED_OMIT_FRAME_POINTER
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index 164a5254c91c..39679664cc9a 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -59,6 +59,7 @@ config SPARC32
select CLZ_TAB
select HAVE_UID16
select OLD_SIGACTION
+ select ZONE_DMA
config SPARC64
def_bool 64BIT
@@ -141,10 +142,6 @@ config HIGHMEM
default y if SPARC32
select KMAP_LOCAL
-config ZONE_DMA
- bool
- default y if SPARC32
-
config GENERIC_ISA_DMA
bool
default y if SPARC32
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index 0045e1b44190..11cf8a0d6800 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -33,6 +33,7 @@ config X86_64
select NEED_DMA_MAP_STATE
select SWIOTLB
select ARCH_HAS_ELFCORE_COMPAT
+ select ZONE_DMA32
config FORCE_DYNAMIC_FTRACE
def_bool y
@@ -93,6 +94,7 @@ config X86
select ARCH_HAS_SYSCALL_WRAPPER
select ARCH_HAS_UBSAN_SANITIZE_ALL
select ARCH_HAS_DEBUG_WX
+ select ARCH_HAS_ZONE_DMA_SET if EXPERT
select ARCH_HAVE_NMI_SAFE_CMPXCHG
select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
select ARCH_MIGHT_HAVE_PC_PARPORT
@@ -343,9 +345,6 @@ config ARCH_SUSPEND_POSSIBLE
config ARCH_WANT_GENERAL_HUGETLB
def_bool y
-config ZONE_DMA32
- def_bool y if X86_64
-
config AUDIT_ARCH
def_bool y if X86_64
@@ -393,16 +392,6 @@ config CC_HAS_SANE_STACKPROTECTOR
menu "Processor type and features"
-config ZONE_DMA
- bool "DMA memory allocation support" if EXPERT
- default y
- help
- DMA memory allocation support allows devices with less than 32-bit
- addressing to allocate within the first 16MB of address space.
- Disable if no such devices will be used.
-
- If unsure, say Y.
-
config SMP
bool "Symmetric multi-processing support"
help
diff --git a/mm/Kconfig b/mm/Kconfig
index 02d44e3420f5..16930f40f293 100644
--- a/mm/Kconfig
+++ b/mm/Kconfig
@@ -789,6 +789,18 @@ config ARCH_HAS_CACHE_LINE_SIZE
config ARCH_HAS_PTE_DEVMAP
bool
+config ARCH_HAS_ZONE_DMA_SET
+ bool
+
+config ZONE_DMA
+ bool "Support DMA zone" if ARCH_HAS_ZONE_DMA_SET
+ default y if ARM64 || X86
+
+config ZONE_DMA32
+ bool "Support DMA32 zone" if ARCH_HAS_ZONE_DMA_SET
+ depends on !X86_32
+ default y if ARM64
+
config ZONE_DEVICE
bool "Device memory (pmem, HMM, etc...) hotplug support"
depends on MEMORY_HOTPLUG
--
2.26.2
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 9+ messages in thread
* Re: [PATCH v2] mm: generalize ZONE_[DMA|DMA32]
2021-05-28 7:45 ` [PATCH v2] " Kefeng Wang
@ 2021-05-29 23:51 ` Palmer Dabbelt
2021-05-31 12:22 ` Michal Simek
2021-06-01 2:56 ` Michael Ellerman
2 siblings, 0 replies; 9+ messages in thread
From: Palmer Dabbelt @ 2021-05-29 23:51 UTC (permalink / raw)
To: wangkefeng.wang
Cc: akpm, linux-alpha, linux-arm-kernel, linux-ia64, linux-m68k,
linux-mips, linuxppc-dev, linux-riscv, linux-s390, sparclinux,
linux-mm, wangkefeng.wang, catalin.marinas, will, geert,
tsbogend, davem, mingo, bp, rth, linux, rppt
On Fri, 28 May 2021 00:45:57 PDT (-0700), wangkefeng.wang@huawei.com wrote:
> ZONE_[DMA|DMA32] configs have duplicate definitions on platforms
> that subscribe them. Instead, just make them generic options which
> can be selected on applicable platforms.
>
> Also only x86/arm64 architectures could enable both ZONE_DMA and
> ZONE_DMA32 if EXPERT, add ARCH_HAS_ZONE_DMA_SET to make dma zone
> configurable and visible on the two architectures.
>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: Palmer Dabbelt <palmer@dabbelt.com>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Russell King <linux@armlinux.org.uk>
> Acked-by: Catalin Marinas <catalin.marinas@arm.com> # for arm64
> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> # for m68k
> Acked-by: Mike Rapoport <rppt@linux.ibm.com>
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
Acked-by: Palmer Dabbelt <palmerdabbelt@google.com> # for RISC-V
> ---
> v2:
> -i386 can't enable ZONE_DMA32, fix it.
> -make ZONE_DMA default y on X86 as before.
> -collect ACKs
>
> arch/alpha/Kconfig | 5 +----
> arch/arm/Kconfig | 3 ---
> arch/arm64/Kconfig | 9 +--------
> arch/ia64/Kconfig | 4 +---
> arch/m68k/Kconfig | 5 +----
> arch/microblaze/Kconfig | 4 +---
> arch/mips/Kconfig | 7 -------
> arch/powerpc/Kconfig | 4 ----
> arch/powerpc/platforms/Kconfig.cputype | 1 +
> arch/riscv/Kconfig | 5 +----
> arch/s390/Kconfig | 4 +---
> arch/sparc/Kconfig | 5 +----
> arch/x86/Kconfig | 15 ++-------------
> mm/Kconfig | 12 ++++++++++++
> 14 files changed, 23 insertions(+), 60 deletions(-)
>
> diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
> index 5998106faa60..6a69a14c4825 100644
> --- a/arch/alpha/Kconfig
> +++ b/arch/alpha/Kconfig
> @@ -40,6 +40,7 @@ config ALPHA
> select MMU_GATHER_NO_RANGE
> select SET_FS
> select SPARSEMEM_EXTREME if SPARSEMEM
> + select ZONE_DMA
> help
> The Alpha is a 64-bit general-purpose processor designed and
> marketed by the Digital Equipment Corporation of blessed memory,
> @@ -65,10 +66,6 @@ config GENERIC_CALIBRATE_DELAY
> bool
> default y
>
> -config ZONE_DMA
> - bool
> - default y
> -
> config GENERIC_ISA_DMA
> bool
> default y
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 24804f11302d..000c3f80b58e 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -218,9 +218,6 @@ config GENERIC_CALIBRATE_DELAY
> config ARCH_MAY_HAVE_PC_FDC
> bool
>
> -config ZONE_DMA
> - bool
> -
> config ARCH_SUPPORTS_UPROBES
> def_bool y
>
> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
> index 9f1d8566bbf9..42794474f37f 100644
> --- a/arch/arm64/Kconfig
> +++ b/arch/arm64/Kconfig
> @@ -42,6 +42,7 @@ config ARM64
> select ARCH_HAS_SYSCALL_WRAPPER
> select ARCH_HAS_TEARDOWN_DMA_OPS if IOMMU_SUPPORT
> select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
> + select ARCH_HAS_ZONE_DMA_SET if EXPERT
> select ARCH_HAVE_ELF_PROT
> select ARCH_HAVE_NMI_SAFE_CMPXCHG
> select ARCH_INLINE_READ_LOCK if !PREEMPTION
> @@ -307,14 +308,6 @@ config GENERIC_CSUM
> config GENERIC_CALIBRATE_DELAY
> def_bool y
>
> -config ZONE_DMA
> - bool "Support DMA zone" if EXPERT
> - default y
> -
> -config ZONE_DMA32
> - bool "Support DMA32 zone" if EXPERT
> - default y
> -
> config ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE
> def_bool y
>
> diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
> index 279252e3e0f7..fd8503a0088a 100644
> --- a/arch/ia64/Kconfig
> +++ b/arch/ia64/Kconfig
> @@ -60,6 +60,7 @@ config IA64
> select NUMA if !FLATMEM
> select PCI_MSI_ARCH_FALLBACKS if PCI_MSI
> select SET_FS
> + select ZONE_DMA32
> default y
> help
> The Itanium Processor Family is Intel's 64-bit successor to
> @@ -72,9 +73,6 @@ config 64BIT
> select ATA_NONSTANDARD if ATA
> default y
>
> -config ZONE_DMA32
> - def_bool y
> -
> config MMU
> bool
> default y
> diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
> index 372e4e69c43a..05a729c6ad7f 100644
> --- a/arch/m68k/Kconfig
> +++ b/arch/m68k/Kconfig
> @@ -34,6 +34,7 @@ config M68K
> select SET_FS
> select UACCESS_MEMCPY if !MMU
> select VIRT_TO_BUS
> + select ZONE_DMA
>
> config CPU_BIG_ENDIAN
> def_bool y
> @@ -62,10 +63,6 @@ config TIME_LOW_RES
> config NO_IOPORT_MAP
> def_bool y
>
> -config ZONE_DMA
> - bool
> - default y
> -
> config HZ
> int
> default 1000 if CLEOPATRA
> diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
> index 0660f47012bc..14a67a42fcae 100644
> --- a/arch/microblaze/Kconfig
> +++ b/arch/microblaze/Kconfig
> @@ -43,6 +43,7 @@ config MICROBLAZE
> select MMU_GATHER_NO_RANGE
> select SPARSE_IRQ
> select SET_FS
> + select ZONE_DMA
>
> # Endianness selection
> choice
> @@ -60,9 +61,6 @@ config CPU_LITTLE_ENDIAN
>
> endchoice
>
> -config ZONE_DMA
> - def_bool y
> -
> config ARCH_HAS_ILOG2_U32
> def_bool n
>
> diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
> index ed51970c08e7..430d5324f1af 100644
> --- a/arch/mips/Kconfig
> +++ b/arch/mips/Kconfig
> @@ -3277,13 +3277,6 @@ config I8253
> select CLKSRC_I8253
> select CLKEVT_I8253
> select MIPS_EXTERNAL_TIMER
> -
> -config ZONE_DMA
> - bool
> -
> -config ZONE_DMA32
> - bool
> -
> endmenu
>
> config TRAD_SIGNALS
> diff --git a/arch/powerpc/Kconfig b/arch/powerpc/Kconfig
> index 088dd2afcfe4..0f78bb383a12 100644
> --- a/arch/powerpc/Kconfig
> +++ b/arch/powerpc/Kconfig
> @@ -403,10 +403,6 @@ config PPC_ADV_DEBUG_DAC_RANGE
> config PPC_DAWR
> bool
>
> -config ZONE_DMA
> - bool
> - default y if PPC_BOOK3E_64
> -
> config PGTABLE_LEVELS
> int
> default 2 if !PPC64
> diff --git a/arch/powerpc/platforms/Kconfig.cputype b/arch/powerpc/platforms/Kconfig.cputype
> index f998e655b570..7d271de8fcbd 100644
> --- a/arch/powerpc/platforms/Kconfig.cputype
> +++ b/arch/powerpc/platforms/Kconfig.cputype
> @@ -111,6 +111,7 @@ config PPC_BOOK3E_64
> select PPC_FPU # Make it a choice ?
> select PPC_SMP_MUXED_IPI
> select PPC_DOORBELL
> + select ZONE_DMA
>
> endchoice
>
> diff --git a/arch/riscv/Kconfig b/arch/riscv/Kconfig
> index a8ad8eb76120..d29643dee126 100644
> --- a/arch/riscv/Kconfig
> +++ b/arch/riscv/Kconfig
> @@ -103,6 +103,7 @@ config RISCV
> select SYSCTL_EXCEPTION_TRACE
> select THREAD_INFO_IN_TASK
> select UACCESS_MEMCPY if !MMU
> + select ZONE_DMA32 if 64BIT
>
> config ARCH_MMAP_RND_BITS_MIN
> default 18 if 64BIT
> @@ -132,10 +133,6 @@ config MMU
> Select if you want MMU-based virtualised addressing space
> support by paged memory management. If unsure, say 'Y'.
>
> -config ZONE_DMA32
> - bool
> - default y if 64BIT
> -
> config VA_BITS
> int
> default 32 if 32BIT
> diff --git a/arch/s390/Kconfig b/arch/s390/Kconfig
> index b4c7c34069f8..daab9d56957a 100644
> --- a/arch/s390/Kconfig
> +++ b/arch/s390/Kconfig
> @@ -2,9 +2,6 @@
> config MMU
> def_bool y
>
> -config ZONE_DMA
> - def_bool y
> -
> config CPU_BIG_ENDIAN
> def_bool y
>
> @@ -210,6 +207,7 @@ config S390
> select THREAD_INFO_IN_TASK
> select TTY
> select VIRT_CPU_ACCOUNTING
> + select ZONE_DMA
> # Note: keep the above list sorted alphabetically
>
> config SCHED_OMIT_FRAME_POINTER
> diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
> index 164a5254c91c..39679664cc9a 100644
> --- a/arch/sparc/Kconfig
> +++ b/arch/sparc/Kconfig
> @@ -59,6 +59,7 @@ config SPARC32
> select CLZ_TAB
> select HAVE_UID16
> select OLD_SIGACTION
> + select ZONE_DMA
>
> config SPARC64
> def_bool 64BIT
> @@ -141,10 +142,6 @@ config HIGHMEM
> default y if SPARC32
> select KMAP_LOCAL
>
> -config ZONE_DMA
> - bool
> - default y if SPARC32
> -
> config GENERIC_ISA_DMA
> bool
> default y if SPARC32
> diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
> index 0045e1b44190..11cf8a0d6800 100644
> --- a/arch/x86/Kconfig
> +++ b/arch/x86/Kconfig
> @@ -33,6 +33,7 @@ config X86_64
> select NEED_DMA_MAP_STATE
> select SWIOTLB
> select ARCH_HAS_ELFCORE_COMPAT
> + select ZONE_DMA32
>
> config FORCE_DYNAMIC_FTRACE
> def_bool y
> @@ -93,6 +94,7 @@ config X86
> select ARCH_HAS_SYSCALL_WRAPPER
> select ARCH_HAS_UBSAN_SANITIZE_ALL
> select ARCH_HAS_DEBUG_WX
> + select ARCH_HAS_ZONE_DMA_SET if EXPERT
> select ARCH_HAVE_NMI_SAFE_CMPXCHG
> select ARCH_MIGHT_HAVE_ACPI_PDC if ACPI
> select ARCH_MIGHT_HAVE_PC_PARPORT
> @@ -343,9 +345,6 @@ config ARCH_SUSPEND_POSSIBLE
> config ARCH_WANT_GENERAL_HUGETLB
> def_bool y
>
> -config ZONE_DMA32
> - def_bool y if X86_64
> -
> config AUDIT_ARCH
> def_bool y if X86_64
>
> @@ -393,16 +392,6 @@ config CC_HAS_SANE_STACKPROTECTOR
>
> menu "Processor type and features"
>
> -config ZONE_DMA
> - bool "DMA memory allocation support" if EXPERT
> - default y
> - help
> - DMA memory allocation support allows devices with less than 32-bit
> - addressing to allocate within the first 16MB of address space.
> - Disable if no such devices will be used.
> -
> - If unsure, say Y.
> -
> config SMP
> bool "Symmetric multi-processing support"
> help
> diff --git a/mm/Kconfig b/mm/Kconfig
> index 02d44e3420f5..16930f40f293 100644
> --- a/mm/Kconfig
> +++ b/mm/Kconfig
> @@ -789,6 +789,18 @@ config ARCH_HAS_CACHE_LINE_SIZE
> config ARCH_HAS_PTE_DEVMAP
> bool
>
> +config ARCH_HAS_ZONE_DMA_SET
> + bool
> +
> +config ZONE_DMA
> + bool "Support DMA zone" if ARCH_HAS_ZONE_DMA_SET
> + default y if ARM64 || X86
> +
> +config ZONE_DMA32
> + bool "Support DMA32 zone" if ARCH_HAS_ZONE_DMA_SET
> + depends on !X86_32
> + default y if ARM64
> +
> config ZONE_DEVICE
> bool "Device memory (pmem, HMM, etc...) hotplug support"
> depends on MEMORY_HOTPLUG
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2] mm: generalize ZONE_[DMA|DMA32]
2021-05-28 7:45 ` [PATCH v2] " Kefeng Wang
2021-05-29 23:51 ` Palmer Dabbelt
@ 2021-05-31 12:22 ` Michal Simek
2021-06-01 2:56 ` Michael Ellerman
2 siblings, 0 replies; 9+ messages in thread
From: Michal Simek @ 2021-05-31 12:22 UTC (permalink / raw)
To: Kefeng Wang, Andrew Morton
Cc: linux-alpha, linux-arm-kernel, linux-ia64, linux-m68k,
linux-mips, linuxppc-dev, linux-riscv, linux-s390, sparclinux,
linux-mm, Catalin Marinas, Will Deacon, Geert Uytterhoeven,
Thomas Bogendoerfer, David S. Miller, Ingo Molnar,
Borislav Petkov, Palmer Dabbelt, Richard Henderson, Russell King,
Mike Rapoport
On 5/28/21 9:45 AM, Kefeng Wang wrote:
> ZONE_[DMA|DMA32] configs have duplicate definitions on platforms
> that subscribe them. Instead, just make them generic options which
> can be selected on applicable platforms.
>
> Also only x86/arm64 architectures could enable both ZONE_DMA and
> ZONE_DMA32 if EXPERT, add ARCH_HAS_ZONE_DMA_SET to make dma zone
> configurable and visible on the two architectures.
>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: Palmer Dabbelt <palmer@dabbelt.com>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Russell King <linux@armlinux.org.uk>
> Acked-by: Catalin Marinas <catalin.marinas@arm.com> # for arm64
> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> # for m68k
> Acked-by: Mike Rapoport <rppt@linux.ibm.com>
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> ---
> v2:
> -i386 can't enable ZONE_DMA32, fix it.
> -make ZONE_DMA default y on X86 as before.
> -collect ACKs
>
> arch/alpha/Kconfig | 5 +----
> arch/arm/Kconfig | 3 ---
> arch/arm64/Kconfig | 9 +--------
> arch/ia64/Kconfig | 4 +---
> arch/m68k/Kconfig | 5 +----
> arch/microblaze/Kconfig | 4 +---
> arch/mips/Kconfig | 7 -------
> arch/powerpc/Kconfig | 4 ----
> arch/powerpc/platforms/Kconfig.cputype | 1 +
> arch/riscv/Kconfig | 5 +----
> arch/s390/Kconfig | 4 +---
> arch/sparc/Kconfig | 5 +----
> arch/x86/Kconfig | 15 ++-------------
> mm/Kconfig | 12 ++++++++++++
> 14 files changed, 23 insertions(+), 60 deletions(-)
>
> diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
> index 5998106faa60..6a69a14c4825 100644
> --- a/arch/alpha/Kconfig
> +++ b/arch/alpha/Kconfig
> @@ -40,6 +40,7 @@ config ALPHA
> select MMU_GATHER_NO_RANGE
> select SET_FS
> select SPARSEMEM_EXTREME if SPARSEMEM
> + select ZONE_DMA
> help
> The Alpha is a 64-bit general-purpose processor designed and
> marketed by the Digital Equipment Corporation of blessed memory,
> @@ -65,10 +66,6 @@ config GENERIC_CALIBRATE_DELAY
> bool
> default y
>
> -config ZONE_DMA
> - bool
> - default y
> -
> config GENERIC_ISA_DMA
> bool
> default y
> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 24804f11302d..000c3f80b58e 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -218,9 +218,6 @@ config GENERIC_CALIBRATE_DELAY
> config ARCH_MAY_HAVE_PC_FDC
> bool
>
> -config ZONE_DMA
> - bool
> -
> config ARCH_SUPPORTS_UPROBES
> def_bool y
>
> diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
> index 9f1d8566bbf9..42794474f37f 100644
> --- a/arch/arm64/Kconfig
> +++ b/arch/arm64/Kconfig
> @@ -42,6 +42,7 @@ config ARM64
> select ARCH_HAS_SYSCALL_WRAPPER
> select ARCH_HAS_TEARDOWN_DMA_OPS if IOMMU_SUPPORT
> select ARCH_HAS_TICK_BROADCAST if GENERIC_CLOCKEVENTS_BROADCAST
> + select ARCH_HAS_ZONE_DMA_SET if EXPERT
> select ARCH_HAVE_ELF_PROT
> select ARCH_HAVE_NMI_SAFE_CMPXCHG
> select ARCH_INLINE_READ_LOCK if !PREEMPTION
> @@ -307,14 +308,6 @@ config GENERIC_CSUM
> config GENERIC_CALIBRATE_DELAY
> def_bool y
>
> -config ZONE_DMA
> - bool "Support DMA zone" if EXPERT
> - default y
> -
> -config ZONE_DMA32
> - bool "Support DMA32 zone" if EXPERT
> - default y
> -
> config ARCH_MHP_MEMMAP_ON_MEMORY_ENABLE
> def_bool y
>
> diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
> index 279252e3e0f7..fd8503a0088a 100644
> --- a/arch/ia64/Kconfig
> +++ b/arch/ia64/Kconfig
> @@ -60,6 +60,7 @@ config IA64
> select NUMA if !FLATMEM
> select PCI_MSI_ARCH_FALLBACKS if PCI_MSI
> select SET_FS
> + select ZONE_DMA32
> default y
> help
> The Itanium Processor Family is Intel's 64-bit successor to
> @@ -72,9 +73,6 @@ config 64BIT
> select ATA_NONSTANDARD if ATA
> default y
>
> -config ZONE_DMA32
> - def_bool y
> -
> config MMU
> bool
> default y
> diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
> index 372e4e69c43a..05a729c6ad7f 100644
> --- a/arch/m68k/Kconfig
> +++ b/arch/m68k/Kconfig
> @@ -34,6 +34,7 @@ config M68K
> select SET_FS
> select UACCESS_MEMCPY if !MMU
> select VIRT_TO_BUS
> + select ZONE_DMA
>
> config CPU_BIG_ENDIAN
> def_bool y
> @@ -62,10 +63,6 @@ config TIME_LOW_RES
> config NO_IOPORT_MAP
> def_bool y
>
> -config ZONE_DMA
> - bool
> - default y
> -
> config HZ
> int
> default 1000 if CLEOPATRA
> diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
> index 0660f47012bc..14a67a42fcae 100644
> --- a/arch/microblaze/Kconfig
> +++ b/arch/microblaze/Kconfig
> @@ -43,6 +43,7 @@ config MICROBLAZE
> select MMU_GATHER_NO_RANGE
> select SPARSE_IRQ
> select SET_FS
> + select ZONE_DMA
>
> # Endianness selection
> choice
> @@ -60,9 +61,6 @@ config CPU_LITTLE_ENDIAN
>
> endchoice
>
> -config ZONE_DMA
> - def_bool y
> -
> config ARCH_HAS_ILOG2_U32
> def_bool n
>
Acked-by: Michal Simek <michal.simek@xilinx.com> # for MB
Michal
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
* Re: [PATCH v2] mm: generalize ZONE_[DMA|DMA32]
2021-05-28 7:45 ` [PATCH v2] " Kefeng Wang
2021-05-29 23:51 ` Palmer Dabbelt
2021-05-31 12:22 ` Michal Simek
@ 2021-06-01 2:56 ` Michael Ellerman
2 siblings, 0 replies; 9+ messages in thread
From: Michael Ellerman @ 2021-06-01 2:56 UTC (permalink / raw)
To: Kefeng Wang, Andrew Morton
Cc: linux-alpha, linux-arm-kernel, linux-ia64, linux-m68k,
linux-mips, linuxppc-dev, linux-riscv, linux-s390, sparclinux,
linux-mm, Kefeng Wang, Catalin Marinas, Will Deacon,
Geert Uytterhoeven, Thomas Bogendoerfer, David S. Miller,
Ingo Molnar, Borislav Petkov, Palmer Dabbelt, Richard Henderson,
Russell King, Mike Rapoport
Kefeng Wang <wangkefeng.wang@huawei.com> writes:
> ZONE_[DMA|DMA32] configs have duplicate definitions on platforms
> that subscribe them. Instead, just make them generic options which
> can be selected on applicable platforms.
>
> Also only x86/arm64 architectures could enable both ZONE_DMA and
> ZONE_DMA32 if EXPERT, add ARCH_HAS_ZONE_DMA_SET to make dma zone
> configurable and visible on the two architectures.
>
> Cc: Andrew Morton <akpm@linux-foundation.org>
> Cc: Catalin Marinas <catalin.marinas@arm.com>
> Cc: Will Deacon <will@kernel.org>
> Cc: Geert Uytterhoeven <geert@linux-m68k.org>
> Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
> Cc: "David S. Miller" <davem@davemloft.net>
> Cc: Ingo Molnar <mingo@redhat.com>
> Cc: Borislav Petkov <bp@alien8.de>
> Cc: Palmer Dabbelt <palmer@dabbelt.com>
> Cc: Richard Henderson <rth@twiddle.net>
> Cc: Russell King <linux@armlinux.org.uk>
> Acked-by: Catalin Marinas <catalin.marinas@arm.com> # for arm64
> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> # for m68k
> Acked-by: Mike Rapoport <rppt@linux.ibm.com>
> Signed-off-by: Kefeng Wang <wangkefeng.wang@huawei.com>
> ---
> v2:
> -i386 can't enable ZONE_DMA32, fix it.
> -make ZONE_DMA default y on X86 as before.
> -collect ACKs
>
> arch/alpha/Kconfig | 5 +----
> arch/arm/Kconfig | 3 ---
> arch/arm64/Kconfig | 9 +--------
> arch/ia64/Kconfig | 4 +---
> arch/m68k/Kconfig | 5 +----
> arch/microblaze/Kconfig | 4 +---
> arch/mips/Kconfig | 7 -------
> arch/powerpc/Kconfig | 4 ----
> arch/powerpc/platforms/Kconfig.cputype | 1 +
Acked-by: Michael Ellerman <mpe@ellerman.id.au> (powerpc)
cheers
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2021-06-01 2:57 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-27 14:30 [PATCH] mm: generalize ZONE_[DMA|DMA32] Kefeng Wang
2021-05-27 14:26 ` Geert Uytterhoeven
2021-05-27 15:13 ` Mike Rapoport
2021-05-27 17:06 ` kernel test robot
2021-05-27 17:43 ` Catalin Marinas
2021-05-28 7:45 ` [PATCH v2] " Kefeng Wang
2021-05-29 23:51 ` Palmer Dabbelt
2021-05-31 12:22 ` Michal Simek
2021-06-01 2:56 ` Michael Ellerman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).