arm64: zynqmp: Cover K24 revB/1 SOM

[J-u-boot.git] / lib / binman.c

diff --git a/lib/binman.c b/lib/binman.c
index 1774bdf2e5c60c14f0e21ada30890eca877728f2..cfe1e5f80710ea7eec651176d0452ac80987b926 100644 (file)
--- a/lib/binman.c
+++ b/lib/binman.c
@@ -9,40 +9,144 @@
 #include <common.h>
 #include <binman.h>
 #include <dm.h>
+#include <log.h>
+#include <malloc.h>
+#include <mapmem.h>
 
+/**
+ * struct binman_info - Information needed by the binman library
+ *
+ * @image: Node describing the image we are running from
+ * @rom_offset: Offset from an image_pos to the memory-mapped address, or
+ *     ROM_OFFSET_NONE if the ROM is not memory-mapped. Can be positive or
+ *     negative
+ */
 struct binman_info {
        ofnode image;
+       int rom_offset;
 };
 
+#define ROM_OFFSET_NONE                (-1)
+
 static struct binman_info *binman;
 
-int binman_entry_find(const char *name, struct binman_entry *entry)
+/**
+ * find_image_node() - Find the top-level binman node
+ *
+ * Finds the binman node which can be used to load entries. The correct node
+ * depends on whether multiple-images is in use.
+ *
+ * @nodep: Returns the node found, on success
+ * Return: 0 if OK, , -EINVAL if there is no /binman node, -ECHILD if multiple
+ * images are being used but the first image is not available
+ */
+static int find_image_node(ofnode *nodep)
 {
        ofnode node;
+
+       node = ofnode_path("/binman");
+       if (!ofnode_valid(node))
+               return log_msg_ret("binman node", -EINVAL);
+       if (ofnode_read_bool(node, "multiple-images")) {
+               node = ofnode_first_subnode(node);
+
+               if (!ofnode_valid(node))
+                       return log_msg_ret("first image", -ECHILD);
+       }
+       *nodep = node;
+
+       return 0;
+}
+
+static int binman_entry_find_internal(ofnode node, const char *name,
+                                     struct binman_entry *entry)
+{
        int ret;
 
-       node = ofnode_find_subnode(binman->image, name);
        if (!ofnode_valid(node))
-               return log_msg_ret("no binman node", -ENOENT);
+               node = binman->image;
+       node = ofnode_find_subnode(node, name);
+       if (!ofnode_valid(node))
+               return log_msg_ret("node", -ENOENT);
 
        ret = ofnode_read_u32(node, "image-pos", &entry->image_pos);
        if (ret)
-               return log_msg_ret("bad binman node1", ret);
+               return log_msg_ret("image-pos", ret);
        ret = ofnode_read_u32(node, "size", &entry->size);
        if (ret)
-               return log_msg_ret("bad binman node2", ret);
+               return log_msg_ret("size", ret);
+
+       return 0;
+}
+
+int binman_entry_find(const char *name, struct binman_entry *entry)
+{
+       return binman_entry_find_internal(binman->image, name, entry);
+}
+
+int binman_entry_map(ofnode parent, const char *name, void **bufp, int *sizep)
+{
+       struct binman_entry entry;
+       int ret;
+
+       if (binman->rom_offset == ROM_OFFSET_NONE)
+               return -EPERM;
+       ret = binman_entry_find_internal(parent, name, &entry);
+       if (ret)
+               return log_msg_ret("entry", ret);
+       if (sizep)
+               *sizep = entry.size;
+       *bufp = map_sysmem(entry.image_pos + binman->rom_offset, entry.size);
+
+       return 0;
+}
+
+ofnode binman_section_find_node(const char *name)
+{
+       return ofnode_find_subnode(binman->image, name);
+}
+
+void binman_set_rom_offset(int rom_offset)
+{
+       binman->rom_offset = rom_offset;
+}
+
+int binman_get_rom_offset(void)
+{
+       return binman->rom_offset;
+}
+
+int binman_select_subnode(const char *name)
+{
+       ofnode node;
+       int ret;
+
+       ret = find_image_node(&node);
+       if (ret)
+               return log_msg_ret("main", -ENOENT);
+       node = ofnode_find_subnode(node, name);
+       if (!ofnode_valid(node))
+               return log_msg_ret("node", -ENOENT);
+       binman->image = node;
+       log_info("binman: Selected image subnode '%s'\n",
+                ofnode_get_name(binman->image));
 
        return 0;
 }
 
 int binman_init(void)
 {
+       int ret;
+
        binman = malloc(sizeof(struct binman_info));
        if (!binman)
                return log_msg_ret("space for binman", -ENOMEM);
-       binman->image = ofnode_path("/binman");
-       if (!ofnode_valid(binman->image))
-               return log_msg_ret("binman node", -EINVAL);
+       ret = find_image_node(&binman->image);
+       if (ret)
+               return log_msg_ret("node", -ENOENT);
+       binman_set_rom_offset(ROM_OFFSET_NONE);
+       log_debug("binman: Selected image node '%s'\n",
+                 ofnode_get_name(binman->image));
 
        return 0;
 }