[PATCH 27/45] image: Allow loading a FIT config for a particular phase
Simon Glass
sjg at chromium.org
Sun Sep 25 17:02:30 CEST 2022
Add support for filtering out FIT configs by phase. Rather than adding yet
another argument to this already overloaded function, use a composite
value, where the phase is only added in if needed.
Tests for this come in a little later, as part of the updated VPL test.
Signed-off-by: Simon Glass <sjg at chromium.org>
---
boot/image-fit.c | 67 ++++++++++++++++++++++++++++++++++++++++++++----
include/image.h | 12 ++++++---
2 files changed, 70 insertions(+), 9 deletions(-)
diff --git a/boot/image-fit.c b/boot/image-fit.c
index 94074515258..c325116b82f 100644
--- a/boot/image-fit.c
+++ b/boot/image-fit.c
@@ -803,6 +803,40 @@ int fit_image_get_comp(const void *fit, int noffset, uint8_t *comp)
return 0;
}
+/**
+ * fit_image_get_phase() - get the phase for a configuration node
+ * @fit: pointer to the FIT format image header
+ * @offset: configuration-node offset
+ * @phasep: returns the phase
+ *
+ * Finds the phase property in a given configuration node. If the property is
+ * found, its (string) value is translated to the numeric id which is returned
+ * to the caller.
+ *
+ * Returns: 0 on success, -ENOENT if missing, -EINVAL for invalid value
+ */
+int fit_image_get_phase(const void *fit, int offset, enum image_phase_t *phasep)
+{
+ const void *data;
+ int len, ret;
+
+ /* Get phase name from property data */
+ data = fdt_getprop(fit, offset, FIT_PHASE_PROP, &len);
+ if (!data) {
+ fit_get_debug(fit, offset, FIT_PHASE_PROP, len);
+ *phasep = 0;
+ return -ENOENT;
+ }
+
+ /* Translate phase name to id */
+ ret = genimg_get_phase_id(data);
+ if (ret < 0)
+ return ret;
+ *phasep = ret;
+
+ return 0;
+}
+
static int fit_image_get_address(const void *fit, int noffset, char *name,
ulong *load)
{
@@ -1687,7 +1721,8 @@ int fit_check_format(const void *fit, ulong size)
return 0;
}
-int fit_conf_find_compat(const void *fit, const void *fdt)
+int fit_conf_find_compat(const void *fit, const void *fdt,
+ enum image_phase_t phase)
{
int ndepth = 0;
int noffset, confs_noffset, images_noffset;
@@ -1726,6 +1761,27 @@ int fit_conf_find_compat(const void *fit, const void *fdt)
if (ndepth > 1)
continue;
+ if (phase) {
+ enum image_phase_t conf_phase;
+ int ret;
+
+ ret = fit_image_get_phase(fit, noffset, &conf_phase);
+ if (ret == -EINVAL) {
+ log_debug("Invalid phase in node '%s'\n",
+ fdt_get_name(fit, noffset, NULL));
+ continue;
+ } else if (ret) {
+ log_debug("Missing phase in node '%s'\n",
+ fdt_get_name(fit, noffset, NULL));
+ continue;
+ } else if (conf_phase != phase) {
+ log_debug("Phase %s mismatch in node '%s'\n",
+ genimg_get_phase_name(conf_phase),
+ fdt_get_name(fit, noffset, NULL));
+ continue;
+ }
+ }
+
/* If there's a compat property in the config node, use that. */
if (fdt_getprop(fit, noffset, "compatible", NULL)) {
fdt = fit; /* search in FIT image */
@@ -1954,9 +2010,10 @@ static const char *fit_get_image_type_property(int type)
int fit_image_load(struct bootm_headers *images, ulong addr,
const char **fit_unamep, const char **fit_uname_configp,
- int arch, int image_type, int bootstage_id,
+ int arch, int ph_type, int bootstage_id,
enum fit_load_op load_op, ulong *datap, ulong *lenp)
{
+ int image_type = image_ph_type(ph_type);
int cfg_noffset, noffset;
const char *fit_uname;
const char *fit_uname_config;
@@ -2000,10 +2057,10 @@ int fit_image_load(struct bootm_headers *images, ulong addr,
*/
bootstage_mark(bootstage_id + BOOTSTAGE_SUB_NO_UNIT_NAME);
if (IS_ENABLED(CONFIG_FIT_BEST_MATCH) && !fit_uname_config) {
- cfg_noffset = fit_conf_find_compat(fit, gd_fdt_blob());
+ cfg_noffset = fit_conf_find_compat(fit, gd_fdt_blob(),
+ image_ph_phase(ph_type));
} else {
- cfg_noffset = fit_conf_get_node(fit,
- fit_uname_config);
+ cfg_noffset = fit_conf_get_node(fit, fit_uname_config);
}
if (cfg_noffset < 0) {
puts("Could not find configuration node\n");
diff --git a/include/image.h b/include/image.h
index 09821dce642..2aef364e836 100644
--- a/include/image.h
+++ b/include/image.h
@@ -691,9 +691,10 @@ int boot_get_fdt_fit(struct bootm_headers *images, ulong addr,
* name (e.g. "conf-1") or NULL to use the default. On
* exit points to the selected configuration name.
* @param arch Expected architecture (IH_ARCH_...)
- * @param image_type Required image type (IH_TYPE_...). If this is
+ * @param image_ph_type Required image type (IH_TYPE_...). If this is
* IH_TYPE_KERNEL then we allow IH_TYPE_KERNEL_NOLOAD
- * also.
+ * also. If a phase is required, this is included also,
+ * see image_phase_and_type()
* @param bootstage_id ID of starting bootstage to use for progress updates.
* This will be added to the BOOTSTAGE_SUB values when
* calling bootstage_mark()
@@ -704,7 +705,7 @@ int boot_get_fdt_fit(struct bootm_headers *images, ulong addr,
*/
int fit_image_load(struct bootm_headers *images, ulong addr,
const char **fit_unamep, const char **fit_uname_configp,
- int arch, int image_type, int bootstage_id,
+ int arch, int image_ph_type, int bootstage_id,
enum fit_load_op load_op, ulong *datap, ulong *lenp);
/**
@@ -1210,6 +1211,8 @@ int fit_check_format(const void *fit, ulong size);
* fit_conf_find_compat
* @fit: pointer to the FIT format image header
* @fdt: pointer to the device tree to compare against
+ * @phase: U-Boot phase to look for. If not IH_PHASE_NONE then only
+ * configurations with the given phase will be considered
*
* fit_conf_find_compat() attempts to find the configuration whose fdt is the
* most compatible with the passed in device tree.
@@ -1249,7 +1252,8 @@ int fit_check_format(const void *fit, ulong size);
* offset to the configuration to use if one was found
* -1 otherwise
*/
-int fit_conf_find_compat(const void *fit, const void *fdt);
+int fit_conf_find_compat(const void *fit, const void *fdt,
+ enum image_phase_t phase);
/**
* fit_conf_get_node - get node offset for configuration of a given unit name
--
2.37.3.998.g577e59143f-goog
More information about the U-Boot
mailing list