From 6b2721c01691743a65475e82944e2f8868bf0159 Mon Sep 17 00:00:00 2001 From: Andre Przywara Date: Fri, 10 Dec 2021 18:22:09 +0000 Subject: [PATCH] fix(fvp): fdts: unify and fix PSCI nodes The PSCI DT nodes used for the various fvp-base model variants provide explicit function IDs, as required for the pre-v0.2 PSCI specification. This prevents them from being used from both AArch32 and AArch64 DT clients, and using this version of the PSCI spec is long deprecated anyway. Remove the old compatible string and the function properties, to force clients to use the standard function IDs as described in the PSCI spec. sys_poweroff and sys_reset were never standardised or used anyway. There should be no client software around that cannot deal with PSCI v0.2. Signed-off-by: Andre Przywara Change-Id: Ie87deb9898eae79b7307c15bcefcd4b311d4dc22 --- fdts/fvp-base-gicv2-psci-aarch32.dts | 7 +------ fdts/fvp-base-gicv2-psci.dts | 7 +------ fdts/fvp-base-gicv3-psci-aarch32-common.dtsi | 7 +------ fdts/fvp-base-gicv3-psci-common.dtsi | 7 +------ 4 files changed, 4 insertions(+), 24 deletions(-) diff --git a/fdts/fvp-base-gicv2-psci-aarch32.dts b/fdts/fvp-base-gicv2-psci-aarch32.dts index 3a921f436..d79ff608d 100644 --- a/fdts/fvp-base-gicv2-psci-aarch32.dts +++ b/fdts/fvp-base-gicv2-psci-aarch32.dts @@ -36,13 +36,8 @@ }; psci { - compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci"; + compatible = "arm,psci-1.0", "arm,psci-0.2"; method = "smc"; - cpu_suspend = <0x84000001>; - cpu_off = <0x84000002>; - cpu_on = <0x84000003>; - sys_poweroff = <0x84000008>; - sys_reset = <0x84000009>; max-pwr-lvl = <2>; }; diff --git a/fdts/fvp-base-gicv2-psci.dts b/fdts/fvp-base-gicv2-psci.dts index e99719e19..b7486a405 100644 --- a/fdts/fvp-base-gicv2-psci.dts +++ b/fdts/fvp-base-gicv2-psci.dts @@ -35,13 +35,8 @@ }; psci { - compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci"; + compatible = "arm,psci-1.0", "arm,psci-0.2"; method = "smc"; - cpu_suspend = <0xc4000001>; - cpu_off = <0x84000002>; - cpu_on = <0xc4000003>; - sys_poweroff = <0x84000008>; - sys_reset = <0x84000009>; max-pwr-lvl = <2>; }; diff --git a/fdts/fvp-base-gicv3-psci-aarch32-common.dtsi b/fdts/fvp-base-gicv3-psci-aarch32-common.dtsi index 85988e90f..a7c439871 100644 --- a/fdts/fvp-base-gicv3-psci-aarch32-common.dtsi +++ b/fdts/fvp-base-gicv3-psci-aarch32-common.dtsi @@ -28,13 +28,8 @@ }; psci { - compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci"; + compatible = "arm,psci-1.0", "arm,psci-0.2"; method = "smc"; - cpu_suspend = <0x84000001>; - cpu_off = <0x84000002>; - cpu_on = <0x84000003>; - sys_poweroff = <0x84000008>; - sys_reset = <0x84000009>; max-pwr-lvl = <2>; }; diff --git a/fdts/fvp-base-gicv3-psci-common.dtsi b/fdts/fvp-base-gicv3-psci-common.dtsi index 3cb613f63..c053289e2 100644 --- a/fdts/fvp-base-gicv3-psci-common.dtsi +++ b/fdts/fvp-base-gicv3-psci-common.dtsi @@ -38,13 +38,8 @@ }; psci { - compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci"; + compatible = "arm,psci-1.0", "arm,psci-0.2"; method = "smc"; - cpu_suspend = <0xc4000001>; - cpu_off = <0x84000002>; - cpu_on = <0xc4000003>; - sys_poweroff = <0x84000008>; - sys_reset = <0x84000009>; max-pwr-lvl = <2>; }; -- 2.39.5