diff options
| author | danh-arm <dan.handley@arm.com> | 2016-12-21 09:58:56 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-21 09:58:56 +0000 |
| commit | 153e5eb8f155ec001027ee28bfc229b67ccceee0 (patch) | |
| tree | 104a86576e310b04589e3b89cbfff1c5b4063684 | |
| parent | e60f1897511c3852bd3e1bfc88c9ca7a6b2a1131 (diff) | |
| parent | 5388a584982a58a82e8bda03e11f18bf60a33066 (diff) | |
| download | platform_external_arm-trusted-firmware-153e5eb8f155ec001027ee28bfc229b67ccceee0.tar.gz platform_external_arm-trusted-firmware-153e5eb8f155ec001027ee28bfc229b67ccceee0.tar.bz2 platform_external_arm-trusted-firmware-153e5eb8f155ec001027ee28bfc229b67ccceee0.zip | |
Merge pull request #794 from douglas-raillard-arm/dr/fix_TSP_STD_FID_macro
Fix TSP_STD_FID macro
| -rw-r--r-- | include/bl32/tsp/tsp.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/include/bl32/tsp/tsp.h b/include/bl32/tsp/tsp.h index fd43fd3b3..4d7bc232f 100644 --- a/include/bl32/tsp/tsp.h +++ b/include/bl32/tsp/tsp.h @@ -66,21 +66,20 @@ #define TSP_HANDLE_SEL1_INTR_AND_RETURN 0x2004 /* + * Identify a TSP service from function ID filtering the last 16 bits from the + * SMC function ID + */ +#define TSP_BARE_FID(fid) ((fid) & 0xffff) + +/* * Generate function IDs for TSP services to be used in SMC calls, by * appropriately setting bit 31 to differentiate standard and fast SMC calls */ -#define TSP_STD_FID(fid) ((fid) | 0x72000000 | (0 << 31)) -#define TSP_FAST_FID(fid) ((fid) | 0x72000000 | (1 << 31)) +#define TSP_STD_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) - -/* - * Identify a TSP service from function ID filtering the last 16 bits from the - * SMC function ID - */ -#define TSP_BARE_FID(fid) ((fid) & 0xffff) - /* * Total number of function IDs implemented for services offered to NS clients. * The function IDs are defined above |