| Message ID | 20230329161613.812217-1-rui.silva@linaro.org |
|---|---|
| State | New |
| Headers | show |
| Series | arm-bsp/optee: bump corstone1000 to v3.20 | expand |
Hi, Reply directly to Rui but not for the mailing list so forward it. Rui Miguel Silva <rui.silva@linaro.org> escreveu no dia quarta, 29/03/2023 à(s) 20:15: > Oi Jose, > > Thanks for the review. > > Jose Quaresma <quaresma.jose@gmail.com> writes: > > > Hi Rui, > > > > Rui Miguel Silva <rui.silva@linaro.org> escreveu no dia quarta, > 29/03/2023 > > à(s) 17:15: > > > >> Bump the preferred corstone1000 to v3.20, drop patch > >> that is already included in this version. > >> Create the 3.20 bbappend and remove the entry in 3.18 bbappend. > >> > >> Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org> > >> --- > >> .../conf/machine/include/corstone1000.inc | 2 +- > >> .../0004-Handle-logging-syscall.patch | 33 ------------------- > >> .../optee/optee-os-corstone1000-common.inc | 8 ----- > >> .../optee/optee-os_3.18.0.bbappend | 1 - > >> .../optee/optee-os_3.20.0.bbappend | 6 ++++ > >> 5 files changed, 7 insertions(+), 43 deletions(-) > >> delete mode 100644 > >> > meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch > >> create mode 100644 > >> meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend > >> > >> diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc > >> b/meta-arm-bsp/conf/machine/include/corstone1000.inc > >> index 7f25cd54455f..3915d18b5627 100644 > >> --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc > >> +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc > >> @@ -34,7 +34,7 @@ UBOOT_ARCH = "arm" > >> UBOOT_EXTLINUX = "0" > >> > >> #optee > >> -PREFERRED_VERSION_optee-os ?= "3.18.%" > >> +PREFERRED_VERSION_optee-os ?= "3.20.%" > >> PREFERRED_VERSION_optee-client ?= "3.18.%" > >> EXTRA_IMAGEDEPENDS += "optee-os" > >> OPTEE_ARCH = "arm64" > >> diff --git > >> > a/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch > >> > b/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch > >> deleted file mode 100644 > >> index 356be9e04f9e..000000000000 > >> --- > >> > a/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch > >> +++ /dev/null > >> @@ -1,33 +0,0 @@ > >> -Upstream-Status: Pending [Not submitted to upstream yet] > >> -Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com> > >> - > >> -From b3fde6c2e1a950214f760ab9f194f3a6572292a8 Mon Sep 17 00:00:00 2001 > >> -From: Balint Dobszay <balint.dobszay@arm.com> > >> -Date: Fri, 15 Jul 2022 13:45:54 +0200 > >> -Subject: [PATCH] Handle logging syscall > >> - > >> -Signed-off-by: Balint Dobszay <balint.dobszay@arm.com> > >> -Change-Id: Ib8151cc9c66aea8bcc8fe8b1ecdc3f9f9c5f14e4 > >> - > >> -%% original patch: 0004-Handle-logging-syscall.patch > >> - > >> -diff --git a/core/arch/arm/kernel/spmc_sp_handler.c > >> b/core/arch/arm/kernel/spmc_sp_handler.c > >> -index e0fa0aa6..c7a45387 100644 > >> ---- a/core/arch/arm/kernel/spmc_sp_handler.c > >> -+++ b/core/arch/arm/kernel/spmc_sp_handler.c > >> -@@ -1004,6 +1004,12 @@ void spmc_sp_msg_handler(struct thread_smc_args > >> *args, > >> - ffa_mem_reclaim(args, caller_sp); > >> - sp_enter(args, caller_sp); > >> - break; > >> -+ case 0xdeadbeef: > >> -+ ts_push_current_session(&caller_sp->ts_sess); > >> -+ IMSG("%s", (char *)args->a1); > >> -+ ts_pop_current_session(); > >> -+ sp_enter(args, caller_sp); > >> -+ break; > >> - default: > >> - EMSG("Unhandled FFA function ID %#"PRIx32, > >> - (uint32_t)args->a0); > >> --- > >> -2.17.1 > >> - > >> diff --git > >> a/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc > >> b/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc > >> index 71b5ee62b902..30f99666626c 100644 > >> --- > a/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc > >> +++ > b/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc > >> @@ -1,15 +1,7 @@ > >> -SRCREV = "42f6617108fa43712652ef52f9d5b4ec5b2665f8" > >> -PV = "3.18.0+git${SRCPV}" > >> - > >> SRC_URI:remove = " \ > >> file://0003-core-link-add-no-warn-rwx-segments.patch > \ > >> " > >> > >> -FILESEXTRAPATHS:prepend := "${THISDIR}/files/optee-os/corstone1000:" > >> -SRC_URI:append = " \ > >> - file://0004-Handle-logging-syscall.patch \ > >> - " > >> - > >> COMPATIBLE_MACHINE = "corstone1000" > >> > >> OPTEEMACHINE = "corstone1000" > >> diff --git > a/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend > >> b/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend > >> index 4b03985ac97a..bc933dd54c48 100644 > >> --- a/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend > >> +++ b/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend > >> @@ -3,6 +3,5 @@ > >> MACHINE_OPTEE_OS_REQUIRE ?= "" > >> MACHINE_OPTEE_OS_REQUIRE:n1sdp = "optee-os-n1sdp.inc" > >> MACHINE_OPTEE_OS_REQUIRE:tc = "optee-os-tc.inc" > >> -MACHINE_OPTEE_OS_REQUIRE:corstone1000 = > "optee-os-corstone1000-common.inc" > >> > >> require ${MACHINE_OPTEE_OS_REQUIRE} > >> diff --git > a/meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend > >> b/meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend > >> new file mode 100644 > >> index 000000000000..e732c80f880b > >> --- /dev/null > >> +++ b/meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend > >> @@ -0,0 +1,6 @@ > >> +# Machine specific configurations > >> + > >> +MACHINE_OPTEE_OS_REQUIRE ?= "" > >> +MACHINE_OPTEE_OS_REQUIRE:corstone1000 = > "optee-os-corstone1000-common.inc" > >> + > >> +require ${MACHINE_OPTEE_OS_REQUIRE} > >> > > > > This will generate a bitbake parse error for other machines than > > corstone1000. > > > > Jose > > This pattern is used all over meta-arm/meta-arm-bsp, I see what you are > saying, that: require "" throws a bitbake error. But I guess that every > machine needs a require for specifying optee_os platform configuration > and details. > I think the issue is because now with the optee-os_3.20 bbappend the n1sdp and the tc override don't apply so the MACHINE_OPTEE_OS_REQUIRE can be blank which will trigger the parsing error. Jose > > @Ross, @Jon am I missing something here? > > Cheers, > Rui > > > > > >> -- > >> 2.34.1 > >> > >> > >> -=-=-=-=-=-=-=-=-=-=-=- > >> Links: You receive all messages sent to this group. > >> View/Reply Online (#4506): > >> https://lists.yoctoproject.org/g/meta-arm/message/4506 > >> Mute This Topic: https://lists.yoctoproject.org/mt/97932156/5052612 > >> Group Owner: meta-arm+owner@lists.yoctoproject.org > >> Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [ > >> quaresma.jose@gmail.com] > >> -=-=-=-=-=-=-=-=-=-=-=- > >> > >> > > > > -- > > Best regards, > > > > José Quaresma >
Hi Jose, Jose Quaresma <quaresma.jose@gmail.com> writes: > Hi, > > Reply directly to Rui but not for the mailing list so forward it. Sorry about that. > > Rui Miguel Silva <rui.silva@linaro.org> escreveu no dia quarta, 29/03/2023 > à(s) 20:15: > >> Oi Jose, >> >> Thanks for the review. >> >> Jose Quaresma <quaresma.jose@gmail.com> writes: >> >> > Hi Rui, >> > >> > Rui Miguel Silva <rui.silva@linaro.org> escreveu no dia quarta, >> 29/03/2023 >> > à(s) 17:15: >> > >> >> Bump the preferred corstone1000 to v3.20, drop patch >> >> that is already included in this version. >> >> Create the 3.20 bbappend and remove the entry in 3.18 bbappend. >> >> >> >> Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org> >> >> --- >> >> .../conf/machine/include/corstone1000.inc | 2 +- >> >> .../0004-Handle-logging-syscall.patch | 33 ------------------- >> >> .../optee/optee-os-corstone1000-common.inc | 8 ----- >> >> .../optee/optee-os_3.18.0.bbappend | 1 - >> >> .../optee/optee-os_3.20.0.bbappend | 6 ++++ >> >> 5 files changed, 7 insertions(+), 43 deletions(-) >> >> delete mode 100644 >> >> >> meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch >> >> create mode 100644 >> >> meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend >> >> >> >> diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc >> >> b/meta-arm-bsp/conf/machine/include/corstone1000.inc >> >> index 7f25cd54455f..3915d18b5627 100644 >> >> --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc >> >> +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc >> >> @@ -34,7 +34,7 @@ UBOOT_ARCH = "arm" >> >> UBOOT_EXTLINUX = "0" >> >> >> >> #optee >> >> -PREFERRED_VERSION_optee-os ?= "3.18.%" >> >> +PREFERRED_VERSION_optee-os ?= "3.20.%" >> >> PREFERRED_VERSION_optee-client ?= "3.18.%" >> >> EXTRA_IMAGEDEPENDS += "optee-os" >> >> OPTEE_ARCH = "arm64" >> >> diff --git >> >> >> a/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch >> >> >> b/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch >> >> deleted file mode 100644 >> >> index 356be9e04f9e..000000000000 >> >> --- >> >> >> a/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch >> >> +++ /dev/null >> >> @@ -1,33 +0,0 @@ >> >> -Upstream-Status: Pending [Not submitted to upstream yet] >> >> -Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com> >> >> - >> >> -From b3fde6c2e1a950214f760ab9f194f3a6572292a8 Mon Sep 17 00:00:00 2001 >> >> -From: Balint Dobszay <balint.dobszay@arm.com> >> >> -Date: Fri, 15 Jul 2022 13:45:54 +0200 >> >> -Subject: [PATCH] Handle logging syscall >> >> - >> >> -Signed-off-by: Balint Dobszay <balint.dobszay@arm.com> >> >> -Change-Id: Ib8151cc9c66aea8bcc8fe8b1ecdc3f9f9c5f14e4 >> >> - >> >> -%% original patch: 0004-Handle-logging-syscall.patch >> >> - >> >> -diff --git a/core/arch/arm/kernel/spmc_sp_handler.c >> >> b/core/arch/arm/kernel/spmc_sp_handler.c >> >> -index e0fa0aa6..c7a45387 100644 >> >> ---- a/core/arch/arm/kernel/spmc_sp_handler.c >> >> -+++ b/core/arch/arm/kernel/spmc_sp_handler.c >> >> -@@ -1004,6 +1004,12 @@ void spmc_sp_msg_handler(struct thread_smc_args >> >> *args, >> >> - ffa_mem_reclaim(args, caller_sp); >> >> - sp_enter(args, caller_sp); >> >> - break; >> >> -+ case 0xdeadbeef: >> >> -+ ts_push_current_session(&caller_sp->ts_sess); >> >> -+ IMSG("%s", (char *)args->a1); >> >> -+ ts_pop_current_session(); >> >> -+ sp_enter(args, caller_sp); >> >> -+ break; >> >> - default: >> >> - EMSG("Unhandled FFA function ID %#"PRIx32, >> >> - (uint32_t)args->a0); >> >> --- >> >> -2.17.1 >> >> - >> >> diff --git >> >> a/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc >> >> b/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc >> >> index 71b5ee62b902..30f99666626c 100644 >> >> --- >> a/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc >> >> +++ >> b/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc >> >> @@ -1,15 +1,7 @@ >> >> -SRCREV = "42f6617108fa43712652ef52f9d5b4ec5b2665f8" >> >> -PV = "3.18.0+git${SRCPV}" >> >> - >> >> SRC_URI:remove = " \ >> >> file://0003-core-link-add-no-warn-rwx-segments.patch >> \ >> >> " >> >> >> >> -FILESEXTRAPATHS:prepend := "${THISDIR}/files/optee-os/corstone1000:" >> >> -SRC_URI:append = " \ >> >> - file://0004-Handle-logging-syscall.patch \ >> >> - " >> >> - >> >> COMPATIBLE_MACHINE = "corstone1000" >> >> >> >> OPTEEMACHINE = "corstone1000" >> >> diff --git >> a/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend >> >> b/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend >> >> index 4b03985ac97a..bc933dd54c48 100644 >> >> --- a/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend >> >> +++ b/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend >> >> @@ -3,6 +3,5 @@ >> >> MACHINE_OPTEE_OS_REQUIRE ?= "" >> >> MACHINE_OPTEE_OS_REQUIRE:n1sdp = "optee-os-n1sdp.inc" >> >> MACHINE_OPTEE_OS_REQUIRE:tc = "optee-os-tc.inc" >> >> -MACHINE_OPTEE_OS_REQUIRE:corstone1000 = >> "optee-os-corstone1000-common.inc" >> >> >> >> require ${MACHINE_OPTEE_OS_REQUIRE} >> >> diff --git >> a/meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend >> >> b/meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend >> >> new file mode 100644 >> >> index 000000000000..e732c80f880b >> >> --- /dev/null >> >> +++ b/meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend >> >> @@ -0,0 +1,6 @@ >> >> +# Machine specific configurations >> >> + >> >> +MACHINE_OPTEE_OS_REQUIRE ?= "" >> >> +MACHINE_OPTEE_OS_REQUIRE:corstone1000 = >> "optee-os-corstone1000-common.inc" >> >> + >> >> +require ${MACHINE_OPTEE_OS_REQUIRE} >> >> >> > >> > This will generate a bitbake parse error for other machines than >> > corstone1000. >> > >> > Jose >> >> This pattern is used all over meta-arm/meta-arm-bsp, I see what you are >> saying, that: require "" throws a bitbake error. But I guess that every >> machine needs a require for specifying optee_os platform configuration >> and details. >> > > I think the issue is because now with the optee-os_3.20 bbappend the n1sdp > and the tc override don't apply > so the MACHINE_OPTEE_OS_REQUIRE can be blank which will trigger the parsing > error. But doesn't n1sdp and tc use the 3.18 bbappend? Here in the CI it is not failing to build for that platforms. Cheers, Rui > > Jose > > >> >> @Ross, @Jon am I missing something here? >> >> Cheers, >> Rui >> > >> > >> >> -- >> >> 2.34.1 >> >> >> >> >> >> -=-=-=-=-=-=-=-=-=-=-=- >> >> Links: You receive all messages sent to this group. >> >> View/Reply Online (#4506): >> >> https://lists.yoctoproject.org/g/meta-arm/message/4506 >> >> Mute This Topic: https://lists.yoctoproject.org/mt/97932156/5052612 >> >> Group Owner: meta-arm+owner@lists.yoctoproject.org >> >> Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [ >> >> quaresma.jose@gmail.com] >> >> -=-=-=-=-=-=-=-=-=-=-=- >> >> >> >> >> > >> > -- >> > Best regards, >> > >> > José Quaresma >> > > > -- > Best regards, > > José Quaresma
Rui Miguel Silva <rui.silva@linaro.org> escreveu no dia quinta, 30/03/2023 à(s) 08:15: > Hi Jose, > > Jose Quaresma <quaresma.jose@gmail.com> writes: > > > Hi, > > > > Reply directly to Rui but not for the mailing list so forward it. > > Sorry about that. > no problem! I was the one who forgot to forward to the mailing list. > > > > > Rui Miguel Silva <rui.silva@linaro.org> escreveu no dia quarta, > 29/03/2023 > > à(s) 20:15: > > > >> Oi Jose, > >> > >> Thanks for the review. > >> > >> Jose Quaresma <quaresma.jose@gmail.com> writes: > >> > >> > Hi Rui, > >> > > >> > Rui Miguel Silva <rui.silva@linaro.org> escreveu no dia quarta, > >> 29/03/2023 > >> > à(s) 17:15: > >> > > >> >> Bump the preferred corstone1000 to v3.20, drop patch > >> >> that is already included in this version. > >> >> Create the 3.20 bbappend and remove the entry in 3.18 bbappend. > >> >> > >> >> Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org> > >> >> --- > >> >> .../conf/machine/include/corstone1000.inc | 2 +- > >> >> .../0004-Handle-logging-syscall.patch | 33 > ------------------- > >> >> .../optee/optee-os-corstone1000-common.inc | 8 ----- > >> >> .../optee/optee-os_3.18.0.bbappend | 1 - > >> >> .../optee/optee-os_3.20.0.bbappend | 6 ++++ > >> >> 5 files changed, 7 insertions(+), 43 deletions(-) > >> >> delete mode 100644 > >> >> > >> > meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch > >> >> create mode 100644 > >> >> meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend > >> >> > >> >> diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc > >> >> b/meta-arm-bsp/conf/machine/include/corstone1000.inc > >> >> index 7f25cd54455f..3915d18b5627 100644 > >> >> --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc > >> >> +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc > >> >> @@ -34,7 +34,7 @@ UBOOT_ARCH = "arm" > >> >> UBOOT_EXTLINUX = "0" > >> >> > >> >> #optee > >> >> -PREFERRED_VERSION_optee-os ?= "3.18.%" > >> >> +PREFERRED_VERSION_optee-os ?= "3.20.%" > >> >> PREFERRED_VERSION_optee-client ?= "3.18.%" > >> >> EXTRA_IMAGEDEPENDS += "optee-os" > >> >> OPTEE_ARCH = "arm64" > >> >> diff --git > >> >> > >> > a/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch > >> >> > >> > b/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch > >> >> deleted file mode 100644 > >> >> index 356be9e04f9e..000000000000 > >> >> --- > >> >> > >> > a/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch > >> >> +++ /dev/null > >> >> @@ -1,33 +0,0 @@ > >> >> -Upstream-Status: Pending [Not submitted to upstream yet] > >> >> -Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com> > >> >> - > >> >> -From b3fde6c2e1a950214f760ab9f194f3a6572292a8 Mon Sep 17 00:00:00 > 2001 > >> >> -From: Balint Dobszay <balint.dobszay@arm.com> > >> >> -Date: Fri, 15 Jul 2022 13:45:54 +0200 > >> >> -Subject: [PATCH] Handle logging syscall > >> >> - > >> >> -Signed-off-by: Balint Dobszay <balint.dobszay@arm.com> > >> >> -Change-Id: Ib8151cc9c66aea8bcc8fe8b1ecdc3f9f9c5f14e4 > >> >> - > >> >> -%% original patch: 0004-Handle-logging-syscall.patch > >> >> - > >> >> -diff --git a/core/arch/arm/kernel/spmc_sp_handler.c > >> >> b/core/arch/arm/kernel/spmc_sp_handler.c > >> >> -index e0fa0aa6..c7a45387 100644 > >> >> ---- a/core/arch/arm/kernel/spmc_sp_handler.c > >> >> -+++ b/core/arch/arm/kernel/spmc_sp_handler.c > >> >> -@@ -1004,6 +1004,12 @@ void spmc_sp_msg_handler(struct > thread_smc_args > >> >> *args, > >> >> - ffa_mem_reclaim(args, caller_sp); > >> >> - sp_enter(args, caller_sp); > >> >> - break; > >> >> -+ case 0xdeadbeef: > >> >> -+ ts_push_current_session(&caller_sp->ts_sess); > >> >> -+ IMSG("%s", (char *)args->a1); > >> >> -+ ts_pop_current_session(); > >> >> -+ sp_enter(args, caller_sp); > >> >> -+ break; > >> >> - default: > >> >> - EMSG("Unhandled FFA function ID %#"PRIx32, > >> >> - (uint32_t)args->a0); > >> >> --- > >> >> -2.17.1 > >> >> - > >> >> diff --git > >> >> > a/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc > >> >> > b/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc > >> >> index 71b5ee62b902..30f99666626c 100644 > >> >> --- > >> a/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc > >> >> +++ > >> b/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc > >> >> @@ -1,15 +1,7 @@ > >> >> -SRCREV = "42f6617108fa43712652ef52f9d5b4ec5b2665f8" > >> >> -PV = "3.18.0+git${SRCPV}" > >> >> - > >> >> SRC_URI:remove = " \ > >> >> > file://0003-core-link-add-no-warn-rwx-segments.patch > >> \ > >> >> " > >> >> > >> >> -FILESEXTRAPATHS:prepend := "${THISDIR}/files/optee-os/corstone1000:" > >> >> -SRC_URI:append = " \ > >> >> - file://0004-Handle-logging-syscall.patch \ > >> >> - " > >> >> - > >> >> COMPATIBLE_MACHINE = "corstone1000" > >> >> > >> >> OPTEEMACHINE = "corstone1000" > >> >> diff --git > >> a/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend > >> >> b/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend > >> >> index 4b03985ac97a..bc933dd54c48 100644 > >> >> --- a/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend > >> >> +++ b/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend > >> >> @@ -3,6 +3,5 @@ > >> >> MACHINE_OPTEE_OS_REQUIRE ?= "" > >> >> MACHINE_OPTEE_OS_REQUIRE:n1sdp = "optee-os-n1sdp.inc" > >> >> MACHINE_OPTEE_OS_REQUIRE:tc = "optee-os-tc.inc" > >> >> -MACHINE_OPTEE_OS_REQUIRE:corstone1000 = > >> "optee-os-corstone1000-common.inc" > >> >> > >> >> require ${MACHINE_OPTEE_OS_REQUIRE} > >> >> diff --git > >> a/meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend > >> >> b/meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend > >> >> new file mode 100644 > >> >> index 000000000000..e732c80f880b > >> >> --- /dev/null > >> >> +++ b/meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend > >> >> @@ -0,0 +1,6 @@ > >> >> +# Machine specific configurations > >> >> + > >> >> +MACHINE_OPTEE_OS_REQUIRE ?= "" > >> >> +MACHINE_OPTEE_OS_REQUIRE:corstone1000 = > >> "optee-os-corstone1000-common.inc" > >> >> + > >> >> +require ${MACHINE_OPTEE_OS_REQUIRE} > >> >> > >> > > >> > This will generate a bitbake parse error for other machines than > >> > corstone1000. > >> > > >> > Jose > >> > >> This pattern is used all over meta-arm/meta-arm-bsp, I see what you are > >> saying, that: require "" throws a bitbake error. But I guess that every > >> machine needs a require for specifying optee_os platform configuration > >> and details. > >> > > > > I think the issue is because now with the optee-os_3.20 bbappend the > n1sdp > > and the tc override don't apply > > so the MACHINE_OPTEE_OS_REQUIRE can be blank which will trigger the > parsing > > error. > > But doesn't n1sdp and tc use the 3.18 bbappend? Here in the CI it is not > failing to build for that platforms. > I have misunderstood that to use the 3.20 bbappend, the machine needs to be the corstone1000 because of the preferred version in meta-arm-bsp/conf/machine/include/corstone1000.inc. So the MACHINE_OPTEE_OS_REQUIRE will never be empty. Sorry for the noise. Jose > > Cheers, > Rui > > > > > Jose > > > > > >> > >> @Ross, @Jon am I missing something here? > >> > >> Cheers, > >> Rui > >> > > >> > > >> >> -- > >> >> 2.34.1 > >> >> > >> >> > >> >> -=-=-=-=-=-=-=-=-=-=-=- > >> >> Links: You receive all messages sent to this group. > >> >> View/Reply Online (#4506): > >> >> https://lists.yoctoproject.org/g/meta-arm/message/4506 > >> >> Mute This Topic: https://lists.yoctoproject.org/mt/97932156/5052612 > >> >> Group Owner: meta-arm+owner@lists.yoctoproject.org > >> >> Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [ > >> >> quaresma.jose@gmail.com] > >> >> -=-=-=-=-=-=-=-=-=-=-=- > >> >> > >> >> > >> > > >> > -- > >> > Best regards, > >> > > >> > José Quaresma > >> > > > > > > -- > > Best regards, > > > > José Quaresma >
Hi José, On Thu, 30 Mar 2023, 08:38 Jose Quaresma, <quaresma.jose@gmail.com> wrote: > > > Rui Miguel Silva <rui.silva@linaro.org> escreveu no dia quinta, > 30/03/2023 à(s) 08:15: > >> Hi Jose, >> >> Jose Quaresma <quaresma.jose@gmail.com> writes: >> >> > Hi, >> > >> > Reply directly to Rui but not for the mailing list so forward it. >> >> Sorry about that. >> > > no problem! I was the one who forgot to forward to the mailing list. > > >> >> > >> > Rui Miguel Silva <rui.silva@linaro.org> escreveu no dia quarta, >> 29/03/2023 >> > à(s) 20:15: >> > >> >> Oi Jose, >> >> >> >> Thanks for the review. >> >> >> >> Jose Quaresma <quaresma.jose@gmail.com> writes: >> >> >> >> > Hi Rui, >> >> > >> >> > Rui Miguel Silva <rui.silva@linaro.org> escreveu no dia quarta, >> >> 29/03/2023 >> >> > à(s) 17:15: >> >> > >> >> >> Bump the preferred corstone1000 to v3.20, drop patch >> >> >> that is already included in this version. >> >> >> Create the 3.20 bbappend and remove the entry in 3.18 bbappend. >> >> >> >> >> >> Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org> >> >> >> --- >> >> >> .../conf/machine/include/corstone1000.inc | 2 +- >> >> >> .../0004-Handle-logging-syscall.patch | 33 >> ------------------- >> >> >> .../optee/optee-os-corstone1000-common.inc | 8 ----- >> >> >> .../optee/optee-os_3.18.0.bbappend | 1 - >> >> >> .../optee/optee-os_3.20.0.bbappend | 6 ++++ >> >> >> 5 files changed, 7 insertions(+), 43 deletions(-) >> >> >> delete mode 100644 >> >> >> >> >> >> meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch >> >> >> create mode 100644 >> >> >> meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend >> >> >> >> >> >> diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc >> >> >> b/meta-arm-bsp/conf/machine/include/corstone1000.inc >> >> >> index 7f25cd54455f..3915d18b5627 100644 >> >> >> --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc >> >> >> +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc >> >> >> @@ -34,7 +34,7 @@ UBOOT_ARCH = "arm" >> >> >> UBOOT_EXTLINUX = "0" >> >> >> >> >> >> #optee >> >> >> -PREFERRED_VERSION_optee-os ?= "3.18.%" >> >> >> +PREFERRED_VERSION_optee-os ?= "3.20.%" >> >> >> PREFERRED_VERSION_optee-client ?= "3.18.%" >> >> >> EXTRA_IMAGEDEPENDS += "optee-os" >> >> >> OPTEE_ARCH = "arm64" >> >> >> diff --git >> >> >> >> >> >> a/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch >> >> >> >> >> >> b/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch >> >> >> deleted file mode 100644 >> >> >> index 356be9e04f9e..000000000000 >> >> >> --- >> >> >> >> >> >> a/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch >> >> >> +++ /dev/null >> >> >> @@ -1,33 +0,0 @@ >> >> >> -Upstream-Status: Pending [Not submitted to upstream yet] >> >> >> -Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com> >> >> >> - >> >> >> -From b3fde6c2e1a950214f760ab9f194f3a6572292a8 Mon Sep 17 00:00:00 >> 2001 >> >> >> -From: Balint Dobszay <balint.dobszay@arm.com> >> >> >> -Date: Fri, 15 Jul 2022 13:45:54 +0200 >> >> >> -Subject: [PATCH] Handle logging syscall >> >> >> - >> >> >> -Signed-off-by: Balint Dobszay <balint.dobszay@arm.com> >> >> >> -Change-Id: Ib8151cc9c66aea8bcc8fe8b1ecdc3f9f9c5f14e4 >> >> >> - >> >> >> -%% original patch: 0004-Handle-logging-syscall.patch >> >> >> - >> >> >> -diff --git a/core/arch/arm/kernel/spmc_sp_handler.c >> >> >> b/core/arch/arm/kernel/spmc_sp_handler.c >> >> >> -index e0fa0aa6..c7a45387 100644 >> >> >> ---- a/core/arch/arm/kernel/spmc_sp_handler.c >> >> >> -+++ b/core/arch/arm/kernel/spmc_sp_handler.c >> >> >> -@@ -1004,6 +1004,12 @@ void spmc_sp_msg_handler(struct >> thread_smc_args >> >> >> *args, >> >> >> - ffa_mem_reclaim(args, caller_sp); >> >> >> - sp_enter(args, caller_sp); >> >> >> - break; >> >> >> -+ case 0xdeadbeef: >> >> >> -+ >> ts_push_current_session(&caller_sp->ts_sess); >> >> >> -+ IMSG("%s", (char *)args->a1); >> >> >> -+ ts_pop_current_session(); >> >> >> -+ sp_enter(args, caller_sp); >> >> >> -+ break; >> >> >> - default: >> >> >> - EMSG("Unhandled FFA function ID %#"PRIx32, >> >> >> - (uint32_t)args->a0); >> >> >> --- >> >> >> -2.17.1 >> >> >> - >> >> >> diff --git >> >> >> >> a/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc >> >> >> >> b/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc >> >> >> index 71b5ee62b902..30f99666626c 100644 >> >> >> --- >> >> a/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc >> >> >> +++ >> >> b/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc >> >> >> @@ -1,15 +1,7 @@ >> >> >> -SRCREV = "42f6617108fa43712652ef52f9d5b4ec5b2665f8" >> >> >> -PV = "3.18.0+git${SRCPV}" >> >> >> - >> >> >> SRC_URI:remove = " \ >> >> >> >> file://0003-core-link-add-no-warn-rwx-segments.patch >> >> \ >> >> >> " >> >> >> >> >> >> -FILESEXTRAPATHS:prepend := >> "${THISDIR}/files/optee-os/corstone1000:" >> >> >> -SRC_URI:append = " \ >> >> >> - file://0004-Handle-logging-syscall.patch \ >> >> >> - " >> >> >> - >> >> >> COMPATIBLE_MACHINE = "corstone1000" >> >> >> >> >> >> OPTEEMACHINE = "corstone1000" >> >> >> diff --git >> >> a/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend >> >> >> b/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend >> >> >> index 4b03985ac97a..bc933dd54c48 100644 >> >> >> --- a/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend >> >> >> +++ b/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend >> >> >> @@ -3,6 +3,5 @@ >> >> >> MACHINE_OPTEE_OS_REQUIRE ?= "" >> >> >> MACHINE_OPTEE_OS_REQUIRE:n1sdp = "optee-os-n1sdp.inc" >> >> >> MACHINE_OPTEE_OS_REQUIRE:tc = "optee-os-tc.inc" >> >> >> -MACHINE_OPTEE_OS_REQUIRE:corstone1000 = >> >> "optee-os-corstone1000-common.inc" >> >> >> >> >> >> require ${MACHINE_OPTEE_OS_REQUIRE} >> >> >> diff --git >> >> a/meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend >> >> >> b/meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend >> >> >> new file mode 100644 >> >> >> index 000000000000..e732c80f880b >> >> >> --- /dev/null >> >> >> +++ b/meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend >> >> >> @@ -0,0 +1,6 @@ >> >> >> +# Machine specific configurations >> >> >> + >> >> >> +MACHINE_OPTEE_OS_REQUIRE ?= "" >> >> >> +MACHINE_OPTEE_OS_REQUIRE:corstone1000 = >> >> "optee-os-corstone1000-common.inc" >> >> >> + >> >> >> +require ${MACHINE_OPTEE_OS_REQUIRE} >> >> >> >> >> > >> >> > This will generate a bitbake parse error for other machines than >> >> > corstone1000. >> >> > >> >> > Jose >> >> >> >> This pattern is used all over meta-arm/meta-arm-bsp, I see what you are >> >> saying, that: require "" throws a bitbake error. But I guess that every >> >> machine needs a require for specifying optee_os platform configuration >> >> and details. >> >> >> > >> > I think the issue is because now with the optee-os_3.20 bbappend the >> n1sdp >> > and the tc override don't apply >> > so the MACHINE_OPTEE_OS_REQUIRE can be blank which will trigger the >> parsing >> > error. >> >> But doesn't n1sdp and tc use the 3.18 bbappend? Here in the CI it is not >> failing to build for that platforms. >> > > I have misunderstood that to use the 3.20 bbappend, the machine needs to > be the corstone1000 > because of the preferred version in > meta-arm-bsp/conf/machine/include/corstone1000.inc. > So the MACHINE_OPTEE_OS_REQUIRE will never be empty. > > Sorry for the noise. > Yes that is indeed needed. No problem at all. And appreciated for the review. Cheers, Rui Jose > > >> >> Cheers, >> Rui >> >> > >> > Jose >> > >> > >> >> >> >> @Ross, @Jon am I missing something here? >> >> >> >> Cheers, >> >> Rui >> >> > >> >> > >> >> >> -- >> >> >> 2.34.1 >> >> >> >> >> >> >> >> >> -=-=-=-=-=-=-=-=-=-=-=- >> >> >> Links: You receive all messages sent to this group. >> >> >> View/Reply Online (#4506): >> >> >> https://lists.yoctoproject.org/g/meta-arm/message/4506 >> >> >> Mute This Topic: https://lists.yoctoproject.org/mt/97932156/5052612 >> >> >> Group Owner: meta-arm+owner@lists.yoctoproject.org >> >> >> Unsubscribe: https://lists.yoctoproject.org/g/meta-arm/unsub [ >> >> >> quaresma.jose@gmail.com] >> >> >> -=-=-=-=-=-=-=-=-=-=-=- >> >> >> >> >> >> >> >> > >> >> > -- >> >> > Best regards, >> >> > >> >> > José Quaresma >> >> >> > >> > >> > -- >> > Best regards, >> > >> > José Quaresma >> > > > -- > Best regards, > > José Quaresma >
On Wed, 29 Mar 2023 17:16:13 +0100, Rui Miguel Silva wrote: > Bump the preferred corstone1000 to v3.20, drop patch > that is already included in this version. > Create the 3.20 bbappend and remove the entry in 3.18 bbappend. Applied, thanks! [1/1] arm-bsp/optee: bump corstone1000 to v3.20 commit: df726cbfad017c78f0b7d6687aa37b5d3c0b2e99 Best regards,
diff --git a/meta-arm-bsp/conf/machine/include/corstone1000.inc b/meta-arm-bsp/conf/machine/include/corstone1000.inc index 7f25cd54455f..3915d18b5627 100644 --- a/meta-arm-bsp/conf/machine/include/corstone1000.inc +++ b/meta-arm-bsp/conf/machine/include/corstone1000.inc @@ -34,7 +34,7 @@ UBOOT_ARCH = "arm" UBOOT_EXTLINUX = "0" #optee -PREFERRED_VERSION_optee-os ?= "3.18.%" +PREFERRED_VERSION_optee-os ?= "3.20.%" PREFERRED_VERSION_optee-client ?= "3.18.%" EXTRA_IMAGEDEPENDS += "optee-os" OPTEE_ARCH = "arm64" diff --git a/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch b/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch deleted file mode 100644 index 356be9e04f9e..000000000000 --- a/meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch +++ /dev/null @@ -1,33 +0,0 @@ -Upstream-Status: Pending [Not submitted to upstream yet] -Signed-off-by: Vishnu Banavath <vishnu.banavath@arm.com> - -From b3fde6c2e1a950214f760ab9f194f3a6572292a8 Mon Sep 17 00:00:00 2001 -From: Balint Dobszay <balint.dobszay@arm.com> -Date: Fri, 15 Jul 2022 13:45:54 +0200 -Subject: [PATCH] Handle logging syscall - -Signed-off-by: Balint Dobszay <balint.dobszay@arm.com> -Change-Id: Ib8151cc9c66aea8bcc8fe8b1ecdc3f9f9c5f14e4 - -%% original patch: 0004-Handle-logging-syscall.patch - -diff --git a/core/arch/arm/kernel/spmc_sp_handler.c b/core/arch/arm/kernel/spmc_sp_handler.c -index e0fa0aa6..c7a45387 100644 ---- a/core/arch/arm/kernel/spmc_sp_handler.c -+++ b/core/arch/arm/kernel/spmc_sp_handler.c -@@ -1004,6 +1004,12 @@ void spmc_sp_msg_handler(struct thread_smc_args *args, - ffa_mem_reclaim(args, caller_sp); - sp_enter(args, caller_sp); - break; -+ case 0xdeadbeef: -+ ts_push_current_session(&caller_sp->ts_sess); -+ IMSG("%s", (char *)args->a1); -+ ts_pop_current_session(); -+ sp_enter(args, caller_sp); -+ break; - default: - EMSG("Unhandled FFA function ID %#"PRIx32, - (uint32_t)args->a0); --- -2.17.1 - diff --git a/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc b/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc index 71b5ee62b902..30f99666626c 100644 --- a/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc +++ b/meta-arm-bsp/recipes-security/optee/optee-os-corstone1000-common.inc @@ -1,15 +1,7 @@ -SRCREV = "42f6617108fa43712652ef52f9d5b4ec5b2665f8" -PV = "3.18.0+git${SRCPV}" - SRC_URI:remove = " \ file://0003-core-link-add-no-warn-rwx-segments.patch \ " -FILESEXTRAPATHS:prepend := "${THISDIR}/files/optee-os/corstone1000:" -SRC_URI:append = " \ - file://0004-Handle-logging-syscall.patch \ - " - COMPATIBLE_MACHINE = "corstone1000" OPTEEMACHINE = "corstone1000" diff --git a/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend index 4b03985ac97a..bc933dd54c48 100644 --- a/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend +++ b/meta-arm-bsp/recipes-security/optee/optee-os_3.18.0.bbappend @@ -3,6 +3,5 @@ MACHINE_OPTEE_OS_REQUIRE ?= "" MACHINE_OPTEE_OS_REQUIRE:n1sdp = "optee-os-n1sdp.inc" MACHINE_OPTEE_OS_REQUIRE:tc = "optee-os-tc.inc" -MACHINE_OPTEE_OS_REQUIRE:corstone1000 = "optee-os-corstone1000-common.inc" require ${MACHINE_OPTEE_OS_REQUIRE} diff --git a/meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend b/meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend new file mode 100644 index 000000000000..e732c80f880b --- /dev/null +++ b/meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend @@ -0,0 +1,6 @@ +# Machine specific configurations + +MACHINE_OPTEE_OS_REQUIRE ?= "" +MACHINE_OPTEE_OS_REQUIRE:corstone1000 = "optee-os-corstone1000-common.inc" + +require ${MACHINE_OPTEE_OS_REQUIRE}
Bump the preferred corstone1000 to v3.20, drop patch that is already included in this version. Create the 3.20 bbappend and remove the entry in 3.18 bbappend. Signed-off-by: Rui Miguel Silva <rui.silva@linaro.org> --- .../conf/machine/include/corstone1000.inc | 2 +- .../0004-Handle-logging-syscall.patch | 33 ------------------- .../optee/optee-os-corstone1000-common.inc | 8 ----- .../optee/optee-os_3.18.0.bbappend | 1 - .../optee/optee-os_3.20.0.bbappend | 6 ++++ 5 files changed, 7 insertions(+), 43 deletions(-) delete mode 100644 meta-arm-bsp/recipes-security/optee/files/optee-os/corstone1000/0004-Handle-logging-syscall.patch create mode 100644 meta-arm-bsp/recipes-security/optee/optee-os_3.20.0.bbappend