From patchwork Thu Mar 6 18:51:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Rapoport X-Patchwork-Id: 14005193 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5F287C282D1 for ; Thu, 6 Mar 2025 18:52:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 8DC13280008; Thu, 6 Mar 2025 13:52:40 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 88A9A280004; Thu, 6 Mar 2025 13:52:40 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7079A280008; Thu, 6 Mar 2025 13:52:40 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 526CC280004 for ; Thu, 6 Mar 2025 13:52:40 -0500 (EST) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 5B73E1A25B4 for ; Thu, 6 Mar 2025 18:52:40 +0000 (UTC) X-FDA: 83192022480.11.C21AFAC Received: from nyc.source.kernel.org (nyc.source.kernel.org [147.75.193.91]) by imf28.hostedemail.com (Postfix) with ESMTP id B7991C000D for ; Thu, 6 Mar 2025 18:52:38 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=siKQU+HD; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf28.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1741287158; a=rsa-sha256; cv=none; b=wQ39i1Ojxs+OH1afzOK42TnrgRQjHTk4DuYpIUYLBr1M7kyN1aUVTiLsIo+paBT6Gefgc2 /BRq2/IJeT1OkEBzFntSxlOlmT4AESoyOVhgeldCsKLkcAbNJuRL2aNBrZMt11w0i6WYZC s8oix2YGNcXrOZWsMNdD52hlizNGUx0= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=siKQU+HD; dmarc=pass (policy=quarantine) header.from=kernel.org; spf=pass (imf28.hostedemail.com: domain of rppt@kernel.org designates 147.75.193.91 as permitted sender) smtp.mailfrom=rppt@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1741287158; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=f/Tjv7nZ1RGU38sSJe49qG5HH8eeGxe0gmVd2kGHllo=; b=ksRCCuI9qsAxz0BB81l0eEzjK4oGmHqyDG56NTyEwi7KnxrobMMbhdZUzI3FcVJ/HXK5GR i3D/pO00zHLOiil1CjIBuGuzxJyl+6ulNyz46pQRZYr0GWqbzulNV1dtnNRUICPUxgeezO 9M2mveJi2LsTC5eM/dPW8lzvX/qw3mk= Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by nyc.source.kernel.org (Postfix) with ESMTP id 66E49A44F0F; Thu, 6 Mar 2025 18:47:07 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1376FC4CEE0; Thu, 6 Mar 2025 18:52:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1741287157; bh=nkBe6+9DINra8ChNyXeYcesTu6mPwjeTN1yq3Y1szbM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=siKQU+HDCfw0PGVcuQLowpSBXONSMtUVdFxiCr/6hU+NHY+VBHRlc1vAUMT5hpJZB PiVwReKljb7dtz57q/YhNgC/pOTwxkZOQVhOO7p43ve+TVnLWWN7d0SfMwaPKZXUnC kE9KWupqvpjakTaBQB38YsWY/YDt6tkSLuS44omo3I/wMLF2pVop/8yqmSFOQUynyz OAbvzs0UwLJMMvu3PP28iy00klBtAdZ7IDinGxb0rWjVk4O5ozTiq+E/5xe7lZMfHj qz1b46GsbuZHpSH/b+emJTc8g80OT8hpp/EeqCWWu0ZThETTwxlc70LZLmOMcV9Az+ ArY7HhgOILFsA== From: Mike Rapoport To: Andrew Morton Cc: Alexander Gordeev , Andreas Larsson , Andy Lutomirski , Arnd Bergmann , Borislav Petkov , Brian Cain , Catalin Marinas , Dave Hansen , "David S. Miller" , Dinh Nguyen , Geert Uytterhoeven , Gerald Schaefer , Guo Ren , Heiko Carstens , Helge Deller , Huacai Chen , Ingo Molnar , Jiaxun Yang , Johannes Berg , John Paul Adrian Glaubitz , Madhavan Srinivasan , Matt Turner , Max Filippov , Michael Ellerman , Michal Simek , Mike Rapoport , Palmer Dabbelt , Peter Zijlstra , Richard Weinberger , Russell King , Stafford Horne , Thomas Bogendoerfer , Thomas Gleixner , Vasily Gorbik , Vineet Gupta , Will Deacon , linux-alpha@vger.kernel.org, linux-kernel@vger.kernel.org, linux-snps-arc@lists.infradead.org, linux-arm-kernel@lists.infradead.org, linux-csky@vger.kernel.org, linux-hexagon@vger.kernel.org, loongarch@lists.linux.dev, linux-m68k@lists.linux-m68k.org, linux-mips@vger.kernel.org, linux-openrisc@vger.kernel.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, sparclinux@vger.kernel.org, linux-um@lists.infradead.org, linux-arch@vger.kernel.org, linux-mm@kvack.org, x86@kernel.org Subject: [PATCH 04/13] MIPS: consolidate mem_init() for NUMA machines Date: Thu, 6 Mar 2025 20:51:14 +0200 Message-ID: <20250306185124.3147510-5-rppt@kernel.org> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250306185124.3147510-1-rppt@kernel.org> References: <20250306185124.3147510-1-rppt@kernel.org> MIME-Version: 1.0 X-Rspamd-Queue-Id: B7991C000D X-Stat-Signature: zwibk4rw33siofwskz7ity5nb3iyrx1y X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1741287158-93788 X-HE-Meta: U2FsdGVkX1+OC8PTNRzaSP56oquLJmJUyJBd2wTuA1qqouQnoy1hUEpW6gfRUgS3wcrlUsIPE/WqVupajifU4mXFmza2Wv8c9dL9nW2+PPCQaM1KdXUCL64j/7025tM2pECq/Drap5TcZ+m+0P2i+DVGeA1R3hTCUrk0BH3zkJ+yz6gtKV69o+Mt/bmSzBMixsYlxlLGsYCx3xwFZ+e9+6bmUR4vyYSWYkZ2XgbNs8fRdoN2WQx8VEoTxNoO3dFU9Mik71SXUTxddMlUXk2q8kSUjowCPIJqYN38evix3VYY4B6xCGgPzS6URLCyB3QNLAd4B64cQ3WKeKdb1cdIUZsqg6J7Hh3pjLGFI+HFWQbt5dif31uy7XBMuDjzGP7y0Pg/MRaAHWfkYf+L80NlPY1z1jp9bsPkpUNz195WhskNgtyku1wd+ZwsIVs/kQnN3zxfVQzCZhMwUIV9CD6jIBJ80I2q2nLELPZOKXiedIO+NmzulfigVdKWnmn612Ec3opEqqBIa/79Lo9Sk+D2I+k4hzv3JfyRA/DQnmzFjR1yAA/7mTHmqhXyEFAAXA7ied5VSMJbanZYLFWKi9Ys0n6jZdhQ5grMREPSaEZtawuW7fSCr3vpgwcf8xkFa++vt0GygGN9ns7Aql+dc5J7gKSSIA5o9mPjioDizbuY/bDHd7MJGQkmAWvYTAdfICbx9qi05uht58UVEVuzopDqbFQyGtN+pnKvfJFNz+KFCRDEsjGjaGBPaLpC31CbwdacJHOQErow1Vnkof/Ca8Q8fQyBDPEhdrMrPdEjupKlfoRkl9wx4wP4I3alHopYMYUR5g2V2vXY/GDlD31SPaUbktZWKTKIILoFu3gI0lIui1dVqnUVZavtfQ8w8YwZu9w+f82VKi4MaqY8oF7ds9pTliRwi/uU0l3EYUx86AB5d6A2gSQ8T3FPq7TaYCpOPbthKcBvnt8deb4aiRb3vpp KjXE8yqD ARV/bOJl+OLBBSLwQ0K0bzzNmZYopyWI9lf++ci8EAUAEVOixn7TJBxUJ2MkToJc4rblZDYE8Eckg0w64UjZszel9TcI1VVOS9OIcavojCt3oIy34pHCI+iFCFi26bwXIEFCmSRe2J9SYBs978Wf0+7AgOdNFDpR4TUaQhtncWLDR+UIHv1RYb7SRGcJJN8S0Tg0qGR2wSuYg9mWxUWSe+Tv2+3BGc58I2DYU4tNpVgwtLZg+R1oCF0o9JVd4EFbQBwmLcsLWcWZtQCDN9voaL6JASQ== 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: List-Subscribe: List-Unsubscribe: From: "Mike Rapoport (Microsoft)" Both MIPS systems that support numa (loongsoon3 and sgi-ip27) have identical mem_init() for NUMA case. Move that into arch/mips/mm/init.c and drop duplicate per-machine definitions. Signed-off-by: Mike Rapoport (Microsoft) --- arch/mips/loongson64/numa.c | 7 ------- arch/mips/mm/init.c | 7 +++++++ arch/mips/sgi-ip27/ip27-memory.c | 9 --------- 3 files changed, 7 insertions(+), 16 deletions(-) diff --git a/arch/mips/loongson64/numa.c b/arch/mips/loongson64/numa.c index 8388400d052f..95d5f553ce19 100644 --- a/arch/mips/loongson64/numa.c +++ b/arch/mips/loongson64/numa.c @@ -164,13 +164,6 @@ void __init paging_init(void) free_area_init(zones_size); } -void __init mem_init(void) -{ - high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT); - memblock_free_all(); - setup_zero_pages(); /* This comes from node 0 */ -} - /* All PCI device belongs to logical Node-0 */ int pcibus_to_node(struct pci_bus *bus) { diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c index 4583d1a2a73e..3db6082c611e 100644 --- a/arch/mips/mm/init.c +++ b/arch/mips/mm/init.c @@ -482,6 +482,13 @@ void __init mem_init(void) 0x80000000 - 4, KCORE_TEXT); #endif } +#else /* CONFIG_NUMA */ +void __init mem_init(void) +{ + high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT); + memblock_free_all(); + setup_zero_pages(); /* This comes from node 0 */ +} #endif /* !CONFIG_NUMA */ void free_init_pages(const char *what, unsigned long begin, unsigned long end) diff --git a/arch/mips/sgi-ip27/ip27-memory.c b/arch/mips/sgi-ip27/ip27-memory.c index 1963313f55d8..2b3e46e2e607 100644 --- a/arch/mips/sgi-ip27/ip27-memory.c +++ b/arch/mips/sgi-ip27/ip27-memory.c @@ -406,8 +406,6 @@ void __init prom_meminit(void) } } -extern void setup_zero_pages(void); - void __init paging_init(void) { unsigned long zones_size[MAX_NR_ZONES] = {0, }; @@ -416,10 +414,3 @@ void __init paging_init(void) zones_size[ZONE_NORMAL] = max_low_pfn; free_area_init(zones_size); } - -void __init mem_init(void) -{ - high_memory = (void *) __va(get_num_physpages() << PAGE_SHIFT); - memblock_free_all(); - setup_zero_pages(); /* This comes from node 0 */ -}