diff options
| author | davidcunado-arm <david.cunado@arm.com> | 2018-01-16 01:09:37 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-16 01:09:37 +0000 |
| commit | 254ce52fbe9c23deb1e7fbb9e4b42c5ad4d3dd48 (patch) | |
| tree | 89cdd404e6f4a1f26ff0092c2ee3ac2b674af785 | |
| parent | 4fd4a32fb045cefa03342dbb430c21e85f6d36b5 (diff) | |
| parent | 62d862eb2d68b37572f6b33d1c4bd121e588fd20 (diff) | |
| download | platform_external_arm-trusted-firmware-254ce52fbe9c23deb1e7fbb9e4b42c5ad4d3dd48.tar.gz platform_external_arm-trusted-firmware-254ce52fbe9c23deb1e7fbb9e4b42c5ad4d3dd48.tar.bz2 platform_external_arm-trusted-firmware-254ce52fbe9c23deb1e7fbb9e4b42c5ad4d3dd48.zip | |
Merge pull request #1215 from vwadekar/tlkd-ns-dram-ranges
spd: tlkd: support for "NS memory ranges" function ID
| -rw-r--r-- | include/bl32/payloads/tlk.h | 3 | ||||
| -rw-r--r-- | services/spd/tlkd/tlkd_main.c | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/include/bl32/payloads/tlk.h b/include/bl32/payloads/tlk.h index 4e06bcd9a..941b6cc0c 100644 --- a/include/bl32/payloads/tlk.h +++ b/include/bl32/payloads/tlk.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -20,6 +20,7 @@ */ #define TLK_REGISTER_LOGBUF TLK_TOS_YIELD_FID(0x1) #define TLK_REGISTER_REQBUF TLK_TOS_YIELD_FID(0x2) +#define TLK_REGISTER_NS_DRAM TLK_TOS_YIELD_FID(0x4) #define TLK_RESUME_FID TLK_TOS_YIELD_FID(0x100) #define TLK_SYSTEM_SUSPEND TLK_TOS_YIELD_FID(0xE001) #define TLK_SYSTEM_RESUME TLK_TOS_YIELD_FID(0xE002) diff --git a/services/spd/tlkd/tlkd_main.c b/services/spd/tlkd/tlkd_main.c index 78e98535f..cb68bff76 100644 --- a/services/spd/tlkd/tlkd_main.c +++ b/services/spd/tlkd/tlkd_main.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015-2017, ARM Limited and Contributors. All rights reserved. + * Copyright (c) 2015-2018, ARM Limited and Contributors. All rights reserved. * * SPDX-License-Identifier: BSD-3-Clause */ @@ -193,12 +193,14 @@ uint64_t tlkd_smc_handler(uint32_t smc_fid, * b. register shared memory with the SP for passing args * required for maintaining sessions with the Trusted * Applications. - * c. open/close sessions - * d. issue commands to the Trusted Apps - * e. resume the preempted yielding SMC call. + * c. register non-secure world's memory map with the OS + * d. open/close sessions + * e. issue commands to the Trusted Apps + * f. resume the preempted yielding SMC call. */ case TLK_REGISTER_LOGBUF: case TLK_REGISTER_REQBUF: + case TLK_REGISTER_NS_DRAM: case TLK_OPEN_TA_SESSION: case TLK_CLOSE_TA_SESSION: case TLK_TA_LAUNCH_OP: |