dm: core: Add a place to put extra device-tree reading functions

Some functions deal with structured data rather than simple data types.
It makes sense to have these in their own file. For now this just has a
function to read a flashmap entry. Move the data types also.

Signed-off-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/core/Makefile b/drivers/core/Makefile
index 1c6795af13c9de0fdab5e4cba1bef5df23a54167..d74b065a0785cc45644b7909cd7541824cf24586 100644 (file)
--- a/drivers/core/Makefile
+++ b/drivers/core/Makefile
@@ -12,4 +12,4 @@ obj-$(CONFIG_DM)      += dump.o
 obj-$(CONFIG_$(SPL_)REGMAP)    += regmap.o
 obj-$(CONFIG_$(SPL_)SYSCON)    += syscon-uclass.o
 obj-$(CONFIG_OF_LIVE) += of_access.o of_addr.o
-obj-$(CONFIG_OF_CONTROL) += ofnode.o
+obj-$(CONFIG_OF_CONTROL) += of_extra.o ofnode.o

diff --git a/drivers/core/of_extra.c b/drivers/core/of_extra.c
new file mode 100644 (file)
index 0000000..0381909
--- /dev/null
+++ b/drivers/core/of_extra.c
@@ -0,0 +1,37 @@
+/*
+ * Copyright (c) 2017 Google, Inc
+ * Written by Simon Glass <sjg@chromium.org>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#include <common.h>
+#include <libfdt.h>
+#include <dm/of_access.h>
+#include <dm/of_extra.h>
+#include <dm/ofnode.h>
+
+int of_read_fmap_entry(ofnode node, const char *name,
+                      struct fmap_entry *entry)
+{
+       const char *prop;
+       u32 reg[2];
+
+       if (ofnode_read_u32_array(node, "reg", reg, 2)) {
+               debug("Node '%s' has bad/missing 'reg' property\n", name);
+               return -FDT_ERR_NOTFOUND;
+       }
+       entry->offset = reg[0];
+       entry->length = reg[1];
+       entry->used = ofnode_read_s32_default(node, "used", entry->length);
+       prop = ofnode_read_string(node, "compress");
+       entry->compress_algo = prop && !strcmp(prop, "lzo") ?
+               FMAP_COMPRESS_LZO : FMAP_COMPRESS_NONE;
+       prop = ofnode_read_string(node, "hash");
+       if (prop)
+               entry->hash_size = strlen(prop);
+       entry->hash_algo = prop ? FMAP_HASH_SHA256 : FMAP_HASH_NONE;
+       entry->hash = (uint8_t *)prop;
+
+       return 0;
+}

diff --git a/include/cros_ec.h b/include/cros_ec.h
index 0271f2b827cd4bfbe0c8d1174c2f46e1138846d7..2bd9f2251f87995a7c437fdaa44fed8877530163 100644 (file)
--- a/include/cros_ec.h
+++ b/include/cros_ec.h
@@ -14,6 +14,7 @@
 #include <fdtdec.h>
 #include <cros_ec_message.h>
 #include <asm/gpio.h>
+#include <dm/of_extra.h>
 
 /* Our configuration information */
 struct cros_ec_dev {

diff --git a/include/dm/of_extra.h b/include/dm/of_extra.h
new file mode 100644 (file)
index 0000000..01b6ebe
--- /dev/null
+++ b/include/dm/of_extra.h
@@ -0,0 +1,46 @@
+/*
+ * Copyright (c) 2017 Google, Inc
+ * Written by Simon Glass <sjg@chromium.org>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+#ifndef _DM_OF_EXTRA_H
+#define _DM_OF_EXTRA_H
+
+#include <dm/ofnode.h>
+
+enum fmap_compress_t {
+       FMAP_COMPRESS_NONE,
+       FMAP_COMPRESS_LZO,
+};
+
+enum fmap_hash_t {
+       FMAP_HASH_NONE,
+       FMAP_HASH_SHA1,
+       FMAP_HASH_SHA256,
+};
+
+/* A flash map entry, containing an offset and length */
+struct fmap_entry {
+       uint32_t offset;
+       uint32_t length;
+       uint32_t used;                  /* Number of bytes used in region */
+       enum fmap_compress_t compress_algo;     /* Compression type */
+       enum fmap_hash_t hash_algo;             /* Hash algorithm */
+       const uint8_t *hash;                    /* Hash value */
+       int hash_size;                          /* Hash size */
+};
+
+/**
+ * Read a flash entry from the fdt
+ *
+ * @param node Reference to node to read
+ * @param name         Name of node being read
+ * @param entry                Place to put offset and size of this node
+ * @return 0 if ok, -ve on error
+ */
+int of_read_fmap_entry(ofnode node, const char *name,
+                      struct fmap_entry *entry);
+
+#endif

diff --git a/include/fdtdec.h b/include/fdtdec.h
index 3000ecbb587b96359d87df98e97ed8704f3c3705..f27fb368ad036876e204514b08e5fcbacbaa9b65 100644 (file)
--- a/include/fdtdec.h
+++ b/include/fdtdec.h
@@ -815,28 +815,7 @@ const u8 *fdtdec_locate_byte_array(const void *blob, int node,
 int fdtdec_decode_region(const void *blob, int node, const char *prop_name,
                         fdt_addr_t *basep, fdt_size_t *sizep);
 
-enum fmap_compress_t {
-       FMAP_COMPRESS_NONE,
-       FMAP_COMPRESS_LZO,
-};
-
-enum fmap_hash_t {
-       FMAP_HASH_NONE,
-       FMAP_HASH_SHA1,
-       FMAP_HASH_SHA256,
-};
-
-/* A flash map entry, containing an offset and length */
-struct fmap_entry {
-       uint32_t offset;
-       uint32_t length;
-       uint32_t used;                  /* Number of bytes used in region */
-       enum fmap_compress_t compress_algo;     /* Compression type */
-       enum fmap_hash_t hash_algo;             /* Hash algorithm */
-       const uint8_t *hash;                    /* Hash value */
-       int hash_size;                          /* Hash size */
-};
-
+struct fmap_entry;
 /**
  * Read a flash entry from the fdt
  *

diff --git a/lib/fdtdec.c b/lib/fdtdec.c
index c072e54cffa6f9c3ac1955d806bb809f45d024f8..760732014dbe4959ad2ca2bce9b01e5bcdb6acce 100644 (file)
--- a/lib/fdtdec.c
+++ b/lib/fdtdec.c
@@ -12,6 +12,7 @@
 #include <fdt_support.h>
 #include <fdtdec.h>
 #include <asm/sections.h>
+#include <dm/of_extra.h>
 #include <linux/ctype.h>
 
 DECLARE_GLOBAL_DATA_PTR;