On Sun, Dec 21, 2025 at 08:09:57AM +0800, Yan, Haixiao (CN) via lists.yoctoproject.org wrote: > > On 12/21/2025 1:10 AM, Ryan Eatmon via lists.yoctoproject.org wrote: > >CAUTION: This email comes from a non Wind River email account! > >Do not click links or open attachments unless you recognize the > >sender and know the content is safe. > > > >On 12/20/2025 9:08 AM, Yan, Haixiao (CN) via > >lists.yoctoproject.org wrote: > >>This patch failed to apply on scarthgap. > >>the version of trusted-firmware-a is 2.10.4, the patch is not > >>suitable for this version. > > > >The recipe in meta-ti-bsp that applies this patch, also moves the > >version to 2.13+. So I'm not sure how you are trying to apply this > >patch to meta-ti scarthgap against a 2.10 trusted-firmware-a version. > > > >Clearly you are trying to do something more than taking meta-ti-bsp > >scarthgap at face value. Do you have your own layer in your build that > >is also changing the SRCREV of trusted-firmware-a to a version that > >might not accept these patches? > > > > > > There is no 2.13+ version trusted-firmware-a on scarthgap. > > https://git.yoctoproject.org/meta-arm/tree/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_2.10.4.bb?h=scarthgap > > $ bitbake-layers show-recipes trusted-firmware-a > NOTE: Starting bitbake server... > Loading cache: 100% > |#####################################################################| > Time: 0:00:02 > Loaded 15169 entries from dependency cache. > === Matching recipes: === > trusted-firmware-a: > meta-arm 2.10+git > > $ bitbake-layers show-appends | grep trusted-firmware-a > trusted-firmware-a_2.10.4.bb: > layers/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend > layers/meta-ti/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend
^^^ This bbappend in meta-ti-bsp conditionally includes the following file: https://git.yoctoproject.org/meta-ti/tree/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-ti.inc?h=scarthgap Which bumps the version from meta-arm to 2.13+, as Ryan explained above. > layers/ti-j7xxx/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend ^^^ I would recommend inspecting this bbappend in your "ti-j7xxx" layer to see if it conflicts with the one in meta-ti-bsp... > trusted-firmware-a_2.10.4.bb (skipped): > layers/meta-arm/meta-arm/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend > layers/meta-ti/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend > > layers/ti-j7xxx/recipes-bsp/trusted-firmware-a/trusted-firmware-a_%.bbappend > > > Thanks, > > Haixiao > > >>NOTE: Applying patch > >>'0001-feat-k3-choose-cluster_start_id-depending-on-the-soc.patch' > >>(../layers/meta-ti/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a/0001-feat-k3-choose-cluster_start_id-depending-on-the-soc.patch) > >> > >>NOTE: Applying patch > >>'0002-feat-ti-add-message-to-encrypt-tfa-during-suspend.patch' > >>(../layers/meta-ti/meta-ti-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a/0002-feat-ti-add-message-to-encrypt-tfa-during-suspend.patch) > >>ERROR: Applying patch > >>'0002-feat-ti-add-message-to-encrypt-tfa-during-suspend.patch' > >>on target directory > >>'/build-ti/tmp-glibc/work/ti_j78xx-wrs-linux/trusted-firmware-a/2.10+git/git' > >>CmdError('quilt --quiltrc > >>/build-ti/tmp-glibc/work/ti_j78xx-wrs-linux/trusted-firmware-a/2.10+git/recipe-sysroot-native/etc/quiltrc > >>push', 0, "stdout: Applying patch > >>0002-feat-ti-add-message-to-encrypt-tfa-during-suspend.patch > >>can't find file to patch at input line 39 > >>Perhaps you used the wrong -p or --strip option? > >>The text leading up to this was: > >>-------------------------- > >>|From c79ff3679a4360bb848b01d4036c365533fcf791 Mon Sep 17 00:00:00 2001 > >>|From: Richard Genoud <[email protected]> > >>|Date: Tue, 11 Feb 2025 18:20:17 +0100 > >>|Subject: [PATCH 2/3] feat(ti): add message to encrypt tfa > >>during suspend > >>| > >>|At suspend, BL31 with its context will be encrypted by TIFS in DDR. > >>|Encryption is needed for security matters, so that the BL31 is not > >>|modified before entering suspend or early at resume. > >>| > >>|We only need the encryption function here because the > >>decryption message > >>|will be send by the R5 SPL at resume. > >>| > >>|Also introduce the LPM_ENCRYPT_IMAGE cap signals that FW has > >>the support > >>|to encrypt the image using the TISCI_MSG_LPM_ENCRYPT tisci message. > >>| > >>|This is useful in suspend to ram cases where we would like to > >>|store the encrypted image of a secure fw instead of the original image > >>|itself in the DDR. > >>| > >>|Check for LPM_ENCRYPT_IMAGE flag in the FW capabilities, and only then > >>|call encrypt. > >>| > >>|Upstream-Status: Pending > >>| > >>|Change-Id: I266472da87dd0821493019b2d9853f8886f33811 > >>|Signed-off-by: Richard Genoud <[email protected]> > >>|Signed-off-by: Abhash Kumar Jha <[email protected]> > >>|--- > >>| drivers/ti/ti_sci/ti_sci.c | 36 +++++++++++++++++++++++++++++ > >>| drivers/ti/ti_sci/ti_sci.h | 7 ++++++ > >>| drivers/ti/ti_sci/ti_sci_protocol.h | 32 +++++++++++++++++++++++++ > >>| plat/ti/k3/common/k3_psci.c | 10 ++++++++ > >>| 4 files changed, 85 insertions(+) > >>| > >>|diff --git a/drivers/ti/ti_sci/ti_sci.c b/drivers/ti/ti_sci/ti_sci.c > >>|index f0813e5b0..ee5f7166f 100644 > >>|--- a/drivers/ti/ti_sci/ti_sci.c > >>|+++ b/drivers/ti/ti_sci/ti_sci.c > >>-------------------------- > >>No file to patch. Skipping patch. > >>1 out of 1 hunk ignored > >>can't find file to patch at input line 83 > >>Perhaps you used the wrong -p or --strip option? > >>The text leading up to this was: > >>-------------------------- > >>|diff --git a/drivers/ti/ti_sci/ti_sci.h b/drivers/ti/ti_sci/ti_sci.h > >>|index 1f1963274..2afa11317 100644 > >>|--- a/drivers/ti/ti_sci/ti_sci.h > >>|+++ b/drivers/ti/ti_sci/ti_sci.h > >>-------------------------- > >>No file to patch. Skipping patch. > >>2 out of 2 hunks ignored > >>can't find file to patch at input line 107 > >>Perhaps you used the wrong -p or --strip option? > >>The text leading up to this was: > >>-------------------------- > >>|diff --git a/drivers/ti/ti_sci/ti_sci_protocol.h > >>b/drivers/ti/ti_sci/ti_sci_protocol.h > >>|index bdd24622a..a165cda99 100644 > >>|--- a/drivers/ti/ti_sci/ti_sci_protocol.h > >>|+++ b/drivers/ti/ti_sci/ti_sci_protocol.h > >>-------------------------- > >>No file to patch. Skipping patch. > >>3 out of 3 hunks ignored > >>patching file plat/ti/k3/common/k3_psci.c > >>Hunk #2 succeeded at 269 with fuzz 1 (offset -14 lines). > >>Hunk #3 succeeded at 321 (offset -32 lines). > >>Patch > >>0002-feat-ti-add-message-to-encrypt-tfa-during-suspend.patch > >>does not apply (enforce with -f)
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#19387): https://lists.yoctoproject.org/g/meta-ti/message/19387 Mute This Topic: https://lists.yoctoproject.org/mt/116517214/21656 Group Owner: [email protected] Unsubscribe: https://lists.yoctoproject.org/g/meta-ti/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
