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 /lib/psci/psci_main.c | |
| 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 'lib/psci/psci_main.c')
| -rw-r--r-- | lib/psci/psci_main.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/psci/psci_main.c b/lib/psci/psci_main.c index a5d707e01..4105e63bd 100644 --- a/lib/psci/psci_main.c +++ b/lib/psci/psci_main.c @@ -414,6 +414,10 @@ u_register_t psci_smc_handler(uint32_t smc_fid, case PSCI_MEM_CHK_RANGE_AARCH32: return psci_mem_chk_range(x1, x2); + case PSCI_SYSTEM_RESET2_AARCH32: + /* We should never return from psci_system_reset2() */ + return psci_system_reset2(x1, x2); + default: break; } @@ -453,6 +457,9 @@ u_register_t psci_smc_handler(uint32_t smc_fid, case PSCI_MEM_CHK_RANGE_AARCH64: return psci_mem_chk_range(x1, x2); + case PSCI_SYSTEM_RESET2_AARCH64: + /* We should never return from psci_system_reset2() */ + return psci_system_reset2(x1, x2); default: break; |