[U-Boot] [PATCH] malloc_simple: fix malloc_ptr calculation

[U-Boot] [PATCH] malloc_simple: fix malloc_ptr calculation

[Philipp Rosenberger]

The gd->malloc_ptr and the gd->malloc_limit are offsets to gd->malloc_base.
But the addr variable contains the absolute address. The new_ptr must be:
addr + bytes - gd->malloc_base.

Signed-off-by: Philipp Rosenberger <ilu@linutronix.de>
---
 common/malloc_simple.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/common/malloc_simple.c b/common/malloc_simple.c
index 134e059..c745863 100644
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@ -32,7 +32,7 @@ void *memalign_simple(size_t align, size_t bytes)
 	void *ptr;
 
 	addr = ALIGN(gd->malloc_base + gd->malloc_ptr, align);
-	new_ptr = addr + bytes;
+	new_ptr = addr + bytes - gd->malloc_base;
 	if (new_ptr > gd->malloc_limit)
 		return NULL;
 	ptr = map_sysmem(addr, bytes);
-- 
2.1.4

[U-Boot] [PATCH] malloc_simple: fix malloc_ptr calculation

[Hans de Goede]

Hi,

On 08-09-15 12:41, Philipp Rosenberger wrote:
> The gd->malloc_ptr and the gd->malloc_limit are offsets to gd->malloc_base.
> But the addr variable contains the absolute address. The new_ptr must be:
> addr + bytes - gd->malloc_base.
>
> Signed-off-by: Philipp Rosenberger <ilu@linutronix.de>

You're right, good catch:

Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Regards,

Hans


> ---
>   common/malloc_simple.c | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/common/malloc_simple.c b/common/malloc_simple.c
> index 134e059..c745863 100644
> --- a/common/malloc_simple.c
> +++ b/common/malloc_simple.c
> @@ -32,7 +32,7 @@ void *memalign_simple(size_t align, size_t bytes)
>   	void *ptr;
>
>   	addr = ALIGN(gd->malloc_base + gd->malloc_ptr, align);
> -	new_ptr = addr + bytes;
> +	new_ptr = addr + bytes - gd->malloc_base;
>   	if (new_ptr > gd->malloc_limit)
>   		return NULL;
>   	ptr = map_sysmem(addr, bytes);
>

[U-Boot] malloc_simple: fix malloc_ptr calculation

[Tom Rini]

On Tue, Sep 08, 2015 at 12:41:24PM +0200, Philipp Rosenberger wrote:

> The gd->malloc_ptr and the gd->malloc_limit are offsets to gd->malloc_base.
> But the addr variable contains the absolute address. The new_ptr must be:
> addr + bytes - gd->malloc_base.
> 
> Signed-off-by: Philipp Rosenberger <ilu@linutronix.de>
> Reviewed-by: Hans de Goede <hdegoede@redhat.com>

Applied to u-boot/master, thanks!

-- 
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 836 bytes
Desc: Digital signature
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20150928/98dd2f33/attachment.sig>

[U-Boot] malloc_simple: fix malloc_ptr calculation

[Sjoerd Simons]

On Mon, 2015-09-28 at 17:07 -0400, Tom Rini wrote:
> On Tue, Sep 08, 2015 at 12:41:24PM +0200, Philipp Rosenberger wrote:
> 
> > The gd->malloc_ptr and the gd->malloc_limit are offsets to gd
> > ->malloc_base.
> > But the addr variable contains the absolute address. The new_ptr
> > must be:
> > addr + bytes - gd->malloc_base.

Just bisected down git master not booting on my RK3288 board anymore,
turned out to be this patch. Reverting it on master makes for a much
happier board...

I'll dig a bit deeper what's going on here now.

-- 
Sjoerd Simons
Collabora Ltd.