diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0003-psci-SMCCC_ARCH_FEATURES-discovery-through-PSCI_FEATURES.patch b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0003-psci-SMCCC_ARCH_FEATURES-discovery-through-PSCI_FEATURES.patch new file mode 100644 index 00000000..2a7cd47e --- /dev/null +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/files/corstone1000/0003-psci-SMCCC_ARCH_FEATURES-discovery-through-PSCI_FEATURES.patch @@ -0,0 +1,29 @@ +From 16937460429d6bcd502b21c20d16222541ed8d48 Mon Sep 17 00:00:00 2001 +From: Abdellatif El Khlifi +Date: Mon, 6 Mar 2023 15:57:59 +0000 +Subject: [PATCH] psci: SMCCC_ARCH_FEATURES discovery through PSCI_FEATURES + +allow normal world use PSCI_FEATURES to discover SMCCC_ARCH_FEATURES + +Signed-off-by: Abdellatif El Khlifi +Upstream-Status: Inappropriate [A U-Boot patch will be released to fix an issue in the PSCI driver] +--- + lib/psci/psci_main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/psci/psci_main.c b/lib/psci/psci_main.c +index a631f3ffbf..cc8904b006 100644 +--- a/lib/psci/psci_main.c ++++ b/lib/psci/psci_main.c +@@ -337,7 +337,7 @@ int psci_features(unsigned int psci_fid) + { + unsigned int local_caps = psci_caps; + +- if (psci_fid == SMCCC_VERSION) ++ if (psci_fid == SMCCC_VERSION || psci_fid == SMCCC_ARCH_FEATURES) + return PSCI_E_SUCCESS; + + /* Check if it is a 64 bit function */ +-- +2.25.1 + diff --git a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc index 3a5be11f..06be28ee 100644 --- a/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc +++ b/meta-arm-bsp/recipes-bsp/trusted-firmware-a/trusted-firmware-a-corstone1000.inc @@ -7,6 +7,7 @@ FILESEXTRAPATHS:prepend := "${THISDIR}/files/corstone1000:" SRC_URI:append = " \ file://0001-Fix-FF-A-version-in-SPMC-manifest.patch \ file://0002-feat-corstone1000-bl2-loads-fip-based-on-metadata.patch \ + file://0003-psci-SMCCC_ARCH_FEATURES-discovery-through-PSCI_FEATURES.patch \ " #Sets TF-A version to 2.8.0