From fd7ab300a89251028b485f2ffe08f97326e860a2 Mon Sep 17 00:00:00 2001 From: Yifan Liu Date: Sat, 4 Dec 2021 06:47:05 +0000 Subject: [PATCH] hv: tee: Rename TEE_NOTIFICATION_VECTOR to TEE_FIXED_NONSECURE_VECTOR The TEE_NOTIFICATION_VECTOR can sometimes be confused with TEE's PI notification vector. So rename it to TEE_FIXED_NONSECURE_VECTOR for better readability. No logic change. v3: Add more comments in commit message. Tracked-On: #6571 Signed-off-by: Yifan Liu Reviewed-by: Wang, Yu1 Acked-by: Anthony Xu --- hypervisor/arch/x86/guest/optee.c | 2 +- hypervisor/include/arch/x86/asm/guest/optee.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/hypervisor/arch/x86/guest/optee.c b/hypervisor/arch/x86/guest/optee.c index a0af2f8c0..2b6a7fa74 100644 --- a/hypervisor/arch/x86/guest/optee.c +++ b/hypervisor/arch/x86/guest/optee.c @@ -170,7 +170,7 @@ void handle_x86_tee_int(struct ptirq_remapping_info *entry, uint16_t pcpu_id) * and continue to switch back to TEE for running. */ tee_vcpu = vcpu_from_pid(get_companion_vm(entry->vm), pcpu_id); - vlapic_set_intr(tee_vcpu, TEE_NOTIFICATION_VECTOR, LAPIC_TRIG_EDGE); + vlapic_set_intr(tee_vcpu, TEE_FIXED_NONSECURE_VECTOR, LAPIC_TRIG_EDGE); } else if (is_tee_vm(entry->vm) && is_ree_vm(curr_vcpu->vm)) { /* * Secure interrupt (interrupt belongs to TEE) comes diff --git a/hypervisor/include/arch/x86/asm/guest/optee.h b/hypervisor/include/arch/x86/asm/guest/optee.h index ca829afef..6b3e2a560 100644 --- a/hypervisor/include/arch/x86/asm/guest/optee.h +++ b/hypervisor/include/arch/x86/asm/guest/optee.h @@ -11,7 +11,7 @@ #include #include -#define TEE_NOTIFICATION_VECTOR 0x29U +#define TEE_FIXED_NONSECURE_VECTOR 0x29U /* If the RDI equals to this value, then this is a RETURN after FIQ DONE */ #define OPTEE_RETURN_FIQ_DONE 0xBE000006UL