Merge https://source.denx.de/u-boot/custodians/u-boot-usb

[platform/kernel/u-boot.git] / common / bloblist.c

diff --git a/common/bloblist.c b/common/bloblist.c
index baf1d37..0d63b6e 100644 (file)
--- a/common/bloblist.c
+++ b/common/bloblist.c
@@ -1,11 +1,14 @@
-// SPDX-License-Identifier: GPL-2.0+
+// SPDX-License-Identifier: GPL-2.0+ BSD-3-Clause
 /*
  * Copyright 2018 Google, Inc
  * Written by Simon Glass <sjg@chromium.org>
  */
 
+#define LOG_CATEGORY   LOGC_BLOBLIST
+
 #include <common.h>
 #include <bloblist.h>
+#include <display_options.h>
 #include <log.h>
 #include <malloc.h>
 #include <mapmem.h>
@@ -133,9 +136,8 @@ static int bloblist_addrec(uint tag, int size, int align,
        new_alloced = data_start + ALIGN(size, align);
 
        if (new_alloced > hdr->size) {
-               log(LOGC_BLOBLIST, LOGL_ERR,
-                   "Failed to allocate %x bytes size=%x, need size=%x\n",
-                   size, hdr->size, new_alloced);
+               log_err("Failed to allocate %x bytes size=%x, need size=%x\n",
+                       size, hdr->size, new_alloced);
                return log_msg_ret("bloblist add", -ENOSPC);
        }
        rec = (void *)hdr + hdr->alloced;
@@ -249,14 +251,13 @@ static int bloblist_resize_rec(struct bloblist_hdr *hdr,
        expand_by = ALIGN(new_size - rec->size, BLOBLIST_ALIGN);
        new_alloced = ALIGN(hdr->alloced + expand_by, BLOBLIST_ALIGN);
        if (new_size < 0) {
-               log(LOGC_BLOBLIST, LOGL_DEBUG,
-                   "Attempt to shrink blob size below 0 (%x)\n", new_size);
+               log_debug("Attempt to shrink blob size below 0 (%x)\n",
+                         new_size);
                return log_msg_ret("size", -EINVAL);
        }
        if (new_alloced > hdr->size) {
-               log(LOGC_BLOBLIST, LOGL_ERR,
-                   "Failed to allocate %x bytes size=%x, need size=%x\n",
-                   new_size, hdr->size, new_alloced);
+               log_err("Failed to allocate %x bytes size=%x, need size=%x\n",
+                       new_size, hdr->size, new_alloced);
                return log_msg_ret("alloc", -ENOSPC);
        }
 
@@ -347,8 +348,7 @@ int bloblist_check(ulong addr, uint size)
                return log_msg_ret("Bad size", -EFBIG);
        chksum = bloblist_calc_chksum(hdr);
        if (hdr->chksum != chksum) {
-               log(LOGC_BLOBLIST, LOGL_ERR, "Checksum %x != %x\n", hdr->chksum,
-                   chksum);
+               log_err("Checksum %x != %x\n", hdr->chksum, chksum);
                return log_msg_ret("Bad checksum", -EIO);
        }
        gd->bloblist = hdr;
@@ -361,10 +361,24 @@ int bloblist_finish(void)
        struct bloblist_hdr *hdr = gd->bloblist;
 
        hdr->chksum = bloblist_calc_chksum(hdr);
+       log_debug("Finished bloblist size %lx at %lx\n", (ulong)hdr->size,
+                 (ulong)map_to_sysmem(hdr));
 
        return 0;
 }
 
+ulong bloblist_get_base(void)
+{
+       return map_to_sysmem(gd->bloblist);
+}
+
+ulong bloblist_get_size(void)
+{
+       struct bloblist_hdr *hdr = gd->bloblist;
+
+       return hdr->size;
+}
+
 void bloblist_get_stats(ulong *basep, ulong *sizep, ulong *allocedp)
 {
        struct bloblist_hdr *hdr = gd->bloblist;
@@ -416,37 +430,50 @@ void bloblist_reloc(void *to, uint to_size, void *from, uint from_size)
 
 int bloblist_init(void)
 {
-       bool expected;
+       bool fixed = IS_ENABLED(CONFIG_BLOBLIST_FIXED);
        int ret = -ENOENT;
+       ulong addr, size;
+       bool expected;
 
        /**
-        * Wed expect to find an existing bloblist in the first phase of U-Boot
-        * that runs
+        * We don't expect to find an existing bloblist in the first phase of
+        * U-Boot that runs. Also we have no way to receive the address of an
+        * allocated bloblist from a previous stage, so it must be at a fixed
+        * address.
         */
-       expected = !u_boot_first_phase();
+       expected = fixed && !u_boot_first_phase();
        if (spl_prev_phase() == PHASE_TPL && !IS_ENABLED(CONFIG_TPL_BLOBLIST))
                expected = false;
-       if (expected)
-               ret = bloblist_check(CONFIG_BLOBLIST_ADDR,
-                                    CONFIG_BLOBLIST_SIZE);
+       if (fixed)
+               addr = IF_ENABLED_INT(CONFIG_BLOBLIST_FIXED,
+                                     CONFIG_BLOBLIST_ADDR);
+       size = CONFIG_BLOBLIST_SIZE;
+       if (expected) {
+               ret = bloblist_check(addr, size);
+               if (ret) {
+                       log_warning("Expected bloblist at %lx not found (err=%d)\n",
+                                   addr, ret);
+               } else {
+                       /* Get the real size, if it is not what we expected */
+                       size = gd->bloblist->size;
+               }
+       }
        if (ret) {
-               ulong addr;
-
-               log(LOGC_BLOBLIST, expected ? LOGL_WARNING : LOGL_DEBUG,
-                   "Existing bloblist not found: creating new bloblist\n");
-               if (IS_ENABLED(CONFIG_BLOBLIST_ALLOC)) {
-                       void *ptr = memalign(BLOBLIST_ALIGN,
-                                            CONFIG_BLOBLIST_SIZE);
+               if (CONFIG_IS_ENABLED(BLOBLIST_ALLOC)) {
+                       void *ptr = memalign(BLOBLIST_ALIGN, size);
 
                        if (!ptr)
                                return log_msg_ret("alloc", -ENOMEM);
                        addr = map_to_sysmem(ptr);
-               } else {
-                       addr = CONFIG_BLOBLIST_ADDR;
+               } else if (!fixed) {
+                       return log_msg_ret("!fixed", ret);
                }
-               ret = bloblist_new(addr, CONFIG_BLOBLIST_SIZE, 0);
+               log_debug("Creating new bloblist size %lx at %lx\n", size,
+                         addr);
+               ret = bloblist_new(addr, size, 0);
        } else {
-               log(LOGC_BLOBLIST, LOGL_DEBUG, "Found existing bloblist\n");
+               log_debug("Found existing bloblist size %lx at %lx\n", size,
+                         addr);
        }
 
        return ret;