All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mike Rapoport <rppt@linux.ibm.com>
To: Angelo Dureghello <angelo@kernel-space.org>
Cc: gerg@linux-m68k.org, akpm@linux-foundation.org,
	linux-m68k@vger.kernel.org
Subject: Re: [PATCH] m68k: fix flatmem memory model setup
Date: Sun, 28 Feb 2021 10:51:38 +0200	[thread overview]
Message-ID: <20210228085138.GM1854360@linux.ibm.com> (raw)
In-Reply-To: <20210227232058.215436-1-angelo@kernel-space.org>

Hi,

On Sun, Feb 28, 2021 at 12:20:58AM +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>
> ---
>  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..84551b1a8b93 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	(PAGE_OFFSET >> PAGE_SHIFT)

Please keep m68k_memory[0].addr and only add the PAGE_SHIFT I've forgot in
4bfc848e0981. 
Some of the configurations with motorola mmu would be broken with static
PAGE_OFFSET and they require the actual detected memory start to be used as
ARCH_PFN_OFFSET.

>  #include <asm-generic/memory_model.h>
>  #endif
>  
> -- 
> 2.30.1
> 

-- 
Sincerely yours,
Mike.

      reply	other threads:[~2021-02-28  8:53 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-27 23:20 [PATCH] m68k: fix flatmem memory model setup Angelo Dureghello
2021-02-28  8:51 ` Mike Rapoport [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210228085138.GM1854360@linux.ibm.com \
    --to=rppt@linux.ibm.com \
    --cc=akpm@linux-foundation.org \
    --cc=angelo@kernel-space.org \
    --cc=gerg@linux-m68k.org \
    --cc=linux-m68k@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.