mirror of
https://github.com/ARM-software/arm-trusted-firmware.git
synced 2025-04-16 01:24:27 +00:00
381f465ca9
disable_auth is defined as uint32_t and must be displayed
as an unsigned int.
lib/fconf/fconf_tbbr_getter.c:
In function ‘fconf_populate_tbbr_dyn_config’:
include/common/debug.h:46:41: error:
format ‘%d’ expects argument of type ‘int’, but argument 3 has
type ‘uint32_t’ {aka ‘unsigned int’} [-Werror=format=]
46 | #define LOG_MARKER_WARNING "\x1e" /* 30 */
| ^~~~~~
include/common/debug.h:77:32: note:
in expansion of macro ‘LOG_MARKER_WARNING’
77 | # define WARN(...) tf_log(LOG_MARKER_WARNING __VA_ARGS__)
| ^~~~~~~~~~~~~~~~~~
lib/fconf/fconf_tbbr_getter.c:47:17: note:
in expansion of macro ‘WARN’
47 | WARN("Invalid value for `%s` cell %d\n",
| ^~~~
include/common/debug.h:48:41: error:
format ‘%d’ expects argument of type ‘int’, but argument 5 has
type ‘uint32_t’ {aka ‘unsigned int’} [-Werror=format=]
48 | #define LOG_MARKER_VERBOSE "\x32" /* 50 */
| ^~~~~~
include/common/debug.h:58:32: note:
in definition of macro ‘no_tf_log’
58 | tf_log(fmt, ##__VA_ARGS__); \
| ^~~
include/common/debug.h:91:35: note:
in expansion of macro ‘LOG_MARKER_VERBOSE’
91 | # define VERBOSE(...)
| no_tf_log(LOG_MARKER_VERBOSE __VA_ARGS__)
| ^~~~~~~~~~~~~~~~~~
lib/fconf/fconf_tbbr_getter.c:74:9: note:
in expansion of macro ‘VERBOSE’
74 | VERBOSE("%s%s%s %d\n","FCONF: `tbbr.", "disable_auth",
| ^~~~~~~
cc1: all warnings being treated as errors
Change-Id: I0164ddfe511406cc1a8d014a368ef3e3c5f8cd27
Signed-off-by: Lionel Debieve <lionel.debieve@foss.st.com>
84 lines
2.3 KiB
C
84 lines
2.3 KiB
C
/*
|
|
* Copyright (c) 2019-2022, Arm Limited. All rights reserved.
|
|
*
|
|
* SPDX-License-Identifier: BSD-3-Clause
|
|
*/
|
|
#include <assert.h>
|
|
|
|
#include <common/bl_common.h>
|
|
#include <common/debug.h>
|
|
#include <common/fdt_wrappers.h>
|
|
#include <lib/fconf/fconf_tbbr_getter.h>
|
|
#include <libfdt.h>
|
|
|
|
struct tbbr_dyn_config_t tbbr_dyn_config;
|
|
|
|
int fconf_populate_tbbr_dyn_config(uintptr_t config)
|
|
{
|
|
int err;
|
|
int node;
|
|
uint64_t val64;
|
|
uint32_t val32;
|
|
|
|
/* As libfdt use void *, we can't avoid this cast */
|
|
const void *dtb = (void *)config;
|
|
|
|
/* Assert the node offset point to "arm,tb_fw" compatible property */
|
|
const char *compatible_str = "arm,tb_fw";
|
|
node = fdt_node_offset_by_compatible(dtb, -1, compatible_str);
|
|
if (node < 0) {
|
|
ERROR("FCONF: Can't find `%s` compatible in dtb\n",
|
|
compatible_str);
|
|
return node;
|
|
}
|
|
|
|
/* Locate the disable_auth cell and read the value */
|
|
err = fdt_read_uint32(dtb, node, "disable_auth",
|
|
&tbbr_dyn_config.disable_auth);
|
|
if (err < 0) {
|
|
WARN("FCONF: Read %s failed for `%s`\n",
|
|
"cell", "disable_auth");
|
|
return err;
|
|
}
|
|
|
|
/* Check if the value is boolean */
|
|
if ((tbbr_dyn_config.disable_auth != 0U) &&
|
|
(tbbr_dyn_config.disable_auth != 1U)) {
|
|
WARN("Invalid value for `%s` cell %u\n",
|
|
"disable_auth", tbbr_dyn_config.disable_auth);
|
|
return -1;
|
|
}
|
|
|
|
#if defined(DYN_DISABLE_AUTH)
|
|
if (tbbr_dyn_config.disable_auth == 1)
|
|
dyn_disable_auth();
|
|
#endif
|
|
|
|
/* Retrieve the Mbed TLS heap details from the DTB */
|
|
err = fdt_read_uint64(dtb, node, "mbedtls_heap_addr", &val64);
|
|
if (err < 0) {
|
|
ERROR("FCONF: Read %s failed for `%s`\n",
|
|
"cell", "mbedtls_heap_addr");
|
|
return err;
|
|
}
|
|
tbbr_dyn_config.mbedtls_heap_addr = (void *)(uintptr_t)val64;
|
|
|
|
err = fdt_read_uint32(dtb, node, "mbedtls_heap_size", &val32);
|
|
if (err < 0) {
|
|
ERROR("FCONF: Read %s failed for `%s`\n",
|
|
"cell", "mbedtls_heap_size");
|
|
return err;
|
|
}
|
|
tbbr_dyn_config.mbedtls_heap_size = val32;
|
|
|
|
VERBOSE("%s%s%s %u\n", "FCONF: `tbbr.", "disable_auth",
|
|
"` cell found with value =", tbbr_dyn_config.disable_auth);
|
|
VERBOSE("%s%s%s %p\n", "FCONF: `tbbr.", "mbedtls_heap_addr",
|
|
"` cell found with value =", tbbr_dyn_config.mbedtls_heap_addr);
|
|
VERBOSE("%s%s%s %zu\n", "FCONF: `tbbr.", "mbedtls_heap_size",
|
|
"` cell found with value =", tbbr_dyn_config.mbedtls_heap_size);
|
|
|
|
return 0;
|
|
}
|
|
|
|
FCONF_REGISTER_POPULATOR(TB_FW, tbbr, fconf_populate_tbbr_dyn_config);
|