Commit e780e4bc authored by Mike Rapoport's avatar Mike Rapoport Committed by Wen Zhiwei
Browse files

microblaze: don't treat zero reserved memory regions as error 

stable inclusion
from stable-v6.6.53
commit 1bab72a2b985b1c0465a982bdc3825505e1ad40b
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAZ0GM

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=1bab72a2b985b1c0465a982bdc3825505e1ad40b



--------------------------------

[ Upstream commit 0075df288dd8a7abfe03b3766176c393063591dd ]

Before commit 721f4a6526da ("mm/memblock: remove empty dummy entry") the
check for non-zero of memblock.reserved.cnt in mmu_init() would always
be true either because  memblock.reserved.cnt is initialized to 1 or
because there were memory reservations earlier.

The removal of dummy empty entry in memblock caused this check to fail
because now memblock.reserved.cnt is initialized to 0.

Remove the check for non-zero of memblock.reserved.cnt because it's
perfectly fine to have an empty memblock.reserved array that early in
boot.

Reported-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarMike Rapoport <rppt@kernel.org>
Reviewed-by: default avatarWei Yang <richard.weiyang@gmail.com>
Tested-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20240729053327.4091459-1-rppt@kernel.org


Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent c84c88c8

arch/microblaze/mm/init.c

+0 −5
Original line number Diff line number Diff line
@@ -193,11 +193,6 @@ asmlinkage void __init mmu_init(void) 
{

	unsigned int kstart, ksize;



	if (!memblock.reserved.cnt) {

		pr_emerg("Error memory count\n");

		machine_restart(NULL);

	}



	if ((u32) memblock.memory.regions[0].size < 0x400000) {

		pr_emerg("Memory must be greater than 4MB\n");

		machine_restart(NULL);