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
fb70e56d
Unverified
Commit
fb70e56d
authored
Mar 04, 2019
by
Antonio Niño Díaz
Committed by
GitHub
Mar 04, 2019
Browse files
Merge pull request #1851 from antonio-nino-diaz-arm/an/pauth
Correctly check for support of Address Authentication
parents
22cde67b
b6fd4183
Changes
2
Hide whitespace changes
Inline
Side-by-side
common/bl_common.c
View file @
fb70e56d
...
...
@@ -265,7 +265,7 @@ void bl_handle_pauth(void)
* system registers. Pointer authentication can't be enabled here or the
* authentication will fail when returning from this function.
*/
assert
(
is_armv8_3_pauth_api_present
());
assert
(
is_armv8_3_pauth_
apa_
api_present
());
uint64_t
*
apiakey
=
plat_init_apiakey
();
...
...
include/arch/aarch64/arch_features.h
View file @
fb70e56d
...
...
@@ -34,10 +34,12 @@ static inline bool is_armv8_3_pauth_present(void)
return
(
read_id_aa64isar1_el1
()
&
mask
)
!=
0U
;
}
static
inline
bool
is_armv8_3_pauth_api_present
(
void
)
static
inline
bool
is_armv8_3_pauth_
apa_
api_present
(
void
)
{
return
((
read_id_aa64isar1_el1
()
>>
ID_AA64ISAR1_API_SHIFT
)
&
ID_AA64ISAR1_API_MASK
)
!=
0U
;
uint64_t
mask
=
(
ID_AA64ISAR1_API_MASK
<<
ID_AA64ISAR1_API_SHIFT
)
|
(
ID_AA64ISAR1_APA_MASK
<<
ID_AA64ISAR1_APA_SHIFT
);
return
(
read_id_aa64isar1_el1
()
&
mask
)
!=
0U
;
}
static
inline
bool
is_armv8_4_ttst_present
(
void
)
...
...
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