lkml.org 
[lkml]   [2019]   [Jul]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.2 064/413] arm64: mm: make CONFIG_ZONE_DMA32 configurable
    Date
    [ Upstream commit 0c1f14ed12262f45a3af1d588e4d7bd12438b8f5 ]

    This change makes CONFIG_ZONE_DMA32 defuly y and allows users
    to overwrite it only when CONFIG_EXPERT=y.

    For the SoCs that do not need CONFIG_ZONE_DMA32, this is the
    first step to manage all available memory by a single
    zone(normal zone) to reduce the overhead of multiple zones.

    The change also fixes a build error when CONFIG_NUMA=y and
    CONFIG_ZONE_DMA32=n.

    arch/arm64/mm/init.c:195:17: error: use of undeclared identifier 'ZONE_DMA32'
    max_zone_pfns[ZONE_DMA32] = PFN_DOWN(max_zone_dma_phys());

    Change since v1:
    1. only expose CONFIG_ZONE_DMA32 when CONFIG_EXPERT=y
    2. remove redundant IS_ENABLED(CONFIG_ZONE_DMA32)

    Cc: Robin Murphy <robin.murphy@arm.com>
    Signed-off-by: Miles Chen <miles.chen@mediatek.com>
    Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
    Signed-off-by: Sasha Levin <sashal@kernel.org>
    ---
    arch/arm64/Kconfig | 3 ++-
    arch/arm64/mm/init.c | 5 +++--
    2 files changed, 5 insertions(+), 3 deletions(-)

    diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig
    index 697ea0510729..cf5f1dafcf74 100644
    --- a/arch/arm64/Kconfig
    +++ b/arch/arm64/Kconfig
    @@ -260,7 +260,8 @@ config GENERIC_CALIBRATE_DELAY
    def_bool y

    config ZONE_DMA32
    - def_bool y
    + bool "Support DMA32 zone" if EXPERT
    + default y

    config HAVE_GENERIC_GUP
    def_bool y
    diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c
    index 749c9b269f08..f3c795278def 100644
    --- a/arch/arm64/mm/init.c
    +++ b/arch/arm64/mm/init.c
    @@ -180,8 +180,9 @@ static void __init zone_sizes_init(unsigned long min, unsigned long max)
    {
    unsigned long max_zone_pfns[MAX_NR_ZONES] = {0};

    - if (IS_ENABLED(CONFIG_ZONE_DMA32))
    - max_zone_pfns[ZONE_DMA32] = PFN_DOWN(max_zone_dma_phys());
    +#ifdef CONFIG_ZONE_DMA32
    + max_zone_pfns[ZONE_DMA32] = PFN_DOWN(max_zone_dma_phys());
    +#endif
    max_zone_pfns[ZONE_NORMAL] = max;

    free_area_init_nodes(max_zone_pfns);
    --
    2.20.1


    \
     
     \ /
      Last update: 2019-07-24 23:09    [W:4.287 / U:0.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site