From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id F2D87C7618F for ; Mon, 15 Jul 2019 14:20:24 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CC7FC206B8 for ; Mon, 15 Jul 2019 14:20:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563200424; bh=Y7vcWjbPWZ+DphpoUON7gq0TbO1bMtk3yQDUG3xFVVo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=FV+089uZkNCFXu1OthBAwhZFNntRz8mq1H/CFjGeInQ5dXeF4oijzFGWPVZwRaMJx NdS3oxSUSFaBBsdyTrGkhSC+nEGivRrNsbyCKT27PTPXHB6yrk7K0gnASE6o20n9wh c0yf0lAuMtHTXPNIpjMVhqseJlS+6mUX2A6Ut4zw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390433AbfGOOUX (ORCPT ); Mon, 15 Jul 2019 10:20:23 -0400 Received: from mail.kernel.org ([198.145.29.99]:43318 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390415AbfGOOUS (ORCPT ); Mon, 15 Jul 2019 10:20:18 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id ACF16217D8; Mon, 15 Jul 2019 14:20:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563200417; bh=Y7vcWjbPWZ+DphpoUON7gq0TbO1bMtk3yQDUG3xFVVo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WDLzDQsNEGd3AhxdBhDNXYCZc6AQnuIj8jMEf9wFArq4O2ek/VwTs7F23wDHg5KSt S8O13PYylpJHTzK2/1mNNm2ZSu2GD2g8fYA3oD6E32aCBipuAH8XrJT6NzZQKS/luW v2GfpzcnBworPMjijriGXl/AUztPOAHqfpTOPD6w= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Miles Chen , Robin Murphy , Catalin Marinas , Sasha Levin Subject: [PATCH AUTOSEL 4.19 041/158] arm64: mm: make CONFIG_ZONE_DMA32 configurable Date: Mon, 15 Jul 2019 10:16:12 -0400 Message-Id: <20190715141809.8445-41-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715141809.8445-1-sashal@kernel.org> References: <20190715141809.8445-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Miles Chen [ 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 Signed-off-by: Miles Chen Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- 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 8790a29d0af4..e3ebece79617 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -251,7 +251,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 774c3e17c798..29d2f425806e 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -233,8 +233,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