2018-10-14 18:13:43

by Christoph Hellwig

Subject: [PATCH] xtensa: remove ZONE_DMA

ZONE_DMA is intended for magic < 32-bit pools (usually ISA DMA), which
isn't required on xtensa. Move all the non-highmem memory into
ZONE_NORMAL instead to match other architectures.

Signed-off-by: Christoph Hellwig <[email protected]>
---
arch/xtensa/Kconfig | 3 ---
arch/xtensa/mm/init.c | 2 +-
2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/arch/xtensa/Kconfig b/arch/xtensa/Kconfig
index 516694937b7a..9a7c654a7654 100644
--- a/arch/xtensa/Kconfig
+++ b/arch/xtensa/Kconfig
@@ -1,7 +1,4 @@
# SPDX-License-Identifier: GPL-2.0
-config ZONE_DMA
- def_bool y
-
config XTENSA
def_bool y
select ARCH_HAS_SYNC_DMA_FOR_CPU
diff --git a/arch/xtensa/mm/init.c b/arch/xtensa/mm/init.c
index 34aead7dcb48..b385e6b73065 100644
--- a/arch/xtensa/mm/init.c
+++ b/arch/xtensa/mm/init.c
@@ -71,7 +71,7 @@ void __init zones_init(void)
{
/* All pages are DMA-able, so we put them all in the DMA zone. */
unsigned long zones_size[MAX_NR_ZONES] = {
- [ZONE_DMA] = max_low_pfn - ARCH_PFN_OFFSET,
+ [ZONE_NORMAL] = max_low_pfn - ARCH_PFN_OFFSET,
#ifdef CONFIG_HIGHMEM
[ZONE_HIGHMEM] = max_pfn - max_low_pfn,
#endif
--
2.19.1

2018-10-15 19:58:14

by Max Filippov

Subject: Re: [PATCH] xtensa: remove ZONE_DMA

On Sun, Oct 14, 2018 at 11:13 AM Christoph Hellwig <[email protected]> wrote:
>
> ZONE_DMA is intended for magic < 32-bit pools (usually ISA DMA), which
> isn't required on xtensa. Move all the non-highmem memory into
> ZONE_NORMAL instead to match other architectures.
>
> Signed-off-by: Christoph Hellwig <[email protected]>
> ---
> arch/xtensa/Kconfig | 3 ---
> arch/xtensa/mm/init.c | 2 +-
> 2 files changed, 1 insertion(+), 4 deletions(-)

Applied to my xtensa tree.

--
Thanks.
-- Max