Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
adam.huang
Arm Trusted Firmware
Commits
79199f70
Commit
79199f70
authored
Apr 26, 2017
by
davidcunado-arm
Committed by
GitHub
Apr 26, 2017
Browse files
Merge pull request #907 from antonio-nino-diaz-arm/an/smc-ret0
tspd:FWU:Fix usage of SMC_RET0
parents
b7a52a78
7a317a70
Changes
3
Hide whitespace changes
Inline
Side-by-side
bl1/bl1_fwu.c
View file @
79199f70
...
...
@@ -109,7 +109,7 @@ register_t bl1_fwu_smc_handler(unsigned int smc_fid,
break
;
}
SMC_RET
0
(
handle
);
SMC_RET
1
(
handle
,
SMC_UNK
);
}
/*******************************************************************************
...
...
include/lib/smcc.h
View file @
79199f70
...
...
@@ -58,6 +58,7 @@
#define SMC_64 1
#define SMC_32 0
#define SMC_OK 0
#define SMC_UNK 0xffffffff
#define SMC_TYPE_FAST ULL(1)
#define SMC_TYPE_STD 0
...
...
services/spd/tspd/tspd_main.c
View file @
79199f70
...
...
@@ -631,7 +631,7 @@ uint64_t tspd_smc_handler(uint32_t smc_fid,
cm_el1_sysregs_context_restore
(
NON_SECURE
);
cm_set_next_eret_context
(
NON_SECURE
);
SMC_RET
0
(
handle
);
SMC_RET
1
(
handle
,
SMC_OK
);
/*
* Request from non secure world to resume the preempted
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment