[PATCH v3 11/17] x86/sev: Enable NMI support for Secure AVIC

From: Neeraj Upadhyay
Date: Tue Apr 01 2025 - 07:40:27 EST


From: Kishon Vijay Abraham I <kvijayab@xxxxxxx>

Now that support to send NMI IPI and support to inject NMI from
the hypervisor has been added, set V_NMI_ENABLE in VINTR_CTRL
field of VMSA to enable NMI for Secure AVIC guests.

Signed-off-by: Kishon Vijay Abraham I <kvijayab@xxxxxxx>
Signed-off-by: Neeraj Upadhyay <Neeraj.Upadhyay@xxxxxxx>
---
Changes since v2:
- No change.

arch/x86/coco/sev/core.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/coco/sev/core.c b/arch/x86/coco/sev/core.c
index bc8c3b596dd1..9ade2b1993ad 100644
--- a/arch/x86/coco/sev/core.c
+++ b/arch/x86/coco/sev/core.c
@@ -1271,7 +1271,7 @@ static int wakeup_cpu_via_vmgexit(u32 apic_id, unsigned long start_ip)
vmsa->x87_fcw = AP_INIT_X87_FCW_DEFAULT;

if (cc_platform_has(CC_ATTR_SNP_SECURE_AVIC))
- vmsa->vintr_ctrl |= V_GIF_MASK;
+ vmsa->vintr_ctrl |= (V_GIF_MASK | V_NMI_ENABLE_MASK);

/* SVME must be set. */
vmsa->efer = EFER_SVME;
--
2.34.1