From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7026294254479605760 X-Received: by 2002:a1c:5409:: with SMTP id i9mr15862046wmb.146.1635963929526; Wed, 03 Nov 2021 11:25:29 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a1c:1c7:: with SMTP id 190ls3199397wmb.3.canary-gmail; Wed, 03 Nov 2021 11:25:28 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxtOVQKQkvHfTvSzmz0KGPDcJiuZrx8zMyHm0ej+lf+T36A8BlicR8RlLlS2aXeD55tEwfE X-Received: by 2002:a05:600c:290b:: with SMTP id i11mr17302814wmd.137.1635963928574; Wed, 03 Nov 2021 11:25:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1635963928; cv=none; d=google.com; s=arc-20160816; b=BioIFC0ecMj+F272KeFozHdQzmffi/E7HWuo5n+scn67Yg3a7XujxbMb3LLlNfIdoP WSbpBaTWoGZj+xIx0ZFEvnqkkqht56FaYgcIGwCiOkqS9F0YRKEy66JCn9BBgQT6pP3s II2GCTGthO2HMp12IGqiedCA0dNdT27M1sx6lNYj0D6DXnQ1AoBAAnBexgG8fiRHKthL BFwGleTwLpIq9NLvThErlBugaNcsDyvgqQyh00AMyNEdhqmxIn160WIk6qyD0pu+071C mQkF2UmQFu+Sq2pKlD69D++MKt0ix/t4Jx7xf+G+CLtPTO7xKexzBDUoNoQ46OeXX1yU D5QQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:subject:cc:to:from:date; bh=CTBjuLm5+Ivjb+DO5Fd7Z3Fe4cFgxQj3NLVGKerG+Ss=; b=j5Qs9xtIxJyT2C5Y96z42WdimLxK43ddPHCa0xIbRs0BFxkt4VP4DRAakiNHYn3Bh6 y3YawMPsyRB2B344oNMfQU4hLz6YZ4of7nNh6zDBsP9FISrvBfgGGxZCxHQyk3cy67J8 PstAgpfT3pBCIthHcRbvOBvwAybqVfcLPA1EVsS4tpF/MfnzM0Zy9QYNpcxZGHUQOpsY nO9L9LTZRWNltRaBgqGPBy9bI3/HnI/i+PdVT0M5MdjmDK4G3HVlsmX5S5LKqOPd6d32 m2GIKGSaj9yu0RSAk3dE3EqO2dLqKmxDlm+3s8P6WSE3YvtTry0sOuvYvxlyflN+0st8 NCpw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from goliath.siemens.de (goliath.siemens.de. [192.35.17.28]) by gmr-mx.google.com with ESMTPS id 201si224984wma.1.2021.11.03.11.25.28 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 03 Nov 2021 11:25:28 -0700 (PDT) Received-SPF: pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) client-ip=192.35.17.28; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of henning.schild@siemens.com designates 192.35.17.28 as permitted sender) smtp.mailfrom=henning.schild@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by goliath.siemens.de (8.15.2/8.15.2) with ESMTPS id 1A3IPRwT012804 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 3 Nov 2021 19:25:28 +0100 Received: from md1za8fc.ad001.siemens.net ([139.25.69.154]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 1A3IPRUt013424; Wed, 3 Nov 2021 19:25:27 +0100 Date: Wed, 3 Nov 2021 19:25:27 +0100 From: Henning Schild To: Vijai Kumar K Cc: Subject: Re: [PATCH] meta-isar: u-boot: Update to 2021.10 Message-ID: <20211103192527.793e13bb@md1za8fc.ad001.siemens.net> In-Reply-To: <20211103104950.2138656-1-Vijaikumar_Kanagarajan@mentor.com> References: <20211103104950.2138656-1-Vijaikumar_Kanagarajan@mentor.com> X-Mailer: Claws Mail 3.18.0 (GTK+ 2.24.33; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-TUID: En9IgfQXvG3I Am Wed, 3 Nov 2021 16:19:50 +0530 schrieb Vijai Kumar K : > Update to the latest u-boot. > > Signed-off-by: Vijai Kumar K > --- > Boot tested on de0-nano-soc. > > I donot have a stm32 board. Only build tested for it. > > Thanks, > Vijai Kumar K > > ...y-add-property-no-map-to-created-res.patch | 151 > ------------------ ...rty-no-map-to-secure-reserved-memory.patch | > 33 ---- ...{u-boot-2020.10.inc => u-boot-2021.10.inc} | 4 +- > ...0.10.bb => u-boot-de0-nano-soc_2021.10.bb} | 0 > .../u-boot/u-boot-stm32mp15x_2020.10.bb | 10 -- > .../u-boot/u-boot-stm32mp15x_2021.10.bb | 6 + > 6 files changed, 9 insertions(+), 195 deletions(-) > delete mode 100644 > meta-isar/recipes-bsp/u-boot/files/0001-fdtdec-optionally-add-property-no-map-to-created-res.patch > delete mode 100644 > meta-isar/recipes-bsp/u-boot/files/0002-optee-add-property-no-map-to-secure-reserved-memory.patch > rename meta-isar/recipes-bsp/u-boot/{u-boot-2020.10.inc => > u-boot-2021.10.inc} (64%) rename > meta-isar/recipes-bsp/u-boot/{u-boot-de0-nano-soc_2020.10.bb => > u-boot-de0-nano-soc_2021.10.bb} (100%) delete mode 100644 > meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2020.10.bb create mode > 100644 meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2021.10.bb > > diff --git > a/meta-isar/recipes-bsp/u-boot/files/0001-fdtdec-optionally-add-property-no-map-to-created-res.patch > b/meta-isar/recipes-bsp/u-boot/files/0001-fdtdec-optionally-add-property-no-map-to-created-res.patch > deleted file mode 100644 index 8a32fc1..0000000 --- > a/meta-isar/recipes-bsp/u-boot/files/0001-fdtdec-optionally-add-property-no-map-to-created-res.patch > +++ /dev/null @@ -1,151 +0,0 @@ > -From ccaa5747bdeae4261199dd7e80771e4de1c550ca Mon Sep 17 00:00:00 > 2001 -From: Etienne Carriere > -Date: Thu, 10 Sep 2020 10:49:59 +0200 > -Subject: [PATCH] fdtdec: optionally add property no-map to created > reserved > - memory node > - > -Add boolean input argument @no_map to helper function > -fdtdec_add_reserved_memory() to add or not "no-map" property > -for an added reserved memory node. > - > -Property no-map is used by the Linux kernel to not not map memory > -in its static memory mapping. It is needed for example for the| > -consistency of system non-cached memory and to prevent speculative > -accesses to some firewalled memory. > - > -No functional change. A later change will update to OPTEE library to > -add no-map property to OP-TEE reserved memory nodes. > - > -Signed-off-by: Etienne Carriere > -Signed-off-by: Patrice Chotard > -Reviewed-by: Simon Glass > ---- > - arch/riscv/lib/fdt_fixup.c | 2 +- > - include/fdtdec.h | 5 +++-- > - lib/fdtdec.c | 10 ++++++++-- > - lib/optee/optee.c | 2 +- > - test/dm/fdtdec.c | 6 +++--- > - 5 files changed, 16 insertions(+), 9 deletions(-) > - > -diff --git a/arch/riscv/lib/fdt_fixup.c b/arch/riscv/lib/fdt_fixup.c > -index 5b2420243f..d02062fd5b 100644 > ---- a/arch/riscv/lib/fdt_fixup.c > -+++ b/arch/riscv/lib/fdt_fixup.c > -@@ -75,7 +75,7 @@ int riscv_fdt_copy_resv_mem_node(const void *src, > void *dst) > - pmp_mem.start = addr; > - pmp_mem.end = addr + size - 1; > - err = fdtdec_add_reserved_memory(dst, basename, > &pmp_mem, -- > &phandle); -+ > &phandle, false); > - if (err < 0 && err != -FDT_ERR_EXISTS) { > - log_err("failed to add reserved memory: > %d\n", err); > - return err; > -diff --git a/include/fdtdec.h b/include/fdtdec.h > -index 152eb07b9e..62d1660973 100644 > ---- a/include/fdtdec.h > -+++ b/include/fdtdec.h > -@@ -1029,7 +1029,7 @@ static inline int fdtdec_set_phandle(void > *blob, int node, uint32_t phandle) > - * }; > - * uint32_t phandle; > - * > -- * fdtdec_add_reserved_memory(fdt, "framebuffer", &fb, > &phandle); -+ * fdtdec_add_reserved_memory(fdt, "framebuffer", > &fb, &phandle, false); > - * > - * This results in the following subnode being added to the > top-level > - * /reserved-memory node: > -@@ -1056,11 +1056,12 @@ static inline int fdtdec_set_phandle(void > *blob, int node, uint32_t phandle) > - * @param carveout information about the carveout region > - * @param phandlep return location for the phandle of the > carveout region > - * can be NULL if no phandle should be added > -+ * @param no_map add "no-map" property if true > - * @return 0 on success or a negative error code on failure > - */ > - int fdtdec_add_reserved_memory(void *blob, const char *basename, > - const struct fdt_memory *carveout, > -- uint32_t *phandlep); > -+ uint32_t *phandlep, bool no_map); > - > - /** > - * fdtdec_get_carveout() - reads a carveout from an FDT > -diff --git a/lib/fdtdec.c b/lib/fdtdec.c > -index 56bf9fcc79..b8fc5e2bff 100644 > ---- a/lib/fdtdec.c > -+++ b/lib/fdtdec.c > -@@ -1316,7 +1316,7 @@ static int fdtdec_init_reserved_memory(void > *blob) > - > - int fdtdec_add_reserved_memory(void *blob, const char *basename, > - const struct fdt_memory *carveout, > -- uint32_t *phandlep) > -+ uint32_t *phandlep, bool no_map) > - { > - fdt32_t cells[4] = {}, *ptr = cells; > - uint32_t upper, lower, phandle; > -@@ -1416,6 +1416,12 @@ int fdtdec_add_reserved_memory(void *blob, > const char *basename, > - if (err < 0) > - return err; > - > -+ if (no_map) { > -+ err = fdt_setprop(blob, node, "no-map", NULL, 0); > -+ if (err < 0) > -+ return err; > -+ } > -+ > - /* return the phandle for the new node for the caller to > use */ > - if (phandlep) > - *phandlep = phandle; > -@@ -1481,7 +1487,7 @@ int fdtdec_set_carveout(void *blob, const char > *node, const char *prop_name, > - fdt32_t value; > - void *prop; > - > -- err = fdtdec_add_reserved_memory(blob, name, carveout, > &phandle); -+ err = fdtdec_add_reserved_memory(blob, name, > carveout, &phandle, false); > - if (err < 0) { > - debug("failed to add reserved memory: %d\n", err); > - return err; > -diff --git a/lib/optee/optee.c b/lib/optee/optee.c > -index 457d4cca8a..963c2ff430 100644 > ---- a/lib/optee/optee.c > -+++ b/lib/optee/optee.c > -@@ -192,7 +192,7 @@ int optee_copy_fdt_nodes(const void *old_blob, > void *new_blob) > - ret = > fdtdec_add_reserved_memory(new_blob, > - > nodename, > - > &carveout, -- > NULL); -+ > NULL, false); > - free(oldname); > - > - if (ret < 0) > -diff --git a/test/dm/fdtdec.c b/test/dm/fdtdec.c > -index 716993f706..4119003041 100644 > ---- a/test/dm/fdtdec.c > -+++ b/test/dm/fdtdec.c > -@@ -80,7 +80,7 @@ static int > dm_test_fdtdec_add_reserved_memory(struct unit_test_state *uts) > - resv.start = 0x1000; > - resv.end = 0x1fff; > - ut_assertok(fdtdec_add_reserved_memory(blob, "rsvd_region", > -- &resv, &phandle)); > -+ &resv, &phandle, > false)); > - > - /* Test /reserve-memory and its subnode should exist */ > - parent = fdt_path_offset(blob, "/reserved-memory"); > -@@ -101,7 +101,7 @@ static int > dm_test_fdtdec_add_reserved_memory(struct unit_test_state *uts) > - resv.start = 0x2000; > - resv.end = 0x2fff; > - ut_assertok(fdtdec_add_reserved_memory(blob, "rsvd_region1", > -- &resv, &phandle1)); > -+ &resv, &phandle1, > false)); > - subnode = fdt_path_offset(blob, > "/reserved-memory/rsvd_region1"); > - ut_assert(subnode > 0); > - > -@@ -115,7 +115,7 @@ static int > dm_test_fdtdec_add_reserved_memory(struct unit_test_state *uts) > - resv.start = 0x1000; > - resv.end = 0x1fff; > - ut_assertok(fdtdec_add_reserved_memory(blob, "rsvd_region2", > -- &resv, &phandle1)); > -+ &resv, &phandle1, > false)); > - subnode = fdt_path_offset(blob, > "/reserved-memory/rsvd_region2"); > - ut_assert(subnode < 0); > - > --- > -2.26.2 > - > diff --git > a/meta-isar/recipes-bsp/u-boot/files/0002-optee-add-property-no-map-to-secure-reserved-memory.patch > b/meta-isar/recipes-bsp/u-boot/files/0002-optee-add-property-no-map-to-secure-reserved-memory.patch > deleted file mode 100644 index 6a39968..0000000 --- > a/meta-isar/recipes-bsp/u-boot/files/0002-optee-add-property-no-map-to-secure-reserved-memory.patch > +++ /dev/null @@ -1,33 +0,0 @@ > -From 3e15c315f97401f394ae83ed17fbef72b765222a Mon Sep 17 00:00:00 > 2001 -From: Etienne Carriere > -Date: Thu, 10 Sep 2020 10:50:01 +0200 > -Subject: [PATCH] optee: add property no-map to secure reserved memory > - > -OP-TEE reserved memory node must set property "no-map" to prevent > -Linux kernel from mapping secure memory unless what non-secure world > -speculative accesses of the CPU can violate the memory firmware > -configuration. > - > -Fixes: 6ccb05eae01b ("image: fdt: copy possible optee nodes to a > loaded devicetree") -Signed-off-by: Etienne Carriere > -Signed-off-by: Patrice Chotard > ---- > - lib/optee/optee.c | 2 +- > - 1 file changed, 1 insertion(+), 1 deletion(-) > - > -diff --git a/lib/optee/optee.c b/lib/optee/optee.c > -index 963c2ff430..9e6606568f 100644 > ---- a/lib/optee/optee.c > -+++ b/lib/optee/optee.c > -@@ -192,7 +192,7 @@ int optee_copy_fdt_nodes(const void *old_blob, > void *new_blob) > - ret = > fdtdec_add_reserved_memory(new_blob, > - > nodename, > - > &carveout, -- > NULL, false); -+ > NULL, true); > - free(oldname); > - > - if (ret < 0) > --- > -2.26.2 > - > diff --git a/meta-isar/recipes-bsp/u-boot/u-boot-2020.10.inc > b/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc similarity index 64% > rename from meta-isar/recipes-bsp/u-boot/u-boot-2020.10.inc > rename to meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc > index 604776a..964ae6d 100644 > --- a/meta-isar/recipes-bsp/u-boot/u-boot-2020.10.inc > +++ b/meta-isar/recipes-bsp/u-boot/u-boot-2021.10.inc > @@ -5,9 +5,11 @@ > > require recipes-bsp/u-boot/u-boot-custom.inc > > +DEBIAN_BUILD_DEPENDS += ", libssl-dev" > + I guess that should go into the inc and not the recipe. If that inc should still support older u-boots it should be somehow done conditionally depending on $PV[0] > 2020 My guess is that you have another board for which you can test, and you might have that very line in another recipe. Henning > SRC_URI += " \ > https://ftp.denx.de/pub/u-boot/u-boot-${PV}.tar.bz2 \ > " > -SRC_URI[sha256sum] = > "0d481bbdc05c0ee74908ec2f56a6daa53166cc6a78a0e4fac2ac5d025770a622" > +SRC_URI[sha256sum] = > "cde723e19262e646f2670d25e5ec4b1b368490de950d4e26275a988c36df0bd4" S > = "${WORKDIR}/u-boot-${PV}" diff --git > a/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2020.10.bb > b/meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2021.10.bb > similarity index 100% rename from > meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2020.10.bb rename to > meta-isar/recipes-bsp/u-boot/u-boot-de0-nano-soc_2021.10.bb diff > --git a/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2020.10.bb > b/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2020.10.bb deleted > file mode 100644 index 39fceb2..0000000 --- > a/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2020.10.bb +++ > /dev/null @@ -1,10 +0,0 @@ -# > -# Copyright (c) Siemens AG, 2020 > -# > -# SPDX-License-Identifier: MIT > - > -require u-boot-${PV}.inc > - > -SRC_URI += " \ > - > file://0001-fdtdec-optionally-add-property-no-map-to-created-res.patch > \ > - > file://0002-optee-add-property-no-map-to-secure-reserved-memory.patch" > diff --git > a/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2021.10.bb > b/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2021.10.bb new file > mode 100644 index 0000000..6d95643 --- /dev/null +++ > b/meta-isar/recipes-bsp/u-boot/u-boot-stm32mp15x_2021.10.bb @@ -0,0 > +1,6 @@ +# > +# Copyright (c) Siemens AG, 2020 > +# > +# SPDX-License-Identifier: MIT > + > +require u-boot-${PV}.inc