1
0
mirror of https://git.yoctoproject.org/meta-arm synced 2026-06-05 14:30:10 +00:00

arm-bsp/trusted-firmware-a: corstone1000: remove SMCCC_ARCH_FEATURES discovery workaround

The workaround is no longer needed because with the
0043-firmware-psci-Fix-bind_smccc_features-psci-check.patch file the
u-boot PSCI driver is compliant with the PSCI specifications.

Signed-off-by: Bence Balogh <bence.balogh@arm.com>
Signed-off-by: Jon Mason <jon.mason@arm.com>
This commit is contained in:
Bence Balogh
2024-03-14 12:04:57 +01:00
committed by Jon Mason
parent fb1a85a43c
commit 0792a314f6
4 changed files with 2 additions and 32 deletions
@@ -1,29 +0,0 @@
From 16937460429d6bcd502b21c20d16222541ed8d48 Mon Sep 17 00:00:00 2001
From: Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
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 <abdellatif.elkhlifi@arm.com>
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
@@ -5,9 +5,8 @@ COMPATIBLE_MACHINE = "(corstone1000)"
FILESEXTRAPATHS:prepend := "${THISDIR}/files/corstone1000:"
SRC_URI:append = " \
file://0001-Fix-FF-A-version-in-SPMC-manifest.patch \
file://0002-psci-SMCCC_ARCH_FEATURES-discovery-through-PSCI_FEATURES.patch \
file://0003-fix-corstone1000-pass-spsr-value-explicitly.patch \
file://0004-fix-spmd-remove-EL3-interrupt-registration.patch \
file://0002-fix-corstone1000-pass-spsr-value-explicitly.patch \
file://0003-fix-spmd-remove-EL3-interrupt-registration.patch \
"
TFA_DEBUG = "1"