Merge commit '53633a893a06bd5a0c807287d9cc29337806eaf7' as 'dts/upstream'

[J-u-boot.git] / common / malloc_simple.c

diff --git a/common/malloc_simple.c b/common/malloc_simple.c
index c74586376d3c61ce7c30aa927e888829ac76c174..0a004d40e1ec80ae9e7b5d61c4f8d831462083d8 100644 (file)
--- a/common/malloc_simple.c
+++ b/common/malloc_simple.c
@@ -1,54 +1,93 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Simple malloc implementation
  *
  * Copyright (c) 2014 Google, Inc
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
+#define LOG_CATEGORY LOGC_ALLOC
+
 #include <common.h>
+#include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
+#include <asm/global_data.h>
 #include <asm/io.h>
+#include <valgrind/valgrind.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
-void *malloc_simple(size_t bytes)
+static void *alloc_simple(size_t bytes, int align)
 {
-       ulong new_ptr;
+       ulong addr, new_ptr;
        void *ptr;
 
-       new_ptr = gd->malloc_ptr + bytes;
-       if (new_ptr > gd->malloc_limit)
+       addr = ALIGN(gd->malloc_base + gd->malloc_ptr, align);
+       new_ptr = addr + bytes - gd->malloc_base;
+       log_debug("size=%lx, ptr=%lx, limit=%lx: ", (ulong)bytes, new_ptr,
+                 gd->malloc_limit);
+       if (new_ptr > gd->malloc_limit) {
+               log_err("alloc space exhausted\n");
                return NULL;
-       ptr = map_sysmem(gd->malloc_base + gd->malloc_ptr, bytes);
+       }
+
+       ptr = map_sysmem(addr, bytes);
        gd->malloc_ptr = ALIGN(new_ptr, sizeof(new_ptr));
+
+       return ptr;
+}
+
+void *malloc_simple(size_t bytes)
+{
+       void *ptr;
+
+       ptr = alloc_simple(bytes, 1);
+       if (!ptr)
+               return ptr;
+
+       log_debug("%lx\n", (ulong)ptr);
+       VALGRIND_MALLOCLIKE_BLOCK(ptr, bytes, 0, false);
+
        return ptr;
 }
 
 void *memalign_simple(size_t align, size_t bytes)
 {
-       ulong addr, new_ptr;
        void *ptr;
 
-       addr = ALIGN(gd->malloc_base + gd->malloc_ptr, align);
-       new_ptr = addr + bytes - gd->malloc_base;
-       if (new_ptr > gd->malloc_limit)
-               return NULL;
-       ptr = map_sysmem(addr, bytes);
-       gd->malloc_ptr = ALIGN(new_ptr, sizeof(new_ptr));
+       ptr = alloc_simple(bytes, align);
+       if (!ptr)
+               return ptr;
+       log_debug("aligned to %lx\n", (ulong)ptr);
+       VALGRIND_MALLOCLIKE_BLOCK(ptr, bytes, 0, false);
+
        return ptr;
 }
 
-#ifdef CONFIG_SYS_MALLOC_SIMPLE
+#if CONFIG_IS_ENABLED(SYS_MALLOC_SIMPLE)
 void *calloc(size_t nmemb, size_t elem_size)
 {
        size_t size = nmemb * elem_size;
        void *ptr;
 
        ptr = malloc(size);
+       if (!ptr)
+               return ptr;
        memset(ptr, '\0', size);
 
        return ptr;
 }
+
+#if IS_ENABLED(CONFIG_VALGRIND)
+void free_simple(void *ptr)
+{
+       VALGRIND_FREELIKE_BLOCK(ptr, 0);
+}
 #endif
+#endif
+
+void malloc_simple_info(void)
+{
+       log_info("malloc_simple: %lx bytes used, %lx remain\n", gd->malloc_ptr,
+                CONFIG_VAL(SYS_MALLOC_F_LEN) - gd->malloc_ptr);
+}