diff options
author | Soby Mathew <soby.mathew@arm.com> | 2015-01-15 11:49:58 +0000 |
---|---|---|
committer | Dan Handley <dan.handley@arm.com> | 2015-01-26 12:49:32 +0000 |
commit | e8ca7d1e32c04f4a7f9679f7d09dbe0e49baa471 (patch) | |
tree | bf7ceed4223789ef9f83a25a8e1cbd71d3e55c33 | |
parent | 126866f0110c6096256cd580bc778539d16b06fd (diff) |
Increment the PSCI VERSION to 1.0
This patch:
* Bumps the PSCI VERSION to 1.0. This means that
the PSCI_VERSION API will now return the value 0x00010000
to indicate the version as 1.0. The firmware remains
compatible with PSCI v0.2 clients.
* The firmware design guide is updated to document the
APIs supported by the Trusted Firmware generic code.
* The FVP Device Tree Sources (dts) and Blobs(dtb) are also
updated to add "psci-1.0" and "psci-0.2" to the list of
compatible PSCI versions.
Change-Id: Iafc2f549c92651dcd65d7e24a8aae35790d00f8a
-rw-r--r-- | docs/firmware-design.md | 63 | ||||
-rw-r--r-- | fdts/fvp-base-gicv2-psci.dtb | bin | 10082 -> 10106 bytes | |||
-rw-r--r-- | fdts/fvp-base-gicv2-psci.dts | 2 | ||||
-rw-r--r-- | fdts/fvp-base-gicv2legacy-psci.dtb | bin | 10082 -> 10106 bytes | |||
-rw-r--r-- | fdts/fvp-base-gicv2legacy-psci.dts | 2 | ||||
-rw-r--r-- | fdts/fvp-base-gicv3-psci.dtb | bin | 10710 -> 10734 bytes | |||
-rw-r--r-- | fdts/fvp-base-gicv3-psci.dts | 2 | ||||
-rw-r--r-- | fdts/fvp-foundation-gicv2-psci.dtb | bin | 7451 -> 7475 bytes | |||
-rw-r--r-- | fdts/fvp-foundation-gicv2-psci.dts | 2 | ||||
-rw-r--r-- | fdts/fvp-foundation-gicv2legacy-psci.dtb | bin | 7451 -> 7475 bytes | |||
-rw-r--r-- | fdts/fvp-foundation-gicv2legacy-psci.dts | 2 | ||||
-rw-r--r-- | fdts/fvp-foundation-gicv3-psci.dtb | bin | 8079 -> 8103 bytes | |||
-rw-r--r-- | fdts/fvp-foundation-gicv3-psci.dts | 2 | ||||
-rw-r--r-- | include/bl31/services/psci.h | 4 |
14 files changed, 45 insertions, 34 deletions
diff --git a/docs/firmware-design.md b/docs/firmware-design.md index 774ea436..ee76d5c8 100644 --- a/docs/firmware-design.md +++ b/docs/firmware-design.md @@ -734,32 +734,43 @@ restoring the stack and CPU state and returning from the original SMC. TODO: Provide design walkthrough of PSCI implementation. -The complete PSCI API is not yet implemented. The following functions are -currently implemented: - -- `PSCI_VERSION` -- `CPU_OFF` -- `CPU_ON` -- `CPU_SUSPEND` -- `AFFINITY_INFO` -- `SYSTEM_OFF` -- `SYSTEM_RESET` - -The `CPU_ON`, `CPU_OFF` and `CPU_SUSPEND` functions implement the warm boot -path in ARM Trusted Firmware. `CPU_ON` and `CPU_OFF` have undergone testing -on all the supported FVPs. `CPU_SUSPEND` & `AFFINITY_INFO` have undergone -testing only on the AEM v8 Base FVP. Support for `AFFINITY_INFO` is still -experimental. Support for `CPU_SUSPEND` is stable for entry into power down -states. Standby states are currently not supported. `PSCI_VERSION` is -present but completely untested in this version of the software. - -The following unsupported functions return with a error code as documented in -the [Power State Coordination Interface PDD] [PSCI]. - -- `MIGRATE` : -1 (NOT_SUPPORTED) -- `MIGRATE_INFO_TYPE` : 2 (Trusted OS is either not present or does not - require migration) -- `MIGRATE_INFO_UP_CPU` : 0 (Return value is UNDEFINED) +The PSCI v1.0 specification categorizes APIs as optional and mandatory. All the +mandatory APIs in PSCI v1.0 and all the APIs in PSCI v0.2 draft specification +[Power State Coordination Interface PDD] [PSCI] are implemented. The table lists +the PSCI v1.0 APIs and their support in generic code. + +An API implementation might have a dependency on platform code e.g. CPU_SUSPEND +requires the platform to export a part of the implementation. Hence the level +of support of the mandatory APIs depends upon the support exported by the +platform port as well. The Juno and FVP (all variants) platforms export all the +required support. + +| PSCI v1.0 API |Supported| Comments | +|:----------------------|:--------|:------------------------------------------| +|`PSCI_VERSION` | Yes | The version returned is 1.0 | +|`CPU_SUSPEND` | Yes* | The original `power_state` format is used | +|`CPU_OFF` | Yes* | | +|`CPU_ON` | Yes* | | +|`AFFINITY_INFO` | Yes | | +|`MIGRATE` | Yes** | | +|`MIGRATE_INFO_TYPE` | Yes** | | +|`MIGRATE_INFO_CPU` | Yes** | | +|`SYSTEM_OFF` | Yes* | | +|`SYSTEM_RESET` | Yes* | | +|`PSCI_FEATURES` | Yes | | +|`CPU_FREEZE` | No | | +|`CPU_DEFAULT_SUSPEND` | No | | +|`CPU_HW_STATE` | No | | +|`SYSTEM_SUSPEND` | No | | +|`PSCI_SET_SUSPEND_MODE`| No | | +|`PSCI_STAT_RESIDENCY` | No | | +|`PSCI_STAT_COUNT` | No | | + +*Note : These PSCI APIs require platform power management hooks to be +registered with the generic PSCI code to be supported. + +**Note : These PSCI APIs require appropriate Secure Payload Dispatcher +hooks to be registered with the generic PSCI code to be supported. 5. Secure-EL1 Payloads and Dispatchers diff --git a/fdts/fvp-base-gicv2-psci.dtb b/fdts/fvp-base-gicv2-psci.dtb Binary files differindex ae3b4c55..b8a31ce3 100644 --- a/fdts/fvp-base-gicv2-psci.dtb +++ b/fdts/fvp-base-gicv2-psci.dtb diff --git a/fdts/fvp-base-gicv2-psci.dts b/fdts/fvp-base-gicv2-psci.dts index 43518a3f..c1c9efbf 100644 --- a/fdts/fvp-base-gicv2-psci.dts +++ b/fdts/fvp-base-gicv2-psci.dts @@ -52,7 +52,7 @@ }; psci { - compatible = "arm,psci"; + compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci"; method = "smc"; cpu_suspend = <0xc4000001>; cpu_off = <0x84000002>; diff --git a/fdts/fvp-base-gicv2legacy-psci.dtb b/fdts/fvp-base-gicv2legacy-psci.dtb Binary files differindex 2d23968f..4270623b 100644 --- a/fdts/fvp-base-gicv2legacy-psci.dtb +++ b/fdts/fvp-base-gicv2legacy-psci.dtb diff --git a/fdts/fvp-base-gicv2legacy-psci.dts b/fdts/fvp-base-gicv2legacy-psci.dts index 06d33e74..7bd5ea26 100644 --- a/fdts/fvp-base-gicv2legacy-psci.dts +++ b/fdts/fvp-base-gicv2legacy-psci.dts @@ -52,7 +52,7 @@ }; psci { - compatible = "arm,psci"; + compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci"; method = "smc"; cpu_suspend = <0xc4000001>; cpu_off = <0x84000002>; diff --git a/fdts/fvp-base-gicv3-psci.dtb b/fdts/fvp-base-gicv3-psci.dtb Binary files differindex c2f63ebe..27c3f935 100644 --- a/fdts/fvp-base-gicv3-psci.dtb +++ b/fdts/fvp-base-gicv3-psci.dtb diff --git a/fdts/fvp-base-gicv3-psci.dts b/fdts/fvp-base-gicv3-psci.dts index 6afa44c7..32e577ad 100644 --- a/fdts/fvp-base-gicv3-psci.dts +++ b/fdts/fvp-base-gicv3-psci.dts @@ -52,7 +52,7 @@ }; psci { - compatible = "arm,psci"; + compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci"; method = "smc"; cpu_suspend = <0xc4000001>; cpu_off = <0x84000002>; diff --git a/fdts/fvp-foundation-gicv2-psci.dtb b/fdts/fvp-foundation-gicv2-psci.dtb Binary files differindex df8e629f..5b92e5ee 100644 --- a/fdts/fvp-foundation-gicv2-psci.dtb +++ b/fdts/fvp-foundation-gicv2-psci.dtb diff --git a/fdts/fvp-foundation-gicv2-psci.dts b/fdts/fvp-foundation-gicv2-psci.dts index 15ff4718..c04d535f 100644 --- a/fdts/fvp-foundation-gicv2-psci.dts +++ b/fdts/fvp-foundation-gicv2-psci.dts @@ -52,7 +52,7 @@ }; psci { - compatible = "arm,psci"; + compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci"; method = "smc"; cpu_suspend = <0xc4000001>; cpu_off = <0x84000002>; diff --git a/fdts/fvp-foundation-gicv2legacy-psci.dtb b/fdts/fvp-foundation-gicv2legacy-psci.dtb Binary files differindex ed432541..71f6ae2c 100644 --- a/fdts/fvp-foundation-gicv2legacy-psci.dtb +++ b/fdts/fvp-foundation-gicv2legacy-psci.dtb diff --git a/fdts/fvp-foundation-gicv2legacy-psci.dts b/fdts/fvp-foundation-gicv2legacy-psci.dts index a923c348..8dba04c1 100644 --- a/fdts/fvp-foundation-gicv2legacy-psci.dts +++ b/fdts/fvp-foundation-gicv2legacy-psci.dts @@ -83,7 +83,7 @@ }; idle-states { - entry-method = "arm,psci"; + entry-method = "arm,psci-1.0", "arm,psci-0.2", "arm,psci"; CPU_SLEEP_0: cpu-sleep-0 { compatible = "arm,idle-state"; diff --git a/fdts/fvp-foundation-gicv3-psci.dtb b/fdts/fvp-foundation-gicv3-psci.dtb Binary files differindex 724847c3..d7d9e141 100644 --- a/fdts/fvp-foundation-gicv3-psci.dtb +++ b/fdts/fvp-foundation-gicv3-psci.dtb diff --git a/fdts/fvp-foundation-gicv3-psci.dts b/fdts/fvp-foundation-gicv3-psci.dts index 49290e4e..48a1afc0 100644 --- a/fdts/fvp-foundation-gicv3-psci.dts +++ b/fdts/fvp-foundation-gicv3-psci.dts @@ -52,7 +52,7 @@ }; psci { - compatible = "arm,psci"; + compatible = "arm,psci-1.0", "arm,psci-0.2", "arm,psci"; method = "smc"; cpu_suspend = <0xc4000001>; cpu_off = <0x84000002>; diff --git a/include/bl31/services/psci.h b/include/bl31/services/psci.h index 59675810..80bc53b8 100644 --- a/include/bl31/services/psci.h +++ b/include/bl31/services/psci.h @@ -115,8 +115,8 @@ /******************************************************************************* * PSCI version ******************************************************************************/ -#define PSCI_MAJOR_VER (0 << 16) -#define PSCI_MINOR_VER 0x2 +#define PSCI_MAJOR_VER (1 << 16) +#define PSCI_MINOR_VER 0x0 /******************************************************************************* * PSCI error codes |