Interrupt fires on packet receive

Author: Ian Seyler

src/drivers/msi.asm

@@ -76,7 +76,7 @@ msix_init_enable:
 
 	; Configure MSI-X Table
 	add cx, 1			; Table Size is 0-indexed
-	mov ebx, 0x00004000		; Trigger Mode (15), Level (14), Delivery Mode (10:8), Vector (7:0)
+	xor ebx, ebx			; Trigger Mode (15), Level (14), Delivery Mode (10:8), Vector (7:0)
 	mov bl, r8b			; Store start vector
 msix_init_create_entry:
 	mov rax, [os_LocalAPICAddress]	; 0xFEE for bits 31:20, Dest (19:12), RH (3), DM (2)

src/drivers/net/virtio-net.asm

@@ -17,7 +17,7 @@ net_virtio_init:
 	push rbx
 	push rax
 
-	push rdx			; Save packed bus address
+;	push rdx			; Save packed bus address
 
 	mov rdi, net_table
 	xor eax, eax
@@ -42,9 +42,36 @@ net_virtio_init:
 	mov dl, 0x01			; Read Status/Command
 	call os_bus_read
 	bts eax, 10			; Set Interrupt Disable
+	bts eax, 2			; Enable Bus Master
 	bts eax, 1			; Enable Memory Space
 	call os_bus_write
 
+	; Configure MSI-X (if available)
+	mov al, 0xB0
+	call msix_init
+	jc net_virtio_init_skip_int
+
+	; Create gate(s) in the IDT
+	push rdi
+	sub rdi, 0x1C
+	mov ax, 0x0001			; Set flag for nt_interrupt
+	stosw
+	mov edi, 0xB0
+	mov rax, net_virtio_int
+	call create_gate
+	mov edi, 0xB1
+	mov rax, net_virtio_int
+	call create_gate
+;	mov edi, 0xB2
+;	mov rax, net_virtio_int
+;	call create_gate
+;	mov edi, 0xB3
+;	mov rax, net_virtio_int
+;	call create_gate
+	pop rdi
+
+net_virtio_init_skip_int:
+
 	; Get required values from PCI Capabilities
 	mov dl, 1
 	call os_bus_read		; Read register 1 for Status/Command
@@ -148,30 +175,6 @@ virtio_net_init_cap_end:
 	mov dl, [os_net_icount]
 	call net_virtio_reset
 
-	; Enable interrupts
-	pop rdx				; Restore packed bus address
-	mov al, 0xB0
-	call msix_init
-	jc virtio_net_init_no_int
-
-	; Create gate(s) in the IDT
-	push rdi
-	mov edi, 0xB0
-	mov rax, net_virtio_int
-	call create_gate
-	mov edi, 0xB1
-	mov rax, net_virtio_int
-	call create_gate
-;	mov edi, 0xB2
-;	mov rax, net_virtio_int
-;	call create_gate
-;	mov edi, 0xB3
-;	mov rax, net_virtio_int
-;	call create_gate
-	pop rdi
-
-virtio_net_init_no_int:
-
 	; Store call addresses
 	sub rdi, 0x28
 	mov eax, net_virtio_config
@@ -555,7 +558,7 @@ align 8
 net_virtio_int:
 	push rcx
 	push rax
-jmp $
+
 	; Clear pending interrupt (if set)
 	mov al, 0xab
 	call os_debug_dump_al