Network cleanup

- Start on virtio-net rework
- Disable r8169 for now
- Enable per interface send lock
- Remove obsolete system variables

Author: Ian Seyler

src/drivers.asm

@@ -29,7 +29,7 @@
 %include "drivers/net/i8254x.asm"
 %include "drivers/net/i8257x.asm"
 %include "drivers/net/i8259x.asm"
-%include "drivers/net/r8169.asm"
+; %include "drivers/net/r8169.asm"
 %include "drivers/net/virtio-net.asm"
 
 ; Video
@@ -129,13 +129,13 @@ dw 0x1572		; X710 (SFP+)
 dw 0x0000
 
 ; Realtek 816x/811x Gigabit Ethernet
-dw 0x8169		; Driver ID
-dw 0x10EC		; Vendor ID
-dw 0x8161		; 8111/8168/8411 PCI Express
-dw 0x8167		; 8110SC/8169SC
-dw 0x8168		; 8111/8168/8211/8411 PCI Express
-dw 0x8169		; 8169
-dw 0x0000
+;dw 0x8169		; Driver ID
+;dw 0x10EC		; Vendor ID
+;dw 0x8161		; 8111/8168/8411 PCI Express
+;dw 0x8167		; 8110SC/8169SC
+;dw 0x8168		; 8111/8168/8211/8411 PCI Express
+;dw 0x8169		; 8169
+;dw 0x0000
 
 ; End of list
 dw 0x0000

src/drivers/net/r8169.asm

@@ -15,11 +15,22 @@ net_r8169_init:
 	push rcx
 	push rax
 
+	mov rdi, net_table
+	xor eax, eax
+	mov al, [os_net_icount]
+	shl eax, 7			; Quick multiply by 128
+	add rdi, rax
+
+	mov ax, 0x8169			; Driver tag for r8169
+	stosw
+	add rdi, 14
+
 	; Get the Base I/O Address of the device
 	mov dl, 0x04			; BAR0
 	call os_bus_read
 	and eax, 0xFFFFFFFC		; EAX now holds the Base IO Address (clear the low 2 bits)
-	mov word [os_NetIOAddress], ax
+	stosq				; Save the base
+	push rdx
 
 	; Set PCI Status/Command values
 	mov dl, 0x01			; Read Status/Command
@@ -30,28 +41,51 @@ net_r8169_init:
 	call os_bus_write		; Write updated Status/Command
 
 	; Get the MAC address
-	mov dx, word [os_NetIOAddress]
+	pop rdx
+	sub rdi, 16
 	in al, dx
-	mov [os_NetMAC], al
+	stosb
 	inc dx
 	in al, dx
-	mov [os_NetMAC+1], al
+	stosb
 	inc dx
 	in al, dx
-	mov [os_NetMAC+2], al
+	stosb
 	inc dx
 	in al, dx
-	mov [os_NetMAC+3], al
+	stosb
 	inc dx
 	in al, dx
-	mov [os_NetMAC+4], al
+	stosb
 	inc dx
 	in al, dx
-	mov [os_NetMAC+5], al
+	stosb
+
+	; Set base addresses for TX and RX descriptors
+	xor ecx, ecx
+	mov cl, byte [os_net_icount]
+	shl ecx, 15
+
+	add rdi, 0x22
+	mov rax, os_tx_desc
+	add rax, rcx
+	stosq
+	mov rax, os_rx_desc
+	add rax, rcx
+	stosq
 
 	; Reset the device
+	xor edx, edx
+	mov dl, [os_net_icount]
 	call net_r8169_reset
 
+	; Store call addresses
+	sub rdi, 0x20
+	mov rax, net_r8169_transmit
+	stosq
+	mov rax, net_r8169_poll
+	stosq
+
 	pop rax
 	pop rcx
 	pop rdx
@@ -61,7 +95,7 @@ net_r8169_init:
 
 
 ; -----------------------------------------------------------------------------
