diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2016-12-23 11:20:16 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-23 11:20:16 +0000 |
| commit | cef7b3ce8b26cd94e7e71ddeefc039451525b780 (patch) | |
| tree | e46500a3463b4b45b38e5815314aea100634b177 /include | |
| parent | 153e5eb8f155ec001027ee28bfc229b67ccceee0 (diff) | |
| parent | 3df6012a3eff73d75d747187d7cfac1fd6d7819f (diff) | |
Merge pull request #798 from douglas-raillard-arm/dr/fix_std_smc_after_suspend
Abort preempted TSP STD SMC after PSCI CPU suspend
Diffstat (limited to 'include')
| -rw-r--r-- | include/bl32/tsp/tsp.h | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/include/bl32/tsp/tsp.h b/include/bl32/tsp/tsp.h index 4d7bc232..1e357884 100644 --- a/include/bl32/tsp/tsp.h +++ b/include/bl32/tsp/tsp.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2014, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -41,6 +41,7 @@ #define TSP_SUSPEND_DONE 0xf2000003 #define TSP_RESUME_DONE 0xf2000004 #define TSP_PREEMPTED 0xf2000005 +#define TSP_ABORT_DONE 0xf2000007 #define TSP_SYSTEM_OFF_DONE 0xf2000008 #define TSP_SYSTEM_RESET_DONE 0xf2000009 @@ -81,10 +82,17 @@ /* SMC function ID to request a previously preempted std smc */ #define TSP_FID_RESUME TSP_STD_FID(0x3000) /* + * SMC function ID to request abortion of a previously preempted std smc. A + * fast SMC is used so that the TSP abort handler does not have to be + * reentrant. + */ +#define TSP_FID_ABORT TSP_FAST_FID(0x3001) + +/* * Total number of function IDs implemented for services offered to NS clients. * The function IDs are defined above */ -#define TSP_NUM_FID 0x4 +#define TSP_NUM_FID 0x5 /* TSP implementation version numbers */ #define TSP_VERSION_MAJOR 0x0 /* Major version */ @@ -117,6 +125,7 @@ typedef struct tsp_vectors { tsp_vector_isn_t sel1_intr_entry; tsp_vector_isn_t system_off_entry; tsp_vector_isn_t system_reset_entry; + tsp_vector_isn_t abort_std_smc_entry; } tsp_vectors_t; |