From mboxrd@z Thu Jan  1 00:00:00 1970
From: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Date: Tue, 30 Oct 2018 13:37:20 +0100
Subject: [U-Boot] [PATCH] arm: socfpga: Fix bootcounter located at the
 end of internal SRAM
In-Reply-To: <56432f49-b1e3-2576-0bd3-1dba64484b98@denx.de>
References: <20181030090022.8061-1-sr@denx.de>
 <CAAh8qsxc3-8Nctt2pU5h=agM+QkrQqX2t0W9WpVCzUavKhXSkA@mail.gmail.com>
 <394b57bb-cacb-e2b7-e897-c777e34589ec@denx.de>
 <CAAh8qsyQCe3ERp-e5VDX0a4wdsSYxvXsJbMGoRJz1=wTLoZcWQ@mail.gmail.com>
 <CAAh8qsxKU3RygYqgk8VOm0spCxjD5_nmNRy5Xgn1=jpid87w1w@mail.gmail.com>
 <56432f49-b1e3-2576-0bd3-1dba64484b98@denx.de>
Message-ID: <CAAh8qsxi-LpbVZRnoaRg=49pagAD3NZG_GY3cLRnrhrNBKvH1A@mail.gmail.com>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

On Tue, Oct 30, 2018 at 12:28 PM Stefan Roese <sr@denx.de> wrote:
>
> On 30.10.18 12:17, Simon Goldschmidt wrote:
>
> <snip>
>
> >          >     diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h
> >          >     index 2330143cf1..bd8f5c8c41 100644
> >          >     --- a/include/configs/socfpga_common.h
> >          >     +++ b/include/configs/socfpga_common.h
> >          >     @@ -31,8 +31,21 @@
> >          >       #define CONFIG_SYS_INIT_RAM_ADDR       0xFFE00000
> >          >       #define CONFIG_SYS_INIT_RAM_SIZE       0x40000 /* 256KB */
> >          >       #endif
> >          >     +
> >          >     +/*
> >          >     + * Some boards (e.g. socfpga_sr1500) use 8 bytes at the end of the internal
> >          >     + * SRAM as bootcounter storage. Make sure to not put the stack directly
> >          >     + * at this address to not overwrite the bootcounter by checking, if the
> >          >     + * bootcounter address is located in the internal SRAM.
> >          >     + */
> >          >     +#if ((CONFIG_SYS_BOOTCOUNT_ADDR > CONFIG_SYS_INIT_RAM_ADDR) && \
> >          >     +     (CONFIG_SYS_BOOTCOUNT_ADDR < (CONFIG_SYS_INIT_RAM_ADDR +  \
> >          >     +                                  CONFIG_SYS_INIT_RAM_SIZE)))
> >          >     +#define CONFIG_SYS_INIT_SP_ADDR                CONFIG_SYS_BOOTCOUNT_ADDR
> >          >     +#else
> >          >       #define CONFIG_SYS_INIT_SP_ADDR                        \
> >          >              (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_RAM_SIZE)
> >          >     +#endif
> >
> >
> > Can we have this check on CONFIG_INIT_RAM_SIZE instead of the
> > initial stack pointer?
> >
> > That would ensure the SPL size checks stay intact.
>
> I'm not really sure what you mean with this. Could you please
> explain in more detail?

Sorry for being unclear. What I meant was: currently
CONFIG_SYS_INIT_RAM_SIZEis 0x10000 (the full 64 kByte).
So if CONFIG_SYS_BOOTCOUNT_ADDR is 0xfffffff8, I think we should
define CONFIG_SYS_INIT_RAM_SIZE to 0xfff8. That way, not only the
CONFIG_SYS_INIT_SP_ADDR define is correct but CONFIG_SPL_MAX_SIZE is
checked to not overlap this address, too.

Would that make sense to you?

Simon