diff mbox series

[1/2] arm-bsp/u-boot: corstone1000: fix SMCCC_ARCH_FEATURES detection in the PSCI driver

Message ID 20240304104715.228979-2-bence.balogh@arm.com
State New
Headers show
Series Add fix for the uboot PSCI driver and remove TF-A workaround patch | expand

Commit Message

bence.balogh@arm.com March 4, 2024, 10:47 a.m. UTC 
From: Bence Balogh <bence.balogh@arm.com>

The u-boot PSCI driver was not compliant with the PSCI specifications so
this patch had to be added.

Signed-off-by: Bence Balogh <bence.balogh@arm.com>
---
 ...i-Fix-bind_smccc_features-psci-check.patch | 56 +++++++++++++++++++
 .../recipes-bsp/u-boot/u-boot_%.bbappend      |  4 ++
 2 files changed, 60 insertions(+)
 create mode 100644 meta-arm-bsp/recipes-bsp/u-boot/u-boot/0001-firmware-psci-Fix-bind_smccc_features-psci-check.patch

Comments

Ross Burton March 13, 2024, 12:53 p.m. UTC | #1 
On 4 Mar 2024, at 10:47, bence.balogh via lists.yoctoproject.org <bence.balogh=arm.com@lists.yoctoproject.org> wrote:
> +SRC_URI:append = " \
> +    file://0001-firmware-psci-Fix-bind_smccc_features-psci-check.patch \
> +"

The commit message implies this is specific to the CS1K, but this patch is applied to _everyone_ building u-boot, even people who add meta-arm to their layer setup but don’t use the machines.

It feels like this should be moved to the CS1K specific override, unless its genuinely a useful fix for everyone in which case we should patch oe-core instead.

Ross
diff mbox series

Patch

diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot/0001-firmware-psci-Fix-bind_smccc_features-psci-check.patch b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/0001-firmware-psci-Fix-bind_smccc_features-psci-check.patch
new file mode 100644
index 00000000..c4b1b1ec
--- /dev/null
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot/0001-firmware-psci-Fix-bind_smccc_features-psci-check.patch
@@ -0,0 +1,56 @@ 
+Subject: [PATCH v3 1/3] firmware: psci: Fix bind_smccc_features psci check
+Date: Wed, 31 Jan 2024 14:14:24 +0000	[thread overview]
+Message-ID: <20240131141426.34926-2-o451686892@gmail.com> (raw)
+In-Reply-To: <20240131141426.34926-1-o451686892@gmail.com>
+
+According to PSCI specification DEN0022F, PSCI_FEATURES is used to check
+whether the SMCCC is implemented by discovering SMCCC_VERSION.
+
+Signed-off-by: Weizhao Ouyang <o451686892@gmail.com>
+Upstream-Status: Submitted [https://lore.kernel.org/all/20240131141426.34926-2-o451686892@gmail.com/]
+---
+ drivers/firmware/psci.c   | 5 ++++-
+ include/linux/arm-smccc.h | 6 ++++++
+ 2 files changed, 10 insertions(+), 1 deletion(-)
+
+diff --git a/drivers/firmware/psci.c b/drivers/firmware/psci.c
+index c6b9efab41..03544d76ed 100644
+--- a/drivers/firmware/psci.c
++++ b/drivers/firmware/psci.c
+@@ -135,10 +135,13 @@ static int bind_smccc_features(struct udevice *dev, int psci_method)
+ 	    PSCI_VERSION_MAJOR(psci_0_2_get_version()) == 0)
+ 		return 0;
+ 
+-	if (request_psci_features(ARM_SMCCC_ARCH_FEATURES) ==
++	if (request_psci_features(ARM_SMCCC_VERSION) ==
+ 	    PSCI_RET_NOT_SUPPORTED)
+ 		return 0;
+ 
++	if (invoke_psci_fn(ARM_SMCCC_VERSION, 0, 0, 0) < ARM_SMCCC_VERSION_1_1)
++		return 0;
++
+ 	if (psci_method == PSCI_METHOD_HVC)
+ 		pdata->invoke_fn = smccc_invoke_hvc;
+ 	else
+diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h
+index f44e9e8f93..da3d29aabe 100644
+--- a/include/linux/arm-smccc.h
++++ b/include/linux/arm-smccc.h
+@@ -55,8 +55,14 @@
+ #define ARM_SMCCC_QUIRK_NONE		0
+ #define ARM_SMCCC_QUIRK_QCOM_A6		1 /* Save/restore register a6 */
+ 
++#define ARM_SMCCC_VERSION		0x80000000
+ #define ARM_SMCCC_ARCH_FEATURES		0x80000001
+ 
++#define ARM_SMCCC_VERSION_1_0		0x10000
++#define ARM_SMCCC_VERSION_1_1		0x10001
++#define ARM_SMCCC_VERSION_1_2		0x10002
++#define ARM_SMCCC_VERSION_1_3		0x10003
++
+ #define ARM_SMCCC_RET_NOT_SUPPORTED	((unsigned long)-1)
+ 
+ #ifndef __ASSEMBLY__
+-- 
+2.39.2
+
diff --git a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
index 11f332ad..77732859 100644
--- a/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
+++ b/meta-arm-bsp/recipes-bsp/u-boot/u-boot_%.bbappend
@@ -6,5 +6,9 @@  MACHINE_U-BOOT_REQUIRE:fvp-base = "u-boot-fvp-base.inc"
 MACHINE_U-BOOT_REQUIRE:juno = "u-boot-juno.inc"
 MACHINE_U-BOOT_REQUIRE:tc = "u-boot-tc.inc"
 
+SRC_URI:append = " \
+    file://0001-firmware-psci-Fix-bind_smccc_features-psci-check.patch \
+"
+
 require ${MACHINE_U-BOOT_REQUIRE}