* [PATCH] ARM: NOMMU: Fix conversion for_each_membock() to for_each_mem_range()
@ 2021-03-10 10:20 Vladimir Murzin
2021-03-10 13:23 ` Mike Rapoport
0 siblings, 1 reply; 3+ messages in thread
From: Vladimir Murzin @ 2021-03-10 10:20 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: rppt, akpm
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). 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>
---
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
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: NOMMU: Fix conversion for_each_membock() to for_each_mem_range()
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
2021-03-11 12:36 ` Vladimir Murzin
0 siblings, 1 reply; 3+ messages in thread
From: Mike Rapoport @ 2021-03-10 13:23 UTC (permalink / raw)
To: Vladimir Murzin; +Cc: linux-arm-kernel, akpm
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
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] ARM: NOMMU: Fix conversion for_each_membock() to for_each_mem_range()
2021-03-10 13:23 ` Mike Rapoport
@ 2021-03-11 12:36 ` Vladimir Murzin
0 siblings, 0 replies; 3+ messages in thread
From: Vladimir Murzin @ 2021-03-11 12:36 UTC (permalink / raw)
To: Mike Rapoport; +Cc: linux-arm-kernel, akpm
On 3/10/21 1:23 PM, Mike Rapoport wrote:
> 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>
>
Thanks!
I've just put it into Russell's patch system as patch 9069/1
Vladimir
>> ---
>> 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
>>
>
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2021-03-11 12:37 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
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
2021-03-11 12:36 ` Vladimir Murzin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).