diff mbox series

[linux,dev-4.19] ARM: dts: palmetto: Fix flash_memory region

Message ID 1550216841-57006-1-git-send-email-mine260309@gmail.com
State Accepted, archived
Headers show
Series [linux,dev-4.19] ARM: dts: palmetto: Fix flash_memory region | expand

Commit Message

Lei YU Feb. 15, 2019, 7:47 a.m. UTC
The flash_memory region was incorrect and exceeds AST2400's RAM range.
Fix it by putting it before coldfire region, and aligned with 32MiB.

Signed-off-by: Lei YU <mine260309@gmail.com>
---
 arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Andrew Jeffery Feb. 18, 2019, 2:44 a.m. UTC | #1
On Fri, 15 Feb 2019, at 18:17, Lei YU wrote:
> The flash_memory region was incorrect and exceeds AST2400's RAM range.
> Fix it by putting it before coldfire region, and aligned with 32MiB.
> 
> Signed-off-by: Lei YU <mine260309@gmail.com>

Acked-by: Andrew Jeffery <andrew@aj.id.au>

> ---
>  arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/
> boot/dts/aspeed-bmc-opp-palmetto.dts
> index 9285b90..50c9178 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> @@ -32,9 +32,9 @@
>  			no-map;
>  		};
>  
> -		flash_memory: region@98000000 {
> +		flash_memory: region@5c000000 {
>  			no-map;
> -			reg = <0x98000000 0x01000000>; /* 16MB */
> +			reg = <0x5C000000 0x02000000>; /* 32MB */
>  		};
>  	};
>  
> -- 
> 2.7.4
>
Joel Stanley Feb. 18, 2019, 2:47 a.m. UTC | #2
On Fri, 15 Feb 2019 at 18:17, Lei YU <mine260309@gmail.com> wrote:
>
> The flash_memory region was incorrect and exceeds AST2400's RAM range.
> Fix it by putting it before coldfire region, and aligned with 32MiB.

We've had a patch to do this in patchwork for some time now:

https://patchwork.ozlabs.org/patch/879522/

We can't do that as it breaks booting, as the FIT loading will
(sometimes) place the initrd or dtb in the reserved region, and this
stops Linux from being able to map it, causing boot to fail.

We need to fix that bug before we can resolve this issue. There is a
u-boot environment variable that can be set that stops anything being
loaded too high. The proper fix is probably to make u-boot's FIT
loader aware of the reserved mappings and not put things there. Other
suggestions are welcome.

>
> Signed-off-by: Lei YU <mine260309@gmail.com>
> ---
>  arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> index 9285b90..50c9178 100644
> --- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> +++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
> @@ -32,9 +32,9 @@
>                         no-map;
>                 };
>
> -               flash_memory: region@98000000 {
> +               flash_memory: region@5c000000 {
>                         no-map;
> -                       reg = <0x98000000 0x01000000>; /* 16MB */
> +                       reg = <0x5C000000 0x02000000>; /* 32MB */
>                 };
>         };
>
> --
> 2.7.4
>
Lei YU Feb. 18, 2019, 3:31 a.m. UTC | #3
> > The flash_memory region was incorrect and exceeds AST2400's RAM range.
> > Fix it by putting it before coldfire region, and aligned with 32MiB.
>
> We've had a patch to do this in patchwork for some time now:
>
> https://patchwork.ozlabs.org/patch/879522/
>
> We can't do that as it breaks booting, as the FIT loading will
> (sometimes) place the initrd or dtb in the reserved region, and this
> stops Linux from being able to map it, causing boot to fail.
>
> We need to fix that bug before we can resolve this issue. There is a
> u-boot environment variable that can be set that stops anything being
> loaded too high. The proper fix is probably to make u-boot's FIT
> loader aware of the reserved mappings and not put things there. Other
> suggestions are welcome.

This patch puts the window a bit lower, 0x5c000000 instead of 0x5e000000,
and from my testing it does not break booting.
diff mbox series

Patch

diff --git a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
index 9285b90..50c9178 100644
--- a/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
+++ b/arch/arm/boot/dts/aspeed-bmc-opp-palmetto.dts
@@ -32,9 +32,9 @@ 
 			no-map;
 		};
 
-		flash_memory: region@98000000 {
+		flash_memory: region@5c000000 {
 			no-map;
-			reg = <0x98000000 0x01000000>; /* 16MB */
+			reg = <0x5C000000 0x02000000>; /* 32MB */
 		};
 	};