-; os_net_rtl8136_reset - Reset a Realtek 8169 NIC
+; os_net_r8169_reset - Reset a Realtek 8169 NIC
 ;  IN:	Nothing
 ; OUT:	Nothing, all registers preserved
 net_r8169_reset:

src/drivers/net/virtio-net.asm

@@ -10,17 +10,31 @@
 ; Initialize a Virtio NIC
 ;  IN:	RDX = Packed Bus address (as per syscalls/bus.asm)
 net_virtio_init:
+	push rdi
 	push rsi
 	push rdx
 	push rcx
 	push rbx
 	push rax
 
+	mov rdi, net_table
+	xor eax, eax
+	mov al, [os_net_icount]
+	shl eax, 7			; Quick multiply by 128
+	add rdi, rax
+
+	mov ax, 0x1AF4			; Driver tag for virtio-net
+	stosw
+	push rdi			; Used in msi-x init
+	add rdi, 14
+
 	; Get the Base Memory Address of the device
 	mov al, 4			; Read BAR4
 	call os_bus_read_bar
-	mov [os_NetIOBaseMem], rax	; Save it as the base
-	mov [os_NetIOLength], rcx	; Save the length
+	stosq				; Save the base
+	push rax			; Save the base for gathering the MAC later
+	mov rax, rcx
+	stosq				; Save the length
 
 	; Set PCI Status/Command values
 	mov dl, 0x01			; Read Status/Command
@@ -159,36 +173,51 @@ virtio_net_init_cap_next_offset:
 virtio_net_init_cap_end:
 
 	; Get the MAC address
-	mov rsi, [os_NetIOBaseMem]
+	pop rsi				; Pushed as RAX
+	pop rdi
+	add rdi, 6			; nt_MAC
 	add rsi, [virtio_net_device_offset]
-	lodsb
-	mov [os_NetMAC], al
-	lodsb
-	mov [os_NetMAC+1], al
-	lodsb
-	mov [os_NetMAC+2], al
-	lodsb
-	mov [os_NetMAC+3], al
-	lodsb
-	mov [os_NetMAC+4], al
-	lodsb
-	mov [os_NetMAC+5], al
+	mov ecx, 6
+	rep movsb
+
+	; Set base addresses for TX and RX descriptors
+	xor ecx, ecx
+	mov cl, byte [os_net_icount]
+	shl ecx, 15
+	add rdi, 0x22
+	mov rax, os_tx_desc
+	add rax, rcx
+	stosq
+	mov rax, os_rx_desc
+	add rax, rcx
+	stosq
 
+	; Reset the device
+	xor edx, edx
+	mov dl, [os_net_icount]
 	call net_virtio_reset
 
+	; Store call addresses
+	sub rdi, 0x20
+	mov rax, net_virtio_transmit
+	stosq
+	mov rax, net_virtio_poll
+	stosq
+
 virtio_net_init_error:
 	pop rax
 	pop rbx
 	pop rcx
 	pop rdx
 	pop rsi
+	pop rdi
 	ret
 ; -----------------------------------------------------------------------------
 
 
 ; -----------------------------------------------------------------------------
 ; net_virtio_reset - Reset a Virtio NIC
-;  IN:	Nothing
+;  IN:	RDX = Interface ID
 ; OUT:	Nothing, all registers preserved
 net_virtio_reset:
 	push rdi
@@ -198,7 +227,15 @@ net_virtio_reset:
 
 	; Device Initialization (section 3.1)
 
-	mov rsi, [os_NetIOBaseMem]
+	; Gather Base Address from net_table
+	mov rsi, net_table
+	xor eax, eax
+	mov al, [os_net_icount]
+	shl eax, 7			; Quick multiply by 128
+	add rsi, rax
+	add rsi, 16
+	mov rsi, [rsi]
+	mov rdi, rsi
 
 	; 3.1.1 - Step 1 -  Reset the device (section 2.4)
 	mov al, 0x00			
