dm: core: support reading a single indexed u32 value

[oweals/u-boot.git] / drivers / core / ofnode.c

diff --git a/drivers/core/ofnode.c b/drivers/core/ofnode.c
index 5a109dd7c977526a5a2bb167c465c6c8d6ee805b..5bc3b02996ebf972d2575804830b5829f9a8af61 100644 (file)
--- a/drivers/core/ofnode.c
+++ b/drivers/core/ofnode.c
@@ -8,6 +8,7 @@
 #include <dm.h>
 #include <fdtdec.h>
 #include <fdt_support.h>
+#include <malloc.h>
 #include <linux/libfdt.h>
 #include <dm/of_access.h>
 #include <dm/of_addr.h>
@@ -39,7 +40,7 @@ int ofnode_read_u32(ofnode node, const char *propname, u32 *outp)
        return 0;
 }
 
-int ofnode_read_u32_default(ofnode node, const char *propname, u32 def)
+u32 ofnode_read_u32_default(ofnode node, const char *propname, u32 def)
 {
        assert(ofnode_valid(node));
        ofnode_read_u32(node, propname, &def);
@@ -47,6 +48,46 @@ int ofnode_read_u32_default(ofnode node, const char *propname, u32 def)
        return def;
 }
 
+int ofnode_read_u32_index(ofnode node, const char *propname, int index,
+                         u32 *outp)
+{
+       const fdt32_t *cell;
+       int len;
+
+       assert(ofnode_valid(node));
+       debug("%s: %s: ", __func__, propname);
+
+       if (ofnode_is_np(node))
+               return of_read_u32_index(ofnode_to_np(node), propname, index,
+                                        outp);
+
+       cell = fdt_getprop(gd->fdt_blob, ofnode_to_offset(node), propname,
+                          &len);
+       if (!cell) {
+               debug("(not found)\n");
+               return -EINVAL;
+       }
+
+       if (len < (sizeof(int) * (index + 1))) {
+               debug("(not large enough)\n");
+               return -EOVERFLOW;
+       }
+
+       *outp = fdt32_to_cpu(cell[index]);
+       debug("%#x (%d)\n", *outp, *outp);
+
+       return 0;
+}
+
+u32 ofnode_read_u32_index_default(ofnode node, const char *propname, int index,
+                                 u32 def)
+{
+       assert(ofnode_valid(node));
+       ofnode_read_u32_index(node, propname, index, &def);
+
+       return def;
+}
+
 int ofnode_read_s32_default(ofnode node, const char *propname, s32 def)
 {
        assert(ofnode_valid(node));
@@ -57,7 +98,7 @@ int ofnode_read_s32_default(ofnode node, const char *propname, s32 def)
 
 int ofnode_read_u64(ofnode node, const char *propname, u64 *outp)
 {
-       const fdt64_t *cell;
+       const unaligned_fdt64_t *cell;
        int len;
 
        assert(ofnode_valid(node));
@@ -79,7 +120,7 @@ int ofnode_read_u64(ofnode node, const char *propname, u64 *outp)
        return 0;
 }
 
-int ofnode_read_u64_default(ofnode node, const char *propname, u64 def)
+u64 ofnode_read_u64_default(ofnode node, const char *propname, u64 def)
 {
        assert(ofnode_valid(node));
        ofnode_read_u64(node, propname, &def);
@@ -101,30 +142,47 @@ bool ofnode_read_bool(ofnode node, const char *propname)
        return prop ? true : false;
 }
 
-const char *ofnode_read_string(ofnode node, const char *propname)
+const void *ofnode_read_prop(ofnode node, const char *propname, int *sizep)
 {
-       const char *str = NULL;
-       int len = -1;
+       const char *val = NULL;
+       int len;
 
        assert(ofnode_valid(node));
        debug("%s: %s: ", __func__, propname);
 
        if (ofnode_is_np(node)) {
                struct property *prop = of_find_property(
-                               ofnode_to_np(node), propname, NULL);
+                               ofnode_to_np(node), propname, &len);
 
                if (prop) {
-                       str = prop->value;
+                       val = prop->value;
                        len = prop->length;
                }
        } else {
-               str = fdt_getprop(gd->fdt_blob, ofnode_to_offset(node),
+               val = fdt_getprop(gd->fdt_blob, ofnode_to_offset(node),
                                  propname, &len);
        }
-       if (!str) {
+       if (!val) {
                debug("<not found>\n");
+               if (sizep)
+                       *sizep = -FDT_ERR_NOTFOUND;
                return NULL;
        }
+       if (sizep)
+               *sizep = len;
+
+       return val;
+}
+
+const char *ofnode_read_string(ofnode node, const char *propname)
+{
+       const char *str;
+       int len;
+
+       str = ofnode_read_prop(node, propname, &len);
+       if (!str)
+               return NULL;
+
        if (strnlen(str, len) >= len) {
                debug("<invalid>\n");
                return NULL;
@@ -134,6 +192,16 @@ const char *ofnode_read_string(ofnode node, const char *propname)
        return str;
 }
 
+int ofnode_read_size(ofnode node, const char *propname)
+{
+       int len;
+
+       if (!ofnode_read_prop(node, propname, &len))
+               return -EINVAL;
+
+       return len;
+}
+
 ofnode ofnode_find_subnode(ofnode node, const char *subnode_name)
 {
        ofnode subnode;
@@ -212,7 +280,11 @@ ofnode ofnode_get_parent(ofnode node)
 
 const char *ofnode_get_name(ofnode node)
 {
-       assert(ofnode_valid(node));
+       if (!ofnode_valid(node)) {
+               debug("%s node not valid\n", __func__);
+               return NULL;
+       }
+
        if (ofnode_is_np(node))
                return strrchr(node.np->full_name, '/') + 1;
 
@@ -232,38 +304,21 @@ ofnode ofnode_get_by_phandle(uint phandle)
        return node;
 }
 
-int ofnode_read_size(ofnode node, const char *propname)
-{
-       int len;
-
-       if (ofnode_is_np(node)) {
-               struct property *prop = of_find_property(
-                               ofnode_to_np(node), propname, NULL);
-
-               if (prop)
-                       return prop->length;
-       } else {
-               if (fdt_getprop(gd->fdt_blob, ofnode_to_offset(node), propname,
-                               &len))
-                       return len;
-       }
-
-       return -EINVAL;
-}
-
-fdt_addr_t ofnode_get_addr_index(ofnode node, int index)
+fdt_addr_t ofnode_get_addr_size_index(ofnode node, int index, fdt_size_t *size)
 {
        int na, ns;
-       fdt_size_t size;
 
        if (ofnode_is_np(node)) {
                const __be32 *prop_val;
+               u64 size64;
                uint flags;
 
-               prop_val = of_get_address(ofnode_to_np(node), index,
-                                         (u64 *)&size, &flags);
+               prop_val = of_get_address(ofnode_to_np(node), index, &size64,
+                                         &flags);
                if (!prop_val)
                        return FDT_ADDR_T_NONE;
+               if (size)
+                       *size = size64;
 
                ns = of_n_size_cells(ofnode_to_np(node));
 
@@ -278,12 +333,19 @@ fdt_addr_t ofnode_get_addr_index(ofnode node, int index)
                ns = ofnode_read_simple_size_cells(ofnode_get_parent(node));
                return fdtdec_get_addr_size_fixed(gd->fdt_blob,
                                                  ofnode_to_offset(node), "reg",
-                                                 index, na, ns, &size, true);
+                                                 index, na, ns, size, true);
        }
 
        return FDT_ADDR_T_NONE;
 }
 
+fdt_addr_t ofnode_get_addr_index(ofnode node, int index)
+{
+       fdt_size_t size;
+
+       return ofnode_get_addr_size_index(node, index, &size);
+}
+
 fdt_addr_t ofnode_get_addr(ofnode node)
 {
        return ofnode_get_addr_index(node, 0);
@@ -406,20 +468,25 @@ ofnode ofnode_path(const char *path)
                return offset_to_ofnode(fdt_path_offset(gd->fdt_blob, path));
 }
 
-const char *ofnode_get_chosen_prop(const char *name)
+const void *ofnode_read_chosen_prop(const char *propname, int *sizep)
 {
        ofnode chosen_node;
 
        chosen_node = ofnode_path("/chosen");
 
-       return ofnode_read_string(chosen_node, name);
+       return ofnode_read_prop(chosen_node, propname, sizep);
+}
+
+const char *ofnode_read_chosen_string(const char *propname)
+{
+       return ofnode_read_chosen_prop(propname, NULL);
 }
 
 ofnode ofnode_get_chosen_node(const char *name)
 {
        const char *prop;
 
-       prop = ofnode_get_chosen_prop(name);
+       prop = ofnode_read_chosen_prop(name, NULL);
        if (!prop)
                return ofnode_null();
 
@@ -547,7 +614,7 @@ fdt_addr_t ofnode_get_addr_size(ofnode node, const char *property,
                ns = of_n_size_cells(np);
                *sizep = of_read_number(prop + na, ns);
 
-               if (IS_ENABLED(CONFIG_OF_TRANSLATE) && ns > 0)
+               if (CONFIG_IS_ENABLED(OF_TRANSLATE) && ns > 0)
                        return of_translate_address(np, prop);
                else
                        return of_read_number(prop, na);
@@ -607,7 +674,7 @@ int ofnode_read_pci_addr(ofnode node, enum fdt_pci_space type,
                        if ((fdt32_to_cpu(*cell) & type) == type) {
                                addr->phys_hi = fdt32_to_cpu(cell[0]);
                                addr->phys_mid = fdt32_to_cpu(cell[1]);
-                               addr->phys_lo = fdt32_to_cpu(cell[1]);
+                               addr->phys_lo = fdt32_to_cpu(cell[2]);
                                break;
                        }
 
@@ -764,6 +831,14 @@ u64 ofnode_translate_address(ofnode node, const fdt32_t *in_addr)
                return fdt_translate_address(gd->fdt_blob, ofnode_to_offset(node), in_addr);
 }
 
+u64 ofnode_translate_dma_address(ofnode node, const fdt32_t *in_addr)
+{
+       if (ofnode_is_np(node))
+               return of_translate_dma_address(ofnode_to_np(node), in_addr);
+       else
+               return fdt_translate_dma_address(gd->fdt_blob, ofnode_to_offset(node), in_addr);
+}
+
 int ofnode_device_is_compatible(ofnode node, const char *compat)
 {
        if (ofnode_is_np(node))
@@ -870,5 +945,5 @@ int ofnode_set_enabled(ofnode node, bool value)
        if (value)
                return ofnode_write_string(node, "status", "okay");
        else
-               return ofnode_write_string(node, "status", "disable");
+               return ofnode_write_string(node, "status", "disabled");
 }