Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 1 | From f449f6fdcbd987e18a26f0daeccfa447fe76821a Mon Sep 17 00:00:00 2001 |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 2 | From: Olivier Deprez <olivier.deprez@arm.com> |
| 3 | Date: Mon, 16 Nov 2020 10:14:02 +0100 |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 4 | Subject: [PATCH] WIP: Enable managed exit |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 5 | |
| 6 | This change declares OP-TEE SP as supporting managed exit in response to |
| 7 | a NS interrupt triggering while the SWd runs. |
| 8 | |
| 9 | At init OP-TEE enables (HF_INTERRUPT_ENABLE) the managed exit virtual |
| 10 | interrupt through the Hafnium para-virtualized interface. |
| 11 | |
| 12 | Physical interrupts are trapped to the SPMC which injects a managed exit |
| 13 | interrupt to OP-TEE. The managed exit interrupt is acknowledged by |
| 14 | OP-TEE by HF_INTERUPT_GET hvc call. |
| 15 | |
| 16 | Note: this code change is meant with in mind the SPMC runs at SEL2. It |
| 17 | needs slight refactoring such that it does not break the SEL1 SPMC |
| 18 | configuration. |
| 19 | |
| 20 | Change-Id: I9a95f36cf517c11048ff04680007f40259c4f636 |
| 21 | Signed-off-by: Olivier Deprez <olivier.deprez@arm.com> |
| 22 | Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> |
| 23 | |
| 24 | Upstream-Status: Pending [Not submitted to upstream yet] |
| 25 | Signed-off-by: Arunachalam Ganapathy <arunachalam.ganapathy@arm.com> |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 26 | |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 27 | --- |
| 28 | core/arch/arm/kernel/boot.c | 12 ++++++++++++ |
| 29 | core/arch/arm/kernel/thread_a64.S | 11 ++++++++++- |
| 30 | core/arch/arm/kernel/thread_spmc.c | 11 +++++++++++ |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 31 | .../arm/plat-totalcompute/fdts/optee_sp_manifest.dts | 1 + |
| 32 | 4 files changed, 34 insertions(+), 1 deletion(-) |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 33 | |
| 34 | diff --git a/core/arch/arm/kernel/boot.c b/core/arch/arm/kernel/boot.c |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 35 | index dd34173e8..7d2ac74e8 100644 |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 36 | --- a/core/arch/arm/kernel/boot.c |
| 37 | +++ b/core/arch/arm/kernel/boot.c |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 38 | @@ -1424,6 +1424,18 @@ static void init_secondary_helper(unsigned long nsec_entry) |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 39 | init_vfp_sec(); |
| 40 | init_vfp_nsec(); |
| 41 | |
| 42 | + /* Enable managed exit interrupt for secondary core. */ |
| 43 | + __asm__ volatile ( |
| 44 | + "mov x0, %0;" |
| 45 | + "mov x1, %1;" |
| 46 | + "mov x2, %2;" |
| 47 | + "mov x3, %3;" |
| 48 | + "hvc #0" |
| 49 | + : : "i" (0xff03), "i" (4), "i" (1), "i" (1)); |
| 50 | + |
| 51 | + IMSG("%s core %lu: enabled managed exit interrupt.", |
| 52 | + __func__, get_core_pos()); |
| 53 | + |
| 54 | IMSG("Secondary CPU %zu switching to normal world boot", get_core_pos()); |
| 55 | } |
| 56 | |
| 57 | diff --git a/core/arch/arm/kernel/thread_a64.S b/core/arch/arm/kernel/thread_a64.S |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 58 | index 4fa97de24..4facc7631 100644 |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 59 | --- a/core/arch/arm/kernel/thread_a64.S |
| 60 | +++ b/core/arch/arm/kernel/thread_a64.S |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 61 | @@ -1162,6 +1162,14 @@ END_FUNC el0_sync_abort |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 62 | bl dcache_op_louis |
| 63 | ic iallu |
| 64 | #endif |
| 65 | + |
| 66 | + /* HF_INTERRUPT_GET */ |
| 67 | + mov x0, #0xff04 |
| 68 | + hvc #0 |
| 69 | + /* Expect managed exit interrupt */ |
| 70 | + cmp x0, #4 |
| 71 | + bne . |
| 72 | + |
| 73 | /* |
| 74 | * Mark current thread as suspended |
| 75 | */ |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 76 | @@ -1318,8 +1326,9 @@ LOCAL_FUNC elx_irq , : |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 77 | #endif |
| 78 | END_FUNC elx_irq |
| 79 | |
| 80 | +#define HF_MANAGED_EXIT 1 |
| 81 | LOCAL_FUNC elx_fiq , : |
| 82 | -#if defined(CFG_ARM_GICV3) |
| 83 | +#if defined(CFG_ARM_GICV3) || defined (HF_MANAGED_EXIT) |
| 84 | foreign_intr_handler fiq |
| 85 | #else |
| 86 | native_intr_handler fiq |
| 87 | diff --git a/core/arch/arm/kernel/thread_spmc.c b/core/arch/arm/kernel/thread_spmc.c |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 88 | index 3b4ac0b4e..8f7c18dfa 100644 |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 89 | --- a/core/arch/arm/kernel/thread_spmc.c |
| 90 | +++ b/core/arch/arm/kernel/thread_spmc.c |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 91 | @@ -1517,6 +1517,17 @@ static TEE_Result spmc_init(void) |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 92 | my_endpoint_id = spmc_get_id(); |
| 93 | DMSG("My endpoint ID %#x", my_endpoint_id); |
| 94 | |
| 95 | + /* Enable managed exit interrupt for boot core. */ |
| 96 | + __asm__ volatile ( |
| 97 | + "mov x0, %0;" |
| 98 | + "mov x1, %1;" |
| 99 | + "mov x2, %2;" |
| 100 | + "mov x3, %3;" |
| 101 | + "hvc #0" |
| 102 | + : : "i" (0xff03), "i" (4), "i" (1), "i" (1)); |
| 103 | + |
| 104 | + IMSG("%s enabled managed exit interrupt.", __func__); |
| 105 | + |
| 106 | return TEE_SUCCESS; |
| 107 | } |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 108 | #endif /* !defined(CFG_CORE_SEL1_SPMC) */ |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 109 | diff --git a/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts b/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts |
Andrew Geissler | fc7e797 | 2023-09-11 08:24:07 -0400 | [diff] [blame^] | 110 | index 3ebbaddc8..56e69f372 100644 |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 111 | --- a/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts |
| 112 | +++ b/core/arch/arm/plat-totalcompute/fdts/optee_sp_manifest.dts |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 113 | @@ -24,6 +24,7 @@ |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 114 | xlat-granule = <0>; /* 4KiB */ |
| 115 | boot-order = <0>; |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 116 | messaging-method = <0x3>; /* Direct request/response supported */ |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 117 | + managed-exit; /* Managed exit supported */ |
Patrick Williams | 8dd6848 | 2022-10-04 07:57:18 -0500 | [diff] [blame] | 118 | |
Brad Bishop | bec4ebc | 2022-08-03 09:55:16 -0400 | [diff] [blame] | 119 | device-regions { |
| 120 | compatible = "arm,ffa-manifest-device-regions"; |