[PATCH v2] m68k: fix flatmem memory model setup

[PATCH v2] m68k: fix flatmem memory model setup

[Angelo Dureghello]

Detected a broken boot on mcf54415, likely introduced from

commit 4bfc848e0981
("m68k/mm: enable use of generic memory_model.h for !DISCONTIGMEM")

Fix ARCH_PFN_OFFSET to be a pfn.

Signed-off-by: Angelo Dureghello <angelo@kernel-space.org>
---
Change for v2:
- replace PAGE_OFFSET with m68k_memory[0].addr
---
 arch/m68k/include/asm/page_mm.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h
index 8cfc92451711..1c683ce57d48 100644
--- a/arch/m68k/include/asm/page_mm.h
+++ b/arch/m68k/include/asm/page_mm.h
@@ -167,7 +167,7 @@ static inline __attribute_const__ int __virt_to_node_shift(void)
 	((__p) - pgdat->node_mem_map) + pgdat->node_start_pfn;		\
 })
 #else
-#define ARCH_PFN_OFFSET (m68k_memory[0].addr)
+#define ARCH_PFN_OFFSET (m68k_memory[0].addr >> PAGE_SHIFT)
 #include <asm-generic/memory_model.h>
 #endif
 
-- 
2.30.1

Re: [PATCH v2] m68k: fix flatmem memory model setup

[Mike Rapoport]

On Sun, Feb 28, 2021 at 08:08:28PM +0100, Angelo Dureghello wrote:
> Detected a broken boot on mcf54415, likely introduced from
> 
> commit 4bfc848e0981
> ("m68k/mm: enable use of generic memory_model.h for !DISCONTIGMEM")
> 
> Fix ARCH_PFN_OFFSET to be a pfn.
> 
> Signed-off-by: Angelo Dureghello <angelo@kernel-space.org>

Acked-by: Mike Rapoport <rppt@linux.ibm.com>

> ---
> Change for v2:
> - replace PAGE_OFFSET with m68k_memory[0].addr
> ---
>  arch/m68k/include/asm/page_mm.h | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h
> index 8cfc92451711..1c683ce57d48 100644
> --- a/arch/m68k/include/asm/page_mm.h
> +++ b/arch/m68k/include/asm/page_mm.h
> @@ -167,7 +167,7 @@ static inline __attribute_const__ int __virt_to_node_shift(void)
>  	((__p) - pgdat->node_mem_map) + pgdat->node_start_pfn;		\
>  })
>  #else
> -#define ARCH_PFN_OFFSET (m68k_memory[0].addr)
> +#define ARCH_PFN_OFFSET (m68k_memory[0].addr >> PAGE_SHIFT)
>  #include <asm-generic/memory_model.h>
>  #endif
>  
> -- 
> 2.30.1
> 

-- 
Sincerely yours,
Mike.

Re: [PATCH v2] m68k: fix flatmem memory model setup

[Greg Ungerer]

Hi Angelo,

On 1/3/21 5:08 am, Angelo Dureghello wrote:
> Detected a broken boot on mcf54415, likely introduced from
> 
> commit 4bfc848e0981
> ("m68k/mm: enable use of generic memory_model.h for !DISCONTIGMEM")
> 
> Fix ARCH_PFN_OFFSET to be a pfn.
> 
> Signed-off-by: Angelo Dureghello <angelo@kernel-space.org>

Thanks. I will add to the for-next (and for-linus) branches of
the m68knommu git tree - with Mike's Acked-by.

If no issues show up I'll get this to Linus in the next week
or two.

Thanks
Greg


> ---
> Change for v2:
> - replace PAGE_OFFSET with m68k_memory[0].addr
> ---
>   arch/m68k/include/asm/page_mm.h | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/m68k/include/asm/page_mm.h b/arch/m68k/include/asm/page_mm.h
> index 8cfc92451711..1c683ce57d48 100644
> --- a/arch/m68k/include/asm/page_mm.h
> +++ b/arch/m68k/include/asm/page_mm.h
> @@ -167,7 +167,7 @@ static inline __attribute_const__ int __virt_to_node_shift(void)
>   	((__p) - pgdat->node_mem_map) + pgdat->node_start_pfn;		\
>   })
>   #else
> -#define ARCH_PFN_OFFSET (m68k_memory[0].addr)
> +#define ARCH_PFN_OFFSET (m68k_memory[0].addr >> PAGE_SHIFT)
>   #include <asm-generic/memory_model.h>
>   #endif
>   
> 

Re: [PATCH v2] m68k: fix flatmem memory model setup

[Geert Uytterhoeven]

On Sun, Feb 28, 2021 at 9:12 PM Angelo Dureghello
<angelo@kernel-space.org> wrote:
> Detected a broken boot on mcf54415, likely introduced from
>
> commit 4bfc848e0981
> ("m68k/mm: enable use of generic memory_model.h for !DISCONTIGMEM")
>
> Fix ARCH_PFN_OFFSET to be a pfn.
>
> Signed-off-by: Angelo Dureghello <angelo@kernel-space.org>

Reviewed-by: Geert Uytterhoeven <geert@linux-m68k.org>

As this affects m68k-with-MMU, too, I have applied it, and queued it
in the m68k for-v5.13 branch.  But it should hit upstream before v5.12
due to Greg's pull request.

Gr{oetje,eeting}s,

                        Geert

-- 
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds