From: Mike Rapoport <rppt@linux.ibm.com>
To: Vladimir Murzin <vladimir.murzin@arm.com>
Cc: linux-arm-kernel@lists.infradead.org, akpm@linux-foundation.org
Subject: Re: [PATCH] ARM: NOMMU: Fix conversion for_each_membock() to for_each_mem_range()
Date: Wed, 10 Mar 2021 15:23:10 +0200 [thread overview]
Message-ID: <YEjIPnttAGrQgdG4@linux.ibm.com> (raw)
In-Reply-To: <20210310102013.91253-1-vladimir.murzin@arm.com>
On Wed, Mar 10, 2021 at 10:20:13AM +0000, Vladimir Murzin wrote:
> for_each_mem_range() uses a loop variable, yet looking into code it is
> not just iteration counter but more complex entity which encodes
> information about memblock. Thus condition i == 0 looks fragile.
> Indeed, it broke boot of R-class platforms since it never took i == 0
> path (due to i was set to 1).
Oops, sorry about that.
> Fix that with restoring original flag
> check.
>
> Fixes: b10d6bca8720 ("arch, drivers: replace for_each_membock() with for_each_mem_range()")
> Signed-off-by: Vladimir Murzin <vladimir.murzin@arm.com>
Acked-by: Mike Rapoport <rppt@linux.ibm.com>
> ---
> arch/arm/mm/pmsa-v7.c | 4 +++-
> arch/arm/mm/pmsa-v8.c | 4 +++-
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mm/pmsa-v7.c b/arch/arm/mm/pmsa-v7.c
> index 88950e41a3a9..59d916ccdf25 100644
> --- a/arch/arm/mm/pmsa-v7.c
> +++ b/arch/arm/mm/pmsa-v7.c
> @@ -235,6 +235,7 @@ void __init pmsav7_adjust_lowmem_bounds(void)
> phys_addr_t mem_end;
> phys_addr_t reg_start, reg_end;
> unsigned int mem_max_regions;
> + bool first = true;
> int num;
> u64 i;
>
> @@ -263,7 +264,7 @@ void __init pmsav7_adjust_lowmem_bounds(void)
> #endif
>
> for_each_mem_range(i, ®_start, ®_end) {
> - if (i == 0) {
> + if (first) {
> phys_addr_t phys_offset = PHYS_OFFSET;
>
> /*
> @@ -275,6 +276,7 @@ void __init pmsav7_adjust_lowmem_bounds(void)
> mem_start = reg_start;
> mem_end = reg_end;
> specified_mem_size = mem_end - mem_start;
> + first = false;
> } else {
> /*
> * memblock auto merges contiguous blocks, remove
> diff --git a/arch/arm/mm/pmsa-v8.c b/arch/arm/mm/pmsa-v8.c
> index 2de019f7503e..8359748a19a1 100644
> --- a/arch/arm/mm/pmsa-v8.c
> +++ b/arch/arm/mm/pmsa-v8.c
> @@ -95,10 +95,11 @@ void __init pmsav8_adjust_lowmem_bounds(void)
> {
> phys_addr_t mem_end;
> phys_addr_t reg_start, reg_end;
> + bool first = true;
> u64 i;
>
> for_each_mem_range(i, ®_start, ®_end) {
> - if (i == 0) {
> + if (first) {
> phys_addr_t phys_offset = PHYS_OFFSET;
>
> /*
> @@ -107,6 +108,7 @@ void __init pmsav8_adjust_lowmem_bounds(void)
> if (reg_start != phys_offset)
> panic("First memory bank must be contiguous from PHYS_OFFSET");
> mem_end = reg_end;
> + first = false;
> } else {
> /*
> * memblock auto merges contiguous blocks, remove
> --
> 2.24.0
>
--
Sincerely yours,
Mike.
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-03-10 13:25 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-10 10:20 [PATCH] ARM: NOMMU: Fix conversion for_each_membock() to for_each_mem_range() Vladimir Murzin
2021-03-10 13:23 ` Mike Rapoport [this message]
2021-03-11 12:36 ` Vladimir Murzin
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=YEjIPnttAGrQgdG4@linux.ibm.com \
--to=rppt@linux.ibm.com \
--cc=akpm@linux-foundation.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=vladimir.murzin@arm.com \
/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.