diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-10-16 16:31:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-16 16:31:13 +0100 |
| commit | 446844293399f73bf8ac1fb2e7eba34b0c7fb0c4 (patch) | |
| tree | f5b4b2450d0a4d349ea16867ca1d8bd032bc1231 /include/lib | |
| parent | 8ac544e44b9747c1c59b42e4708607f2e8077c6f (diff) | |
| parent | b48ae263d255718efee7b4ed0cb1d6c2e3cb1fb8 (diff) | |
| download | platform_external_arm-trusted-firmware-446844293399f73bf8ac1fb2e7eba34b0c7fb0c4.tar.gz platform_external_arm-trusted-firmware-446844293399f73bf8ac1fb2e7eba34b0c7fb0c4.tar.bz2 platform_external_arm-trusted-firmware-446844293399f73bf8ac1fb2e7eba34b0c7fb0c4.zip | |
Merge pull request #1123 from robertovargas-arm/reset2
Integration of reset2 PSCI v1.1 functionality
Diffstat (limited to 'include/lib')
| -rw-r--r-- | include/lib/psci/psci.h | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/include/lib/psci/psci.h b/include/lib/psci/psci.h index 0b44ab2e0..1fd4ec109 100644 --- a/include/lib/psci/psci.h +++ b/include/lib/psci/psci.h @@ -65,6 +65,8 @@ #define PSCI_STAT_RESIDENCY_AARCH64 U(0xc4000010) #define PSCI_STAT_COUNT_AARCH32 U(0x84000011) #define PSCI_STAT_COUNT_AARCH64 U(0xc4000011) +#define PSCI_SYSTEM_RESET2_AARCH32 U(0x84000012) +#define PSCI_SYSTEM_RESET2_AARCH64 U(0xc4000012) #define PSCI_MEM_PROTECT U(0x84000013) #define PSCI_MEM_CHK_RANGE_AARCH32 U(0x84000014) #define PSCI_MEM_CHK_RANGE_AARCH64 U(0xc4000014) @@ -167,6 +169,14 @@ #define PSCI_INVALID_MPIDR ~((u_register_t)0) +/* + * SYSTEM_RESET2 macros + */ +#define PSCI_RESET2_TYPE_VENDOR_SHIFT 31 +#define PSCI_RESET2_TYPE_VENDOR (1U << PSCI_RESET2_TYPE_VENDOR_SHIFT) +#define PSCI_RESET2_TYPE_ARCH (0U << PSCI_RESET2_TYPE_VENDOR_SHIFT) +#define PSCI_RESET2_SYSTEM_WARM_RESET (PSCI_RESET2_TYPE_ARCH | 0) + #ifndef __ASSEMBLY__ #include <stdint.h> @@ -294,6 +304,8 @@ typedef struct plat_psci_ops { int (*mem_protect_chk)(uintptr_t base, u_register_t length); int (*read_mem_protect)(int *val); int (*write_mem_protect)(int val); + int (*system_reset2)(int is_vendor, + int reset_type, u_register_t cookie); } plat_psci_ops_t; /******************************************************************************* |