From: Mike Rapoport <rppt@kernel.org>
To: openrisc@lists.librecores.org
Subject: [OpenRISC] [PATCH 04/15] arm64: numa: simplify dummy_numa_init()
Date: Tue, 28 Jul 2020 05:12:54 -0000 [thread overview]
Message-ID: <20200728051153.1590-5-rppt@kernel.org> (raw)
In-Reply-To: <20200728051153.1590-1-rppt@kernel.org>
From: Mike Rapoport <rppt@linux.ibm.com>
dummy_numa_init() loops over memblock.memory and passes nid=0 to
numa_add_memblk() which essentially wraps memblock_set_node(). However,
memblock_set_node() can cope with entire memory span itself, so the loop
over memblock.memory regions is redundant.
Replace the loop with a single call to memblock_set_node() to the entire
memory.
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
---
arch/arm64/mm/numa.c | 13 +++++--------
1 file changed, 5 insertions(+), 8 deletions(-)
diff --git a/arch/arm64/mm/numa.c b/arch/arm64/mm/numa.c
index aafcee3e3f7e..0cbdbcc885fb 100644
--- a/arch/arm64/mm/numa.c
+++ b/arch/arm64/mm/numa.c
@@ -423,19 +423,16 @@ static int __init numa_init(int (*init_func)(void))
*/
static int __init dummy_numa_init(void)
{
+ phys_addr_t start = memblock_start_of_DRAM();
+ phys_addr_t end = memblock_end_of_DRAM();
int ret;
- struct memblock_region *mblk;
if (numa_off)
pr_info("NUMA disabled\n"); /* Forced off on command line. */
- pr_info("Faking a node at [mem %#018Lx-%#018Lx]\n",
- memblock_start_of_DRAM(), memblock_end_of_DRAM() - 1);
-
- for_each_memblock(memory, mblk) {
- ret = numa_add_memblk(0, mblk->base, mblk->base + mblk->size);
- if (!ret)
- continue;
+ pr_info("Faking a node at [mem %#018Lx-%#018Lx]\n", start, end - 1);
+ ret = numa_add_memblk(0, start, end);
+ if (ret) {
pr_err("NUMA init failed\n");
return ret;
}
--
2.26.2
next prev parent reply other threads:[~2020-07-28 5:12 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-07-28 5:12 [OpenRISC] [PATCH 00/15] memblock: seasonal cleaning^w cleanup Mike Rapoport
2020-07-28 5:12 ` [OpenRISC] [PATCH 01/15] KVM: PPC: Book3S HV: simplify kvm_cma_reserve() Mike Rapoport
2020-07-28 5:12 ` [OpenRISC] [PATCH 02/15] dma-contiguous: simplify cma_early_percent_memory() Mike Rapoport
2020-07-28 6:37 ` Christoph Hellwig
2020-07-28 5:12 ` [OpenRISC] [PATCH 03/15] arm, xtensa: simplify initialization of high memory pages Mike Rapoport
2020-07-28 8:09 ` Max Filippov
2020-07-28 5:12 ` Mike Rapoport [this message]
2020-07-29 8:31 ` [OpenRISC] [PATCH 04/15] arm64: numa: simplify dummy_numa_init() Jonathan Cameron
2020-07-30 12:04 ` Catalin Marinas
2020-07-28 5:13 ` [OpenRISC] [PATCH 05/15] h8300, nds32, openrisc: simplify detection of memory extents Mike Rapoport
2020-07-29 11:42 ` Stafford Horne
2020-07-28 5:13 ` [OpenRISC] [PATCH 06/15] powerpc: fadamp: simplify fadump_reserve_crash_area() Mike Rapoport
2020-07-30 12:15 ` Michael Ellerman
2020-08-01 10:19 ` Mike Rapoport
2020-08-01 10:54 ` Hari Bathini
2020-08-02 13:14 ` Michael Ellerman
2020-07-28 5:13 ` [OpenRISC] [PATCH 07/15] riscv: drop unneeded node initialization Mike Rapoport
2020-07-28 5:13 ` [OpenRISC] [PATCH 08/15] mircoblaze: drop unneeded NUMA and sparsemem initializations Mike Rapoport
2020-07-28 5:13 ` [OpenRISC] [PATCH 09/15] memblock: make for_each_memblock_type() iterator private Mike Rapoport
2020-07-30 1:52 ` Baoquan He
2020-07-28 5:13 ` [OpenRISC] [PATCH 10/15] memblock: make memblock_debug and related functionality private Mike Rapoport
2020-07-30 1:54 ` Baoquan He
2020-07-28 5:14 ` [OpenRISC] [PATCH 11/15] memblock: reduce number of parameters in for_each_mem_range() Mike Rapoport
2020-07-30 2:22 ` Baoquan He
2020-07-28 5:14 ` [OpenRISC] [PATCH 12/15] arch, mm: replace for_each_memblock() with for_each_mem_pfn_range() Mike Rapoport
2020-07-28 5:14 ` [OpenRISC] [PATCH 13/15] arch, drivers: replace for_each_membock() with for_each_mem_range() Mike Rapoport
2020-07-28 15:03 ` Emil Renner Berthing
2020-07-28 5:14 ` [OpenRISC] [PATCH 14/15] x86/numa: remove redundant iteration over memblock.reserved Mike Rapoport
2020-07-28 10:44 ` Ingo Molnar
2020-07-28 10:56 ` Mike Rapoport
2020-07-28 11:31 ` Ingo Molnar
2020-07-28 11:03 ` Baoquan He
2020-07-28 14:15 ` Mike Rapoport
2020-07-28 14:24 ` Baoquan He
2020-07-28 5:14 ` [OpenRISC] [PATCH 15/15] memblock: remove 'type' parameter from for_each_memblock() Mike Rapoport
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200728051153.1590-5-rppt@kernel.org \
--to=rppt@kernel.org \
--cc=openrisc@lists.librecores.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox