[V2] memblock: check memory total_size

Commit Message

Peng Fan (OSS) Sept. 30, 2021, 2:44 a.m. UTC

From: Peng Fan <[e-mail]>

mem=[X][G|M] is broken on ARM64 platform, there are cases that
even type.cnt is 1, but total_size is not 0 because regions are merged
into 1. So only check 'cnt' is not enough, total_size should be used,
othersize bootargs 'mem=[X][G|B]' not work anymore.

Fixes: e888fa7bb882 ("memblock: Check memory add/cap ordering")
Cc: Mike Rapoport <[e-mail]>
Cc: Geert Uytterhoeven <[e-mail]>
Cc: David Hildenbrand <[e-mail]>
Signed-off-by: Peng Fan <[e-mail]>
---

V2:
 Update commit log
 Only check total_size, no need check cnt

 mm/memblock.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/mm/memblock.c b/mm/memblock.c
index 184dcd2e5d99..103b052c016e 100644
--- a/mm/memblock.c
+++ b/mm/memblock.c
@@ -1687,7 +1687,7 @@  void __init memblock_cap_memory_range(phys_addr_t base, phys_addr_t size)
 	if (!size)
 		return;
 
-	if (memblock.memory.cnt <= 1) {
+	if (!memblock_memory->total_size) {
 		pr_warn("%s: No memory registered yet\n", __func__);
 		return;
 	}