Add init_tee_secondary() to the TEE mediator framework and call it from
start_secondary() late enough that per-cpu interrupts can be configured
on CPUs as they are initialized. This is needed in later patches.
Signed-off-by: Jens Wiklander <jens.wiklander@linaro.org>
Reviewed-by: Bertrand Marquis <bertrand.marquis@arm.com>
---
v5->v6:
- Rename init_tee_interrupt() to init_tee_secondary() as requested
---
xen/arch/arm/include/asm/tee/tee.h | 8 ++++++++
xen/arch/arm/smpboot.c | 2 ++
xen/arch/arm/tee/tee.c | 6 ++++++
3 files changed, 16 insertions(+)
diff --git a/xen/arch/arm/include/asm/tee/tee.h b/xen/arch/arm/include/asm/tee/tee.h
index da324467e130..6bc13da885b6 100644
--- a/xen/arch/arm/include/asm/tee/tee.h
+++ b/xen/arch/arm/include/asm/tee/tee.h
@@ -28,6 +28,9 @@ struct tee_mediator_ops {
*/
bool (*probe)(void);
+ /* Initialize secondary CPUs */
+ void (*init_secondary)(void);
+
/*
* Called during domain construction if toolstack requests to enable
* TEE support so mediator can inform TEE about new
@@ -66,6 +69,7 @@ int tee_domain_init(struct domain *d, uint16_t tee_type);
int tee_domain_teardown(struct domain *d);
int tee_relinquish_resources(struct domain *d);
uint16_t tee_get_type(void);
+void init_tee_secondary(void);
#define REGISTER_TEE_MEDIATOR(_name, _namestr, _type, _ops) \
static const struct tee_mediator_desc __tee_desc_##_name __used \
@@ -105,6 +109,10 @@ static inline uint16_t tee_get_type(void)
return XEN_DOMCTL_CONFIG_TEE_NONE;
}
+static inline void init_tee_secondary(void)
+{
+}
+
#endif /* CONFIG_TEE */
#endif /* __ARCH_ARM_TEE_TEE_H__ */
diff --git a/xen/arch/arm/smpboot.c b/xen/arch/arm/smpboot.c
index 93a10d7721b4..04e363088d60 100644
--- a/xen/arch/arm/smpboot.c
+++ b/xen/arch/arm/smpboot.c
@@ -29,6 +29,7 @@
#include <asm/procinfo.h>
#include <asm/psci.h>
#include <asm/acpi.h>
+#include <asm/tee/tee.h>
/* Override macros from asm/page.h to make them work with mfn_t */
#undef virt_to_mfn
@@ -401,6 +402,7 @@ void asmlinkage start_secondary(void)
*/
init_maintenance_interrupt();
init_timer_interrupt();
+ init_tee_secondary();
local_abort_enable();
diff --git a/xen/arch/arm/tee/tee.c b/xen/arch/arm/tee/tee.c
index ddd17506a9ff..9fd1d7495b2e 100644
--- a/xen/arch/arm/tee/tee.c
+++ b/xen/arch/arm/tee/tee.c
@@ -96,6 +96,12 @@ static int __init tee_init(void)
__initcall(tee_init);
+void __init init_tee_secondary(void)
+{
+ if ( cur_mediator && cur_mediator->ops->init_secondary )
+ cur_mediator->ops->init_secondary();
+}
+
/*
* Local variables:
* mode: C
--
2.34.1