@@ -211,7 +248,7 @@ virtio_net_init_reset_wait:
 	; 3.1.1 - Step 2 - Tell the device we see it
 	mov al, VIRTIO_STATUS_ACKNOWLEDGE
 	mov [rsi+VIRTIO_DEVICE_STATUS], al
-	
+
 	; 3.1.1 - Step 3 - Tell the device we support it
 	mov al, VIRTIO_STATUS_ACKNOWLEDGE | VIRTIO_STATUS_DRIVER
 	mov [rsi+VIRTIO_DEVICE_STATUS], al
@@ -244,7 +281,7 @@ virtio_net_init_reset_wait:
 	; 3.1.1 - Step 5
 	mov al, VIRTIO_STATUS_ACKNOWLEDGE | VIRTIO_STATUS_DRIVER | VIRTIO_STATUS_FEATURES_OK
 	mov [rsi+VIRTIO_DEVICE_STATUS], al
-	
+
 	; 3.1.1 - Step 6 - Re-read device status to make sure FEATURES_OK is still set
 	mov al, [rsi+VIRTIO_DEVICE_STATUS]
 	bt ax, 3			; VIRTIO_STATUS_FEATURES_OK
@@ -260,7 +297,7 @@ virtio_net_init_reset_wait:
 	mov ax, 0x0000
 	mov [rsi+VIRTIO_CONFIG_MSIX_VECTOR], ax
 
-	; Set up Queue 0
+	; Set up Queue 0 (Receive)
 	xor eax, eax
 	mov [rsi+VIRTIO_QUEUE_SELECT], ax
 	mov ax, [rsi+VIRTIO_QUEUE_SIZE]	; Return the size of the queue
@@ -286,7 +323,7 @@ virtio_net_init_reset_wait:
 	mov ax, 1
 	mov [rsi+VIRTIO_QUEUE_ENABLE], ax
 
-	; Set up Queue 1
+	; Set up Queue 1 (Transmit)
 	mov eax, 1
 	mov [rsi+VIRTIO_QUEUE_SELECT], ax
 	mov ax, [rsi+VIRTIO_QUEUE_SIZE]	; Return the size of the queue
@@ -360,6 +397,7 @@ virtio_net_init_pop:
 ; -----------------------------------------------------------------------------
 ; net_virtio_transmit - Transmit a packet via a Virtio NIC
 ;  IN:	RSI = Location of packet
+;	RDX = Interface ID
 ;	RCX = Length of packet
 ; OUT:	Nothing
 net_virtio_transmit:
@@ -394,7 +432,7 @@ net_virtio_transmit:
 	stosw				; 16-bit ring
 
 	; Notify the queue
-	mov rdi, [os_NetIOBaseMem]
+	mov rdi, [rdx+nt_base]	; Transmit Descriptor Base Address
 	add rdi, [virtio_net_notify_offset]
 	add rdi, 4
 	xor eax, eax
@@ -422,6 +460,7 @@ net_virtio_transmit_wait:
 ; -----------------------------------------------------------------------------
 ; net_virtio_poll - Polls the Virtio NIC for a received packet
 ;  IN:	RDI = Location to store packet
+;	RDX = Interface ID
 ; OUT:	RCX = Length of packet
 net_virtio_poll:
 	push rdi

src/init/net.asm

@@ -55,8 +55,8 @@ init_net_probe_found:
 	je init_net_probe_found_i8257x
 	cmp bx, 0x8259
 	je init_net_probe_found_i8259x
-	cmp bx, 0x8169
-	je init_net_probe_found_r8169
+;	cmp bx, 0x8169
+;	je init_net_probe_found_r8169
 	jmp init_net_probe_not_found
 
 init_net_probe_found_virtio:
@@ -75,9 +75,9 @@ init_net_probe_found_i8259x:
 	call net_i8259x_init
 	jmp init_net_probe_found_finish
 
