Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3f7a09f4 authored by Hanjun Guo's avatar Hanjun Guo Committed by Will Deacon
Browse files

arm64/numa: fix incorrect log for memory-less node 



When booting on NUMA system with memory-less node (no
memory dimm on this memory controller), the print
for setup_node_data() is incorrect:

NUMA: Initmem setup node 2 [mem 0x00000000-0xffffffffffffffff]

It can be fixed by printing [mem 0x00000000-0x00000000] when
end_pfn is 0, but print <memory-less node> will be more useful.

Fixes: 1a2db300 ("arm64, numa: Add NUMA support for arm64 platforms.")
Signed-off-by: default avatarHanjun Guo <hanjun.guo@linaro.org>
Cc: Catalin Marinas <catalin.marinas@arm.com>
Cc: Ganapatrao Kulkarni <gkulkarni@caviumnetworks.com>
Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Yisheng Xie <xieyisheng1@huawei.com>
Signed-off-by: default avatarWill Deacon <will.deacon@arm.com>
parent 26984c3b

arch/arm64/mm/numa.c

+5 −2
Original line number Diff line number Diff line
@@ -223,8 +223,11 @@ static void __init setup_node_data(int nid, u64 start_pfn, u64 end_pfn) 
	void *nd;

	int tnid;



	pr_info("Initmem setup node %d [mem %#010Lx-%#010Lx]\n",

		nid, start_pfn << PAGE_SHIFT, (end_pfn << PAGE_SHIFT) - 1);

	if (start_pfn < end_pfn)

		pr_info("Initmem setup node %d [mem %#010Lx-%#010Lx]\n", nid,

			start_pfn << PAGE_SHIFT, (end_pfn << PAGE_SHIFT) - 1);

	else

		pr_info("Initmem setup node %d [<memory-less node>]\n", nid);



	nd_pa = memblock_alloc_try_nid(nd_size, SMP_CACHE_BYTES, nid);

	nd = __va(nd_pa);