aboutsummaryrefslogtreecommitdiff
path: root/include/lib
diff options
context:
space:
mode:
authorMadhukar Pappireddy <madhukar.pappireddy@arm.com>2019-12-06 15:46:42 -0600
committerMadhukar Pappireddy <madhukar.pappireddy@arm.com>2020-03-11 10:19:21 -0500
commit25d740c45e14d42c9284ab1788a8d7b516608ece (patch)
treee0eb3eae765d72813ee49c15797cbae89d171e32 /include/lib
parentf09852c97bc5de46d7322f2d1532fdddbd787043 (diff)
downloadtrusted-firmware-a-25d740c45e14d42c9284ab1788a8d7b516608ece.tar.gz
fconf: enhancements to firmware configuration framework
A populate() function essentially captures the value of a property, defined by a platform, into a fconf related c structure. Such a callback is usually platform specific and is associated to a specific configuration source. For example, a populate() function which captures the hardware topology of the platform can only parse HW_CONFIG DTB. Hence each populator function must be registered with a specific 'config_type' identifier. It broadly represents a logical grouping of configuration properties which is usually a device tree source file. Example: > TB_FW: properties related to trusted firmware such as IO policies, base address of other DTBs, mbedtls heap info etc. > HW_CONFIG: properties related to hardware configuration of the SoC such as topology, GIC controller, PSCI hooks, CPU ID etc. This patch modifies FCONF_REGISTER_POPULATOR macro and fconf_populate() to register and invoke the appropriate callbacks selectively based on configuration type. Change-Id: I6f63b1fd7a8729c6c9137d5b63270af1857bb44a Signed-off-by: Madhukar Pappireddy <madhukar.pappireddy@arm.com>
Diffstat (limited to 'include/lib')
-rw-r--r--include/lib/fconf/fconf.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/include/lib/fconf/fconf.h b/include/lib/fconf/fconf.h
index 0401e5c066..09d2b59aa6 100644
--- a/include/lib/fconf/fconf.h
+++ b/include/lib/fconf/fconf.h
@@ -12,9 +12,16 @@
/* Public API */
#define FCONF_GET_PROPERTY(a, b, c) a##__##b##_getter(c)
-#define FCONF_REGISTER_POPULATOR(name, callback) \
+/*
+ * This macro takes three arguments:
+ * config: Configuration identifier
+ * name: property namespace
+ * callback: populate() function
+ */
+#define FCONF_REGISTER_POPULATOR(config, name, callback) \
__attribute__((used, section(".fconf_populator"))) \
const struct fconf_populator (name##__populator) = { \
+ .config_type = (#config), \
.info = (#name), \
.populate = (callback) \
};
@@ -27,6 +34,7 @@
*/
struct fconf_populator {
/* Description of the data loaded by the callback */
+ const char *config_type;
const char *info;
/* Callback used by fconf_populate function with a provided config dtb.
@@ -45,7 +53,7 @@ void fconf_load_config(void);
*
* Panic on error.
*/
-void fconf_populate(uintptr_t config);
+void fconf_populate(const char *config_type, uintptr_t config);
/* FCONF specific getter */
#define fconf__dtb_getter(prop) fconf_dtb_info.prop