Hi Sean,
On Fri, 3 Nov 2023 at 12:38, <seanedm...@linux.microsoft.com> wrote:
>
> From: Sean Edmond <seanedm...@microsoft.com>
>
> Use the newly introduced common API fdt_fixup_kaslr_seed() in the
> kaslrseed command.
>
> Signed-off-by: Sean Edmond <seanedm...@microsoft.com>
> ---
> cmd/kaslrseed.c | 22 ++++++++--------------
> 1 file changed, 8 insertions(+), 14 deletions(-)
>
> diff --git a/cmd/kaslrseed.c b/cmd/kaslrseed.c
> index 9acb8e16386..6f423702e7c 100644
> --- a/cmd/kaslrseed.c
> +++ b/cmd/kaslrseed.c
> @@ -19,7 +19,7 @@ static int do_kaslr_seed(struct cmd_tbl *cmdtp, int flag,
> int argc, char *const
> size_t n = 0x8;
> struct udevice *dev;
> u64 *buf;
> - int nodeoffset;
> + ofnode root;
> int ret = CMD_RET_SUCCESS;
>
> if (uclass_get_device(UCLASS_RNG, 0, &dev) || !dev) {
> @@ -45,21 +45,15 @@ static int do_kaslr_seed(struct cmd_tbl *cmdtp, int flag,
> int argc, char *const
> return CMD_RET_FAILURE;
> }
>
> - ret = fdt_check_header(working_fdt);
> - if (ret < 0) {
> - printf("fdt_chosen: %s\n", fdt_strerror(ret));
> - return CMD_RET_FAILURE;
> - }
> -
> - nodeoffset = fdt_find_or_add_subnode(working_fdt, 0, "chosen");
> - if (nodeoffset < 0) {
> - printf("Reading chosen node failed\n");
> - return CMD_RET_FAILURE;
> + ret = root_ofnode_from_fdt(working_fdt, &root);
> + if (ret) {
> + printf("ERROR: Unable to get root ofnode\n");
> + goto CMD_RET_FAILURE;
> }
>
> - ret = fdt_setprop(working_fdt, nodeoffset, "kaslr-seed", buf,
> sizeof(buf));
It looks like this buf needs a cast to u8 *
> - if (ret < 0) {
> - printf("Unable to set kaslr-seed on chosen node: %s\n",
> fdt_strerror(ret));
> + ret = fdt_fixup_kaslr_seed(root, buf, sizeof(buf));
> + if (ret) {
> + printf("ERROR: failed to add kaslr-seed to fdt\n");
> return CMD_RET_FAILURE;
> }
>
> --
> 2.42.0
>
Regards,
Simon
