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=-9.8 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, 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 1AF7AC83004 for ; Wed, 29 Apr 2020 12:14:00 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id B791320731 for ; Wed, 29 Apr 2020 12:13:59 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="Zp/EwjK4" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B791320731 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 692A28E0010; Wed, 29 Apr 2020 08:13:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6405F8E0001; Wed, 29 Apr 2020 08:13:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 509478E0010; Wed, 29 Apr 2020 08:13:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0071.hostedemail.com [216.40.44.71]) by kanga.kvack.org (Postfix) with ESMTP id 3AA158E0001 for ; Wed, 29 Apr 2020 08:13:59 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 02B7A181AC9C6 for ; Wed, 29 Apr 2020 12:13:59 +0000 (UTC) X-FDA: 76760784198.21.pear50_3fd1dd68fc357 X-HE-Tag: pear50_3fd1dd68fc357 X-Filterd-Recvd-Size: 6194 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by imf17.hostedemail.com (Postfix) with ESMTP for ; Wed, 29 Apr 2020 12:13:58 +0000 (UTC) Received: from aquarius.haifa.ibm.com (nesher1.haifa.il.ibm.com [195.110.40.7]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 62130208FE; Wed, 29 Apr 2020 12:13:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1588162437; bh=PmlA55IFa0TE0KqXPilGt5b1cMKjw1e8NkL5oH+bDN8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Zp/EwjK4fcSp4MTxQXnTZ3NiV7nl/x2/apdyGHjMUHbRoQIUq2SCVNYsHsLk+sKA0 OXUq2017GfqW69ke9hm4HJwXGVQJ8kNO5FM/r/R2CRLJajFvTaJ+ia7ZrqRb1Zokvk cf+LpdAcg3GqmVfgk3hUO6nFeFCPZeT1rSJcnXXU= From: Mike Rapoport To: linux-kernel@vger.kernel.org Cc: Andrew Morton , Baoquan He , Brian Cain , Catalin Marinas , "David S. Miller" , Geert Uytterhoeven , Greentime Hu , Greg Ungerer , Guan Xuetao , Guo Ren , Heiko Carstens , Helge Deller , Hoan Tran , "James E.J. Bottomley" , Jonathan Corbet , Ley Foon Tan , Mark Salter , Matt Turner , Max Filippov , Michael Ellerman , Michal Hocko , Michal Simek , Nick Hu , Paul Walmsley , Qian Cai , Richard Weinberger , Rich Felker , Russell King , Stafford Horne , Thomas Bogendoerfer , Tony Luck , Vineet Gupta , x86@kernel.org, Yoshinori Sato , linux-alpha@vger.kernel.org, linux-arch@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-c6x-dev@linux-c6x.org, linux-csky@vger.kernel.org, linux-doc@vger.kernel.org, linux-hexagon@vger.kernel.org, linux-ia64@vger.kernel.org, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-mm@kvack.org, linux-parisc@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-sh@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-um@lists.infradead.org, linux-xtensa@linux-xtensa.org, openrisc@lists.librecores.org, sparclinux@vger.kernel.org, uclinux-h8-devel@lists.sourceforge.jp, Mike Rapoport Subject: [PATCH v2 08/20] arm64: simplify detection of memory zone boundaries for UMA configs Date: Wed, 29 Apr 2020 15:11:14 +0300 Message-Id: <20200429121126.17989-9-rppt@kernel.org> X-Mailer: git-send-email 2.26.1 In-Reply-To: <20200429121126.17989-1-rppt@kernel.org> References: <20200429121126.17989-1-rppt@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Mike Rapoport The free_area_init() function only requires the definition of maximal PFN for each of the supported zone rater than calculation of actual zone size= s and the sizes of the holes between the zones. After removal of CONFIG_HAVE_MEMBLOCK_NODE_MAP the free_area_init() is available to all architectures. Using this function instead of free_area_init_node() simplifies the zone detection. Signed-off-by: Mike Rapoport --- arch/arm64/mm/init.c | 54 -------------------------------------------- 1 file changed, 54 deletions(-) diff --git a/arch/arm64/mm/init.c b/arch/arm64/mm/init.c index a650adb358ee..d54ad2250dce 100644 --- a/arch/arm64/mm/init.c +++ b/arch/arm64/mm/init.c @@ -192,8 +192,6 @@ static phys_addr_t __init max_zone_phys(unsigned int = zone_bits) return min(offset + (1ULL << zone_bits), memblock_end_of_DRAM()); } =20 -#ifdef CONFIG_NUMA - static void __init zone_sizes_init(unsigned long min, unsigned long max) { unsigned long max_zone_pfns[MAX_NR_ZONES] =3D {0}; @@ -209,58 +207,6 @@ static void __init zone_sizes_init(unsigned long min= , unsigned long max) free_area_init(max_zone_pfns); } =20 -#else - -static void __init zone_sizes_init(unsigned long min, unsigned long max) -{ - struct memblock_region *reg; - unsigned long zone_size[MAX_NR_ZONES], zhole_size[MAX_NR_ZONES]; - unsigned long __maybe_unused max_dma, max_dma32; - - memset(zone_size, 0, sizeof(zone_size)); - - max_dma =3D max_dma32 =3D min; -#ifdef CONFIG_ZONE_DMA - max_dma =3D max_dma32 =3D PFN_DOWN(arm64_dma_phys_limit); - zone_size[ZONE_DMA] =3D max_dma - min; -#endif -#ifdef CONFIG_ZONE_DMA32 - max_dma32 =3D PFN_DOWN(arm64_dma32_phys_limit); - zone_size[ZONE_DMA32] =3D max_dma32 - max_dma; -#endif - zone_size[ZONE_NORMAL] =3D max - max_dma32; - - memcpy(zhole_size, zone_size, sizeof(zhole_size)); - - for_each_memblock(memory, reg) { - unsigned long start =3D memblock_region_memory_base_pfn(reg); - unsigned long end =3D memblock_region_memory_end_pfn(reg); - -#ifdef CONFIG_ZONE_DMA - if (start >=3D min && start < max_dma) { - unsigned long dma_end =3D min(end, max_dma); - zhole_size[ZONE_DMA] -=3D dma_end - start; - start =3D dma_end; - } -#endif -#ifdef CONFIG_ZONE_DMA32 - if (start >=3D max_dma && start < max_dma32) { - unsigned long dma32_end =3D min(end, max_dma32); - zhole_size[ZONE_DMA32] -=3D dma32_end - start; - start =3D dma32_end; - } -#endif - if (start >=3D max_dma32 && start < max) { - unsigned long normal_end =3D min(end, max); - zhole_size[ZONE_NORMAL] -=3D normal_end - start; - } - } - - free_area_init_node(0, zone_size, min, zhole_size); -} - -#endif /* CONFIG_NUMA */ - int pfn_valid(unsigned long pfn) { phys_addr_t addr =3D pfn << PAGE_SHIFT; --=20 2.26.1