All users of morello_root_cap have now been moved to the appropriate cheri_user_root*_cap, and it is time to retire it.
Signed-off-by: Kevin Brodsky kevin.brodsky@arm.com --- arch/arm64/include/asm/morello.h | 2 -- arch/arm64/kernel/morello.c | 10 ---------- 2 files changed, 12 deletions(-)
diff --git a/arch/arm64/include/asm/morello.h b/arch/arm64/include/asm/morello.h index 56052a028c0e..9f35d710cbfe 100644 --- a/arch/arm64/include/asm/morello.h +++ b/arch/arm64/include/asm/morello.h @@ -38,8 +38,6 @@ void morello_cap_get_val_tag(uintcap_t cap, __uint128_t *val, u8 *tag); */ uintcap_t morello_build_any_user_cap(const __uint128_t *val, u8 tag);
-uintcap_t morello_get_root_cap(void); - /* * Reads or writes a capability from/to tsk's address space (depending on * gup_flags & FOLL_WRITE). diff --git a/arch/arm64/kernel/morello.c b/arch/arm64/kernel/morello.c index 0b79618ae6a9..d999506509be 100644 --- a/arch/arm64/kernel/morello.c +++ b/arch/arm64/kernel/morello.c @@ -27,8 +27,6 @@ void __morello_merge_c_x(uintcap_t *creg, u64 xreg); bool __morello_cap_has_executive(uintcap_t cap); void __morello_thread_init_user(struct task_struct *tsk, uintcap_t ddc);
-/* Not defined as static because morello.S refers to it */ -uintcap_t morello_root_cap __ro_after_init; static uintcap_t morello_sentry_unsealcap __ro_after_init;
/* DDC_ELx reset value (low/high 64 bits), as defined in the Morello spec */ @@ -37,11 +35,6 @@ static uintcap_t morello_sentry_unsealcap __ro_after_init;
#define CAP_OTYPE_FIELD_BITS 15
-uintcap_t morello_get_root_cap(void) -{ - return morello_root_cap; -} - static bool is_pure_task(void) { return IS_ENABLED(CONFIG_CHERI_PURECAP_UABI) && !is_compat_task(); @@ -358,9 +351,6 @@ static int __init morello_cap_init(void) /* Maximum userspace bounds for the time being. */ cheri_user_root_cid_cap = build_cap(cheri_user_root_allperms_cap, perms);
- /* Initialise Morello-specific root capabilities. */ - morello_root_cap = root_cap; - /* Initialize a capability able to unseal sentry capabilities. */ perms = CHERI_PERM_GLOBAL | CHERI_PERM_UNSEAL; morello_sentry_unsealcap = cheri_address_set(root_cap, CHERI_OTYPE_SENTRY);