From 701b498cecf92a6747c6f7b6c1adf5356735ac40 Mon Sep 17 00:00:00 2001 From: John Tsichritzis Date: Fri, 7 Sep 2018 14:42:09 +0100 Subject: [PATCH 1/4] Reorder log level macro definitions for clarity The definitions of the logging macros are reordered to be consistent with the definitions of the log levels. Change-Id: I6ff07b93eb64786ff147d39014d1c8e15db28444 Signed-off-by: John Tsichritzis --- include/common/debug.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/common/debug.h b/include/common/debug.h index 8ee55b882..a14a66e85 100644 --- a/include/common/debug.h +++ b/include/common/debug.h @@ -57,18 +57,18 @@ } \ } while (false) -#if LOG_LEVEL >= LOG_LEVEL_NOTICE -# define NOTICE(...) tf_log(LOG_MARKER_NOTICE __VA_ARGS__) -#else -# define NOTICE(...) no_tf_log(LOG_MARKER_NOTICE __VA_ARGS__) -#endif - #if LOG_LEVEL >= LOG_LEVEL_ERROR # define ERROR(...) tf_log(LOG_MARKER_ERROR __VA_ARGS__) #else # define ERROR(...) no_tf_log(LOG_MARKER_ERROR __VA_ARGS__) #endif +#if LOG_LEVEL >= LOG_LEVEL_NOTICE +# define NOTICE(...) tf_log(LOG_MARKER_NOTICE __VA_ARGS__) +#else +# define NOTICE(...) no_tf_log(LOG_MARKER_NOTICE __VA_ARGS__) +#endif + #if LOG_LEVEL >= LOG_LEVEL_WARNING # define WARN(...) tf_log(LOG_MARKER_WARNING __VA_ARGS__) #else From a623832683e3dc26560d1334a6f7ab0a7b0bce29 Mon Sep 17 00:00:00 2001 From: John Tsichritzis Date: Fri, 14 Sep 2018 10:34:57 +0100 Subject: [PATCH 2/4] Replace S-EL3 references by EL3 The "Secure" prefix (S-ELx) is valid only for S-EL0 and S-EL1 but is meaningless for EL3, since EL3 is always secure. Hence, the "S" prefix has been removed from wherever it was used as "S-EL3". Change-Id: Icdeac9506d763f9f83d7297c7113aec7b85e9dbe Signed-off-by: John Tsichritzis --- plat/arm/common/arm_bl31_setup.c | 2 +- plat/hisilicon/poplar/bl31_plat_setup.c | 2 +- plat/layerscape/common/ls_bl31_setup.c | 2 +- plat/marvell/common/marvell_bl31_setup.c | 2 +- plat/mediatek/mt6795/bl31_plat_setup.c | 2 +- plat/mediatek/mt8173/bl31_plat_setup.c | 2 +- plat/qemu/qemu_bl31_setup.c | 2 +- plat/rockchip/common/bl31_plat_setup.c | 2 +- plat/rpi3/rpi3_bl31_setup.c | 2 +- plat/xilinx/zynqmp/bl31_zynqmp_setup.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/plat/arm/common/arm_bl31_setup.c b/plat/arm/common/arm_bl31_setup.c index ed2c3fbce..e218c2f05 100644 --- a/plat/arm/common/arm_bl31_setup.c +++ b/plat/arm/common/arm_bl31_setup.c @@ -78,7 +78,7 @@ struct entry_point_info *bl31_plat_get_next_image_ep_info(uint32_t type) /******************************************************************************* * Perform any BL31 early platform setup common to ARM standard platforms. * Here is an opportunity to copy parameters passed by the calling EL (S-EL1 - * in BL2 & S-EL3 in BL1) before they are lost (potentially). This needs to be + * in BL2 & EL3 in BL1) before they are lost (potentially). This needs to be * done before the MMU is initialized so that the memory layout can be used * while creating page tables. BL2 has flushed this information to memory, so * we are guaranteed to pick up good data. diff --git a/plat/hisilicon/poplar/bl31_plat_setup.c b/plat/hisilicon/poplar/bl31_plat_setup.c index b45693f5e..83803a66a 100644 --- a/plat/hisilicon/poplar/bl31_plat_setup.c +++ b/plat/hisilicon/poplar/bl31_plat_setup.c @@ -61,7 +61,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) /******************************************************************************* * Perform any BL31 early platform setup common to ARM standard platforms. * Here is an opportunity to copy parameters passed by the calling EL (S-EL1 - * in BL2 & S-EL3 in BL1) before they are lost (potentially). This needs to be + * in BL2 & EL3 in BL1) before they are lost (potentially). This needs to be * done before the MMU is initialized so that the memory layout can be used * while creating page tables. BL2 has flushed this information to memory, so * we are guaranteed to pick up good data. diff --git a/plat/layerscape/common/ls_bl31_setup.c b/plat/layerscape/common/ls_bl31_setup.c index 1114a51e8..2067b9025 100644 --- a/plat/layerscape/common/ls_bl31_setup.c +++ b/plat/layerscape/common/ls_bl31_setup.c @@ -58,7 +58,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) /******************************************************************************* * Perform any BL31 early platform setup common to Layerscape platforms. * Here is an opportunity to copy parameters passed by the calling EL (S-EL1 - * in BL2 & S-EL3 in BL1) before they are lost (potentially). This needs to be + * in BL2 & EL3 in BL1) before they are lost (potentially). This needs to be * done before the MMU is initialized so that the memory layout can be used * while creating page tables. BL2 has flushed this information to memory, so * we are guaranteed to pick up good data. diff --git a/plat/marvell/common/marvell_bl31_setup.c b/plat/marvell/common/marvell_bl31_setup.c index 0bbb940f6..da91b5607 100644 --- a/plat/marvell/common/marvell_bl31_setup.c +++ b/plat/marvell/common/marvell_bl31_setup.c @@ -62,7 +62,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) /***************************************************************************** * Perform any BL31 early platform setup common to ARM standard platforms. * Here is an opportunity to copy parameters passed by the calling EL (S-EL1 - * in BL2 & S-EL3 in BL1) before they are lost (potentially). This needs to be + * in BL2 & EL3 in BL1) before they are lost (potentially). This needs to be * done before the MMU is initialized so that the memory layout can be used * while creating page tables. BL2 has flushed this information to memory, so * we are guaranteed to pick up good data. diff --git a/plat/mediatek/mt6795/bl31_plat_setup.c b/plat/mediatek/mt6795/bl31_plat_setup.c index d9577a6fc..96a0bd83f 100644 --- a/plat/mediatek/mt6795/bl31_plat_setup.c +++ b/plat/mediatek/mt6795/bl31_plat_setup.c @@ -165,7 +165,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) /******************************************************************************* * Perform any BL3-1 early platform setup. Here is an opportunity to copy - * parameters passed by the calling EL (S-EL1 in BL2 & S-EL3 in BL1) before they + * parameters passed by the calling EL (S-EL1 in BL2 & EL3 in BL1) before they * are lost (potentially). This needs to be done before the MMU is initialized * so that the memory layout can be used while creating page tables. * BL2 has flushed this information to memory, so we are guaranteed to pick up diff --git a/plat/mediatek/mt8173/bl31_plat_setup.c b/plat/mediatek/mt8173/bl31_plat_setup.c index ce5230963..c27de8295 100644 --- a/plat/mediatek/mt8173/bl31_plat_setup.c +++ b/plat/mediatek/mt8173/bl31_plat_setup.c @@ -86,7 +86,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) /******************************************************************************* * Perform any BL3-1 early platform setup. Here is an opportunity to copy - * parameters passed by the calling EL (S-EL1 in BL2 & S-EL3 in BL1) before they + * parameters passed by the calling EL (S-EL1 in BL2 & EL3 in BL1) before they * are lost (potentially). This needs to be done before the MMU is initialized * so that the memory layout can be used while creating page tables. * BL2 has flushed this information to memory, so we are guaranteed to pick up diff --git a/plat/qemu/qemu_bl31_setup.c b/plat/qemu/qemu_bl31_setup.c index 8b4312cf0..7542674ec 100644 --- a/plat/qemu/qemu_bl31_setup.c +++ b/plat/qemu/qemu_bl31_setup.c @@ -30,7 +30,7 @@ static entry_point_info_t bl33_image_ep_info; /******************************************************************************* * Perform any BL3-1 early platform setup. Here is an opportunity to copy - * parameters passed by the calling EL (S-EL1 in BL2 & S-EL3 in BL1) before + * parameters passed by the calling EL (S-EL1 in BL2 & EL3 in BL1) before * they are lost (potentially). This needs to be done before the MMU is * initialized so that the memory layout can be used while creating page * tables. BL2 has flushed this information to memory, so we are guaranteed diff --git a/plat/rockchip/common/bl31_plat_setup.c b/plat/rockchip/common/bl31_plat_setup.c index b8ec8c1cb..7a9f7a9d1 100644 --- a/plat/rockchip/common/bl31_plat_setup.c +++ b/plat/rockchip/common/bl31_plat_setup.c @@ -54,7 +54,7 @@ void params_early_setup(void *plat_param_from_bl2) /******************************************************************************* * Perform any BL3-1 early platform setup. Here is an opportunity to copy - * parameters passed by the calling EL (S-EL1 in BL2 & S-EL3 in BL1) before they + * parameters passed by the calling EL (S-EL1 in BL2 & EL3 in BL1) before they * are lost (potentially). This needs to be done before the MMU is initialized * so that the memory layout can be used while creating page tables. * BL2 has flushed this information to memory, so we are guaranteed to pick up diff --git a/plat/rpi3/rpi3_bl31_setup.c b/plat/rpi3/rpi3_bl31_setup.c index 306f26b3f..0ae783e12 100644 --- a/plat/rpi3/rpi3_bl31_setup.c +++ b/plat/rpi3/rpi3_bl31_setup.c @@ -47,7 +47,7 @@ entry_point_info_t *bl31_plat_get_next_image_ep_info(uint32_t type) /******************************************************************************* * Perform any BL31 early platform setup. Here is an opportunity to copy - * parameters passed by the calling EL (S-EL1 in BL2 & S-EL3 in BL1) before + * parameters passed by the calling EL (S-EL1 in BL2 & EL3 in BL1) before * they are lost (potentially). This needs to be done before the MMU is * initialized so that the memory layout can be used while creating page * tables. BL2 has flushed this information to memory, so we are guaranteed diff --git a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c index 02f1811f5..a14388f56 100644 --- a/plat/xilinx/zynqmp/bl31_zynqmp_setup.c +++ b/plat/xilinx/zynqmp/bl31_zynqmp_setup.c @@ -50,7 +50,7 @@ static inline void bl31_set_default_config(void) /* * Perform any BL31 specific platform actions. Here is an opportunity to copy - * parameters passed by the calling EL (S-EL1 in BL2 & S-EL3 in BL1) before they + * parameters passed by the calling EL (S-EL1 in BL2 & EL3 in BL1) before they * are lost (potentially). This needs to be done before the MMU is initialized * so that the memory layout can be used while creating page tables. */ From ea75ffd3e72d56f1d34b8b686b3b69e5f1d22acb Mon Sep 17 00:00:00 2001 From: John Tsichritzis Date: Fri, 5 Oct 2018 12:02:29 +0100 Subject: [PATCH 3/4] docs: Clarify usage of LOG_LEVEL Change-Id: I1ce771a155e6e83885a00d2f05591bf98cd69854 Signed-off-by: John Tsichritzis --- docs/user-guide.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/user-guide.rst b/docs/user-guide.rst index 2632329a2..f4ef85d2a 100644 --- a/docs/user-guide.rst +++ b/docs/user-guide.rst @@ -521,8 +521,8 @@ Common build options 40 (LOG_LEVEL_INFO) 50 (LOG_LEVEL_VERBOSE) - All log output up to and including the log level is compiled into the build. - The default value is 40 in debug builds and 20 in release builds. + All log output up to and including the selected log level is compiled into + the build. The default value is 40 in debug builds and 20 in release builds. - ``NON_TRUSTED_WORLD_KEY``: This option is used when ``GENERATE_COT=1``. It specifies the file that contains the Non-Trusted World private key in PEM From fadd21514bcf5e4884dec12a3da9dfc618b7a015 Mon Sep 17 00:00:00 2001 From: John Tsichritzis Date: Fri, 5 Oct 2018 14:16:26 +0100 Subject: [PATCH 4/4] Fix typos in changelog Change-Id: Icc6fb03abb9b4ef85931b9e3d767b5a9c271b5f3 Signed-off-by: John Tsichritzis --- docs/change-log.rst | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/docs/change-log.rst b/docs/change-log.rst index 95361e955..d329e8364 100644 --- a/docs/change-log.rst +++ b/docs/change-log.rst @@ -61,11 +61,11 @@ New Features - Introduce RAS handling on AArch64 - - Some RAS extensions are mandatory for ARMv8.2 CPUs, with others - mandatory for ARMv8.4 CPUs however, all extensions are also optional - extensions to the base ARMv8.0 architecture. + - Some RAS extensions are mandatory for Armv8.2 CPUs, with others + mandatory for Armv8.4 CPUs however, all extensions are also optional + extensions to the base Armv8.0 architecture. - - The ARMv8 RAS Extensions introduced Standard Error Records which are a + - The Armv8 RAS Extensions introduced Standard Error Records which are a set of standard registers to configure RAS node policy and allow RAS Nodes to record and expose error information for error handling agents. @@ -126,7 +126,7 @@ New Features - Various changes to support Clang linker and assembler - - The clang assembler/preprocessor is used when Clang is selected however, + - The clang assembler/preprocessor is used when Clang is selected. However, the clang linker is not used because it is unable to link TF-A objects due to immaturity of clang linker functionality at this time. @@ -213,12 +213,14 @@ New Features - Allwinner sun50i_h6 - - NXP ls1043 + - NXP QorIQ LS1043A - NXP i.MX8QX - NXP i.MX8QM + - NXP i.MX7Solo WaRP7 + - TI K3 - Socionext Synquacer SC2A11