-
Notifications
You must be signed in to change notification settings - Fork 3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
CMSIS: Add TrustZone functions #6483
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,24 @@ | ||
/* mbed Microcontroller Library | ||
* Copyright (c) 2018 ARM Limited | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
#ifndef RTE_COMPONENTS_H | ||
#define RTE_COMPONENTS_H | ||
|
||
#define CMSIS_device_header <cmsis.h> | ||
#include "mbed_rtx_conf.h" | ||
|
||
#endif | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,206 @@ | ||
/* | ||
* Copyright (c) 2015-2016 ARM Limited. All rights reserved. | ||
* | ||
* SPDX-License-Identifier: Apache-2.0 | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the License); you may | ||
* not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an AS IS BASIS, WITHOUT | ||
* WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
* | ||
* ---------------------------------------------------------------------------- | ||
* | ||
* $Date: 15. October 2016 | ||
* $Revision: 1.1.0 | ||
* | ||
* Project: TrustZone for ARMv8-M | ||
* Title: Context Management for ARMv8-M TrustZone - Sample implementation | ||
* | ||
*---------------------------------------------------------------------------*/ | ||
|
||
#if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) | ||
|
||
#include "RTE_Components.h" | ||
#include CMSIS_device_header | ||
#include "tz_context.h" | ||
|
||
/// Number of process slots (threads may call secure library code) | ||
#ifndef TZ_PROCESS_STACK_SLOTS | ||
#define TZ_PROCESS_STACK_SLOTS 8U | ||
#endif | ||
|
||
/// Stack size of the secure library code | ||
#ifndef TZ_PROCESS_STACK_SIZE | ||
#define TZ_PROCESS_STACK_SIZE 256U | ||
#endif | ||
|
||
typedef struct { | ||
uint32_t sp_top; // stack space top | ||
uint32_t sp_limit; // stack space limit | ||
uint32_t sp; // current stack pointer | ||
} stack_info_t; | ||
|
||
static stack_info_t ProcessStackInfo [TZ_PROCESS_STACK_SLOTS]; | ||
static uint64_t ProcessStackMemory[TZ_PROCESS_STACK_SLOTS][TZ_PROCESS_STACK_SIZE/8U]; | ||
static uint32_t ProcessStackFreeSlot = 0xFFFFFFFFU; | ||
|
||
|
||
/// Initialize secure context memory system | ||
/// \return execution status (1: success, 0: error) | ||
__attribute__((cmse_nonsecure_entry)) | ||
uint32_t TZ_InitContextSystem_S (void) { | ||
uint32_t n; | ||
|
||
if (__get_IPSR() == 0U) { | ||
return 0U; // Thread Mode | ||
} | ||
|
||
for (n = 0U; n < TZ_PROCESS_STACK_SLOTS; n++) { | ||
ProcessStackInfo[n].sp = 0U; | ||
ProcessStackInfo[n].sp_limit = (uint32_t)&ProcessStackMemory[n]; | ||
ProcessStackInfo[n].sp_top = (uint32_t)&ProcessStackMemory[n] + TZ_PROCESS_STACK_SIZE; | ||
*((uint32_t *)ProcessStackMemory[n]) = n + 1U; | ||
} | ||
*((uint32_t *)ProcessStackMemory[--n]) = 0xFFFFFFFFU; | ||
|
||
ProcessStackFreeSlot = 0U; | ||
|
||
// Default process stack pointer and stack limit | ||
__set_PSPLIM((uint32_t)ProcessStackMemory); | ||
__set_PSP ((uint32_t)ProcessStackMemory); | ||
|
||
// Privileged Thread Mode using PSP | ||
__set_CONTROL(0x02U); | ||
|
||
return 1U; // Success | ||
} | ||
|
||
|
||
/// Allocate context memory for calling secure software modules in TrustZone | ||
/// \param[in] module identifies software modules called from non-secure mode | ||
/// \return value != 0 id TrustZone memory slot identifier | ||
/// \return value 0 no memory available or internal error | ||
__attribute__((cmse_nonsecure_entry)) | ||
TZ_MemoryId_t TZ_AllocModuleContext_S (TZ_ModuleId_t module) { | ||
uint32_t slot; | ||
|
||
(void)module; // Ignore (fixed Stack size) | ||
|
||
if (__get_IPSR() == 0U) { | ||
return 0U; // Thread Mode | ||
} | ||
|
||
if (ProcessStackFreeSlot == 0xFFFFFFFFU) { | ||
return 0U; // No slot available | ||
} | ||
|
||
slot = ProcessStackFreeSlot; | ||
ProcessStackFreeSlot = *((uint32_t *)ProcessStackMemory[slot]); | ||
|
||
ProcessStackInfo[slot].sp = ProcessStackInfo[slot].sp_top; | ||
|
||
return (slot + 1U); | ||
} | ||
|
||
|
||
/// Free context memory that was previously allocated with \ref TZ_AllocModuleContext_S | ||
/// \param[in] id TrustZone memory slot identifier | ||
/// \return execution status (1: success, 0: error) | ||
__attribute__((cmse_nonsecure_entry)) | ||
uint32_t TZ_FreeModuleContext_S (TZ_MemoryId_t id) { | ||
uint32_t slot; | ||
|
||
if (__get_IPSR() == 0U) { | ||
return 0U; // Thread Mode | ||
} | ||
|
||
if ((id == 0U) || (id > TZ_PROCESS_STACK_SLOTS)) { | ||
return 0U; // Invalid ID | ||
} | ||
|
||
slot = id - 1U; | ||
|
||
if (ProcessStackInfo[slot].sp == 0U) { | ||
return 0U; // Inactive slot | ||
} | ||
ProcessStackInfo[slot].sp = 0U; | ||
|
||
*((uint32_t *)ProcessStackMemory[slot]) = ProcessStackFreeSlot; | ||
ProcessStackFreeSlot = slot; | ||
|
||
return 1U; // Success | ||
} | ||
|
||
|
||
/// Load secure context (called on RTOS thread context switch) | ||
/// \param[in] id TrustZone memory slot identifier | ||
/// \return execution status (1: success, 0: error) | ||
__attribute__((cmse_nonsecure_entry)) | ||
uint32_t TZ_LoadContext_S (TZ_MemoryId_t id) { | ||
uint32_t slot; | ||
|
||
if ((__get_IPSR() == 0U) || ((__get_CONTROL() & 2U) == 0U)) { | ||
return 0U; // Thread Mode or using Main Stack for threads | ||
} | ||
|
||
if ((id == 0U) || (id > TZ_PROCESS_STACK_SLOTS)) { | ||
return 0U; // Invalid ID | ||
} | ||
|
||
slot = id - 1U; | ||
|
||
if (ProcessStackInfo[slot].sp == 0U) { | ||
return 0U; // Inactive slot | ||
} | ||
|
||
// Setup process stack pointer and stack limit | ||
__set_PSPLIM(ProcessStackInfo[slot].sp_limit); | ||
__set_PSP (ProcessStackInfo[slot].sp); | ||
|
||
return 1U; // Success | ||
} | ||
|
||
|
||
/// Store secure context (called on RTOS thread context switch) | ||
/// \param[in] id TrustZone memory slot identifier | ||
/// \return execution status (1: success, 0: error) | ||
__attribute__((cmse_nonsecure_entry)) | ||
uint32_t TZ_StoreContext_S (TZ_MemoryId_t id) { | ||
uint32_t slot; | ||
uint32_t sp; | ||
|
||
if ((__get_IPSR() == 0U) || ((__get_CONTROL() & 2U) == 0U)) { | ||
return 0U; // Thread Mode or using Main Stack for threads | ||
} | ||
|
||
if ((id == 0U) || (id > TZ_PROCESS_STACK_SLOTS)) { | ||
return 0U; // Invalid ID | ||
} | ||
|
||
slot = id - 1U; | ||
|
||
if (ProcessStackInfo[slot].sp == 0U) { | ||
return 0U; // Inactive slot | ||
} | ||
|
||
sp = __get_PSP(); | ||
if ((sp < ProcessStackInfo[slot].sp_limit) || | ||
(sp > ProcessStackInfo[slot].sp_top)) { | ||
return 0U; // SP out of range | ||
} | ||
ProcessStackInfo[slot].sp = sp; | ||
|
||
// Default process stack pointer and stack limit | ||
__set_PSPLIM((uint32_t)ProcessStackMemory); | ||
__set_PSP ((uint32_t)ProcessStackMemory); | ||
|
||
return 1U; // Success | ||
} | ||
#endif |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is there a way forward without addingn extra commits here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bulislaw - Can work on that if you have any suggestions. In this case the code is picked from sample implementation and wont even compile as is.
https://github.com/ARM-software/CMSIS_5/blob/develop/CMSIS/RTOS2/RTX/Examples/TrustZoneV8M/RTOS/CM33_s/tz_context.c#L29
I have 3 changes listed below of which I have solution for two, but still for header file we will need a commit, unless you want to track it some other way.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could you do this: f072380
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You probably won't need the
_RTE_
for current version of CMSISThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bulislaw - b93aca2 Will have to add this change in json file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why? Use the
#include "RTE_Components.h"
and#include CMSIS_device_header
the same way my commit does and configure it in config file. Is there something i'm missing?There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@bulislaw - Sorry I missed the header part, but the change I wanted to address was conditional compilation. b93aca2#diff-ae477765d86108e79533ea6617f50737R28
File should be compiled only in case of secure build and not for non-secure build, will check with @theotherjimmy if we can have some option from tools
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yep. We can have that support in the tools. We currently don't have something like that. Would you like that as part of this PR? or another PR?