Re: [PATCH 2/2] m68k: mm: fix node memblock init

2020-06-17 Thread Greg Ungerer

Hi Mike,

On 17/6/20 4:53 pm, Mike Rapoport wrote:

From: Angelo Dureghello 

After pulling 5.7.0 (linux-next merge), mcf5441x mmu boot was
hanging silently.

memblock_add() seems not appropriate, since using MAX_NUMNODES
as node id, while memblock_add_node() sets up memory for node id 0.

Signed-off-by: Angelo Dureghello 
Signed-off-by: Mike Rapoport 


Acked-by: Greg Ungerer 

Regards
Greg



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

diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c
index 29f47923aa46..7d04210d34f0 100644
--- a/arch/m68k/mm/mcfmmu.c
+++ b/arch/m68k/mm/mcfmmu.c
@@ -174,7 +174,7 @@ void __init cf_bootmem_alloc(void)
m68k_memory[0].addr = _rambase;
m68k_memory[0].size = _ramend - _rambase;
  
-	memblock_add(m68k_memory[0].addr, m68k_memory[0].size);

+   memblock_add_node(m68k_memory[0].addr, m68k_memory[0].size, 0);
  
  	/* compute total pages in system */

num_pages = PFN_DOWN(_ramend - _rambase);



[PATCH 2/2] m68k: mm: fix node memblock init

2020-06-17 Thread Mike Rapoport
From: Angelo Dureghello 

After pulling 5.7.0 (linux-next merge), mcf5441x mmu boot was
hanging silently.

memblock_add() seems not appropriate, since using MAX_NUMNODES
as node id, while memblock_add_node() sets up memory for node id 0.

Signed-off-by: Angelo Dureghello 
Signed-off-by: Mike Rapoport 
---
 arch/m68k/mm/mcfmmu.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/m68k/mm/mcfmmu.c b/arch/m68k/mm/mcfmmu.c
index 29f47923aa46..7d04210d34f0 100644
--- a/arch/m68k/mm/mcfmmu.c
+++ b/arch/m68k/mm/mcfmmu.c
@@ -174,7 +174,7 @@ void __init cf_bootmem_alloc(void)
m68k_memory[0].addr = _rambase;
m68k_memory[0].size = _ramend - _rambase;
 
-   memblock_add(m68k_memory[0].addr, m68k_memory[0].size);
+   memblock_add_node(m68k_memory[0].addr, m68k_memory[0].size, 0);
 
/* compute total pages in system */
num_pages = PFN_DOWN(_ramend - _rambase);
-- 
2.26.2