diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2017-05-02 16:32:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-02 16:32:20 +0100 |
| commit | 4b427bd48778a7af9f1bb639a33c8d25e758a245 (patch) | |
| tree | fcb3564316d6bfd1649a655c59d98b039a59a5d9 /include | |
| parent | 062dd378280a6a1b9ace59d0be9c466a05a2de95 (diff) | |
| parent | 16292f54811f27bb7de28512cda74db83686cb63 (diff) | |
Merge pull request #919 from davidcunado-arm/dc/smc_yielding_generic
Update terminology: standard SMC to yielding SMC
Diffstat (limited to 'include')
| -rw-r--r-- | include/bl32/tsp/tsp.h | 20 | ||||
| -rw-r--r-- | include/lib/smcc.h | 5 |
2 files changed, 14 insertions, 11 deletions
diff --git a/include/bl32/tsp/tsp.h b/include/bl32/tsp/tsp.h index 1e357884..08a6bfca 100644 --- a/include/bl32/tsp/tsp.h +++ b/include/bl32/tsp/tsp.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013-2016, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2013-2017, 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: @@ -46,7 +46,7 @@ #define TSP_SYSTEM_RESET_DONE 0xf2000009 /* - * Function identifiers to handle S-El1 interrupt through the synchronous + * Function identifiers to handle S-EL1 interrupt through the synchronous * handling model. If the TSP was previously interrupted then control has to * be returned to the TSPD after handling the interrupt else execution can * remain in the TSP. @@ -58,7 +58,7 @@ /* * Identifiers for various TSP services. Corresponding function IDs (whether - * fast or standard) are generated by macros defined below + * fast or yielding) are generated by macros defined below */ #define TSP_ADD 0x2000 #define TSP_SUB 0x2001 @@ -74,15 +74,15 @@ /* * Generate function IDs for TSP services to be used in SMC calls, by - * appropriately setting bit 31 to differentiate standard and fast SMC calls + * appropriately setting bit 31 to differentiate yielding and fast SMC calls */ -#define TSP_STD_FID(fid) ((TSP_BARE_FID(fid) | 0x72000000)) +#define TSP_YIELD_FID(fid) ((TSP_BARE_FID(fid) | 0x72000000)) #define TSP_FAST_FID(fid) ((TSP_BARE_FID(fid) | 0x72000000) | (1u << 31)) -/* SMC function ID to request a previously preempted std smc */ -#define TSP_FID_RESUME TSP_STD_FID(0x3000) +/* SMC function ID to request a previously preempted yielding smc */ +#define TSP_FID_RESUME TSP_YIELD_FID(0x3000) /* - * SMC function ID to request abortion of a previously preempted std smc. A + * SMC function ID to request abortion of a previously preempted yielding SMC. A * fast SMC is used so that the TSP abort handler does not have to be * reentrant. */ @@ -116,7 +116,7 @@ typedef uint32_t tsp_vector_isn_t; typedef struct tsp_vectors { - tsp_vector_isn_t std_smc_entry; + tsp_vector_isn_t yield_smc_entry; tsp_vector_isn_t fast_smc_entry; tsp_vector_isn_t cpu_on_entry; tsp_vector_isn_t cpu_off_entry; @@ -125,7 +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_vector_isn_t abort_yield_smc_entry; } tsp_vectors_t; diff --git a/include/lib/smcc.h b/include/lib/smcc.h index d24d1905..5fad7b8a 100644 --- a/include/lib/smcc.h +++ b/include/lib/smcc.h @@ -61,7 +61,10 @@ #define SMC_OK 0 #define SMC_UNK 0xffffffff #define SMC_TYPE_FAST ULL(1) +#if !ERROR_DEPRECATED #define SMC_TYPE_STD 0 +#endif +#define SMC_TYPE_YIELD 0 #define SMC_PREEMPTED 0xfffffffe /******************************************************************************* * Owning entity number definitions inside the function id as per the SMC @@ -75,7 +78,7 @@ #define OEN_SIP_END 2 #define OEN_OEM_START 3 #define OEN_OEM_END 3 -#define OEN_STD_START 4 /* Standard Calls */ +#define OEN_STD_START 4 /* Standard Service Calls */ #define OEN_STD_END 4 #define OEN_TAP_START 48 /* Trusted Applications */ #define OEN_TAP_END 49 |