aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSoby Mathew <soby.mathew@arm.com>2019-10-04 14:15:59 +0000
committerTrustedFirmware Code Review <review@review.trustedfirmware.org>2019-10-04 14:15:59 +0000
commit7d3054a7a194a43546b65b7c5d814b8212e2e01e (patch)
tree4d9056c3d3cc86fb248ca312c6a8b75b7cd039fb /include
parent7edf1a5ef3153f761c094c035da3eb10501b7247 (diff)
parent719714f1895399e6d64049bed3b03c2597d95402 (diff)
downloadtf-a-tests-7d3054a7a194a43546b65b7c5d814b8212e2e01e.tar.gz
Merge "TF-A Tests: Enable PAuth on warm boot path"
Diffstat (limited to 'include')
-rw-r--r--include/lib/aarch64/arch_features.h2
-rw-r--r--include/lib/extensions/pauth.h20
-rw-r--r--include/plat/common/platform.h3
3 files changed, 21 insertions, 4 deletions
diff --git a/include/lib/aarch64/arch_features.h b/include/lib/aarch64/arch_features.h
index 5891c7a71..20240ec4d 100644
--- a/include/lib/aarch64/arch_features.h
+++ b/include/lib/aarch64/arch_features.h
@@ -51,7 +51,7 @@ static inline bool is_armv8_3_pauth_apa_api_present(void)
static inline bool is_armv8_3_pauth_gpa_gpi_present(void)
{
uint64_t mask = (ID_AA64ISAR1_GPI_MASK << ID_AA64ISAR1_GPI_SHIFT) |
- (ID_AA64ISAR1_GPA_MASK << ID_AA64ISAR1_GPA_SHIFT);
+ (ID_AA64ISAR1_GPA_MASK << ID_AA64ISAR1_GPA_SHIFT);
return (read_id_aa64isar1_el1() & mask) != 0U;
}
diff --git a/include/lib/extensions/pauth.h b/include/lib/extensions/pauth.h
new file mode 100644
index 000000000..a4da00990
--- /dev/null
+++ b/include/lib/extensions/pauth.h
@@ -0,0 +1,20 @@
+/*
+ * Copyright (c) 2019, Arm Limited. All rights reserved.
+ *
+ * SPDX-License-Identifier: BSD-3-Clause
+ */
+
+#ifndef PAUTH_H
+#define PAUTH_H
+
+#include <stdint.h>
+
+#ifdef __aarch64__
+/* Initialize 128-bit ARMv8.3-PAuth key */
+uint128_t init_apkey(void);
+
+/* Program APIAKey_EL1 key and enable ARMv8.3-PAuth */
+void pauth_init_enable(void);
+#endif /* __aarch64__ */
+
+#endif /* PAUTH_H */
diff --git a/include/plat/common/platform.h b/include/plat/common/platform.h
index b30c41ebd..f3536bab7 100644
--- a/include/plat/common/platform.h
+++ b/include/plat/common/platform.h
@@ -67,9 +67,6 @@ int plat_crash_console_flush(void);
/* Gets a handle for the initialised IO entity */
void plat_get_nvm_handle(uintptr_t *handle);
-/* Initialize and get a pointer to a uint64_t[2] array with a 128-key */
-uint64_t *plat_init_apiakey(void);
-
/*
* Returns the platform topology description array. The size of this
* array should be PLATFORM_NUM_AFFS - PLATFORM_CORE_COUNT + 1.