From ab83b94756aece29f23f27a4d0eabf2418955e01 Mon Sep 17 00:00:00 2001
From: Ian Moffett <ian@osmora.org>
Date: Fri, 16 May 2025 22:43:08 -0400
Subject: kernel/amd64: trap: Clear interrupts on trap entry

Signed-off-by: Ian Moffett <ian@osmora.org>
---
 sys/include/arch/amd64/frameasm.h | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/sys/include/arch/amd64/frameasm.h b/sys/include/arch/amd64/frameasm.h
index 22217eb..c6316a5 100644
--- a/sys/include/arch/amd64/frameasm.h
+++ b/sys/include/arch/amd64/frameasm.h
@@ -121,6 +121,7 @@
  */
 #define TRAPENTRY_EC(ENTLABEL, TRAPNO)  \
     ENTLABEL:                         ; \
+        cli                           ; \
         testq $0x3, 16(%rsp)          ; \
         jz 1f                         ; \
         lfence                        ; \
@@ -133,7 +134,8 @@
         jz 2f                         ; \
         lfence                        ; \
         swapgs                        ; \
-    2:  iretq
+    2:  sti                           ; \
+        iretq
 
 /*
  * Trap entry where no error code is on
@@ -141,6 +143,7 @@
  */
 #define TRAPENTRY(ENTLABEL, TRAPNO)     \
     ENTLABEL:                         ; \
+        cli                           ; \
         testq $0x3, 8(%rsp)           ; \
         jz 1f                         ; \
         lfence                        ; \
@@ -153,6 +156,7 @@
         jz 2f                         ; \
         lfence                        ; \
         swapgs                        ; \
-    2:  iretq
+    2:  sti                           ; \
+        iretq
 
 #endif  /* !_MACHINE_FRAMEASM_H_ */
-- 
cgit v1.2.3