-init_net_probe_found_r8169:
-	call net_r8169_init
-	jmp init_net_probe_found_finish
+;init_net_probe_found_r8169:
+;	call net_r8169_init
+;	jmp init_net_probe_found_finish
 
 init_net_probe_found_finish:
 	mov byte [os_NetEnabled], 1	; A supported NIC was found. Signal to the OS that networking is enabled

src/syscalls/net.asm

@@ -61,8 +61,9 @@ b_net_tx_maxcheck:
 	cmp rcx, 1522			; Fail if more than 1522 bytes
 	ja b_net_tx_fail
 
-; TODO - This should be per interface
-	mov rax, os_NetLock		; Lock the net so only one send can happen at a time
+	; Lock the network interface so only one send can happen at a time
+	mov rax, rdx
+	add rax, nt_lock
 	call b_smp_lock
 
 	; Calculate where in physical memory the data should be read from
@@ -77,8 +78,9 @@ b_net_tx_maxcheck:
 	inc qword [rdx+nt_tx_packets]		; Increment TXPackets
 	add qword [rdx+nt_tx_bytes], rcx	; Increment TXBytes
 
-; TODO - This should be per interface
-	mov rax, os_NetLock
+	; Unlock the network interface
+	mov rax, rdx
+	add rax, nt_lock
 	call b_smp_unlock
 
 b_net_tx_fail:

src/sysvar.asm

@@ -66,8 +66,6 @@ os_LocalAPICAddress:	equ os_SystemVariables + 0x0000
 os_IOAPICAddress:	equ os_SystemVariables + 0x0008
 os_SysConfEn:		equ os_SystemVariables + 0x0010	; Enabled bits: 0=PS/2 Keyboard, 1=PS/2 Mouse, 2=Serial, 4=HPET, 5=xHCI
 os_StackBase:		equ os_SystemVariables + 0x0020
-os_NetIOBaseMem:	equ os_SystemVariables + 0x0040
-os_NetMAC:		equ os_SystemVariables + 0x0048
 os_HPET_Address:	equ os_SystemVariables + 0x0050
 os_AHCI_Base:		equ os_SystemVariables + 0x0058
 os_NetworkCallback:	equ os_SystemVariables + 0x0060
@@ -78,7 +76,6 @@ os_nvs_io:		equ os_SystemVariables + 0x00B0
 os_nvs_id:		equ os_SystemVariables + 0x00B8
 os_screen_lfb:		equ os_SystemVariables + 0x00C0
 os_virtioblk_base:	equ os_SystemVariables + 0x00C8
-os_NetIOLength:		equ os_SystemVariables + 0x00D0
 os_MouseCallback:	equ os_SystemVariables + 0x00D8
 os_xHCI_Base:		equ os_SystemVariables + 0x00E0
 os_usb_evtoken:		equ os_SystemVariables + 0x00E8
@@ -98,8 +95,6 @@ os_xhci_int0_count:	equ os_SystemVariables + 0x011C	; Incremented on xHCI Interr
 ; DW - Starting at offset 512, increments by 2
 os_NumCores:		equ os_SystemVariables + 0x0200
 os_CoreSpeed:		equ os_SystemVariables + 0x0202
-os_NetIOAddress:	equ os_SystemVariables + 0x0204
-os_NetLock:		equ os_SystemVariables + 0x0206
 os_nvsVar:		equ os_SystemVariables + 0x0208	; Bit 0 for NVMe, 1 for AHCI, 2 for ATA, 3 for Virtio Block
 os_screen_x:		equ os_SystemVariables + 0x020A
 os_screen_y:		equ os_SystemVariables + 0x020C
@@ -155,6 +150,7 @@ os_PacketBuffers:	equ os_SystemVariables + 0xC000	; 16KiB
 
 ; net_table values (per device - 128 bytes)
 nt_ID:			equ 0x00 ; 16-bit
+nt_lock:		equ 0x02 ; 16-bit
 nt_MAC:			equ 0x08 ; 48-bit
 nt_base:		equ 0x10 ; 64-bit
 nt_len:			equ 0x18 ; 64-bit