Re: [U-Boot] [PATCH] arm: mach-k3: Warn when node to disable is not found
On 08/01/20 4:42 AM, Andrew F. Davis wrote:
> Not finding a node that we try to disable does not always need to be
> fatal to boot but should at least print out a warning. Return error
> from fdt_disable_node as it did fail to disable the node, but only
> warn in the case of disabling the TRNG as this will not prevent boot.
>
> Signed-off-by: Andrew F. Davis
Reviewed-by: Lokesh Vutla
Thanks and regards,
Lokesh
> ---
> arch/arm/mach-k3/common.c | 4 ++--
> board/ti/am65x/evm.c | 4 +---
> 2 files changed, 3 insertions(+), 5 deletions(-)
>
> diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
> index 50f5b81dfe..e8b7d70e75 100644
> --- a/arch/arm/mach-k3/common.c
> +++ b/arch/arm/mach-k3/common.c
> @@ -174,8 +174,8 @@ int fdt_disable_node(void *blob, char *node_path)
>
> offs = fdt_path_offset(blob, node_path);
> if (offs < 0) {
> - debug("Node %s not found.\n", node_path);
> - return 0;
> + printf("Node %s not found.\n", node_path);
> + return offs;
> }
> ret = fdt_setprop_string(blob, offs, "status", "disabled");
> if (ret < 0) {
> diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
> index 4d86757c39..a610879424 100644
> --- a/board/ti/am65x/evm.c
> +++ b/board/ti/am65x/evm.c
> @@ -105,10 +105,8 @@ int ft_board_setup(void *blob, bd_t *bd)
> #if defined(CONFIG_TI_SECURE_DEVICE)
> /* Make HW RNG reserved for secure world use */
> ret = fdt_disable_node(blob, "/interconnect@10/trng@4e1");
> - if (ret) {
> + if (ret)
> printf("%s: disabling TRGN failed %d\n", __func__, ret);
> - return ret;
> - }
> #endif
>
> return 0;
>
[U-Boot] [PATCH] arm: mach-k3: Warn when node to disable is not found
Not finding a node that we try to disable does not always need to be
fatal to boot but should at least print out a warning. Return error
from fdt_disable_node as it did fail to disable the node, but only
warn in the case of disabling the TRNG as this will not prevent boot.
Signed-off-by: Andrew F. Davis
---
arch/arm/mach-k3/common.c | 4 ++--
board/ti/am65x/evm.c | 4 +---
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c
index 50f5b81dfe..e8b7d70e75 100644
--- a/arch/arm/mach-k3/common.c
+++ b/arch/arm/mach-k3/common.c
@@ -174,8 +174,8 @@ int fdt_disable_node(void *blob, char *node_path)
offs = fdt_path_offset(blob, node_path);
if (offs < 0) {
- debug("Node %s not found.\n", node_path);
- return 0;
+ printf("Node %s not found.\n", node_path);
+ return offs;
}
ret = fdt_setprop_string(blob, offs, "status", "disabled");
if (ret < 0) {
diff --git a/board/ti/am65x/evm.c b/board/ti/am65x/evm.c
index 4d86757c39..a610879424 100644
--- a/board/ti/am65x/evm.c
+++ b/board/ti/am65x/evm.c
@@ -105,10 +105,8 @@ int ft_board_setup(void *blob, bd_t *bd)
#if defined(CONFIG_TI_SECURE_DEVICE)
/* Make HW RNG reserved for secure world use */
ret = fdt_disable_node(blob, "/interconnect@10/trng@4e1");
- if (ret) {
+ if (ret)
printf("%s: disabling TRGN failed %d\n", __func__, ret);
- return ret;
- }
#endif
return 0;
--
2.17.1
