Skip to content

Commit

Permalink
[Review] Add support for several user TA stores
Browse files Browse the repository at this point in the history
Address Etienne's comments (round #3).

Signed-off-by: Jerome Forissier <jerome.forissier@linaro.org>
  • Loading branch information
jforissier committed Aug 8, 2017
1 parent 96db951 commit 1343282
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion core/arch/arm/kernel/elf_load.h
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,10 @@ struct user_ta_store_ops {
/*
* user_ta_store_ops instances are kept in a list ordered by priority.
* Higher priority instances are tried first when a TA is looked up.
* @priority lower value means higher priority
*/
SLIST_ENTRY(user_ta_store_ops) link;
int priority; /* Lower value means higher priority */
int priority;
};

TEE_Result elf_load_init(const struct user_ta_store_ops *ta_store,
Expand Down
2 changes: 1 addition & 1 deletion core/arch/arm/kernel/user_ta.c
Original file line number Diff line number Diff line change
Expand Up @@ -606,7 +606,7 @@ TEE_Result tee_ta_register_ta_store(struct user_ta_store_ops *ops)
SLIST_FOREACH(e, &uta_store_list, link) {
/*
* Do not allow equal priorities to avoid any dependency on
* registration order
* registration order.
*/
assert(e->priority != ops->priority);
if (e->priority > ops->priority)
Expand Down

0 comments on commit 1343282

Please sign in to comment.