WebSVN – Kolibri OS – Diff – /kernel/branches/net/drivers/RTL8169.asm

 PCFG_METHOD_1	    equ 0x01	; PHY Reg 0x03 bit0-3 == 0x0000
 PCFG_METHOD_2	    equ 0x02	; PHY Reg 0x03 bit0-3 == 0x0001
-PCFG_METHOD_3	    equ 0x03	; PHY Reg 0x03 bit0-3 == 0x0002
-PCI_COMMAND_IO		equ 0x1   ; Enable response in I/O space
-PCI_COMMAND_MEM 	equ 0x2   ; Enable response in mem space
-PCI_COMMAND_MASTER	equ 0x4   ; Enable bus mastering
-PCI_LATENCY_TIMER	equ 0x0d  ; 8 bits
-PCI_COMMAND_SPECIAL	equ 0x8   ; Enable response to special cycles
-PCI_COMMAND_INVALIDATE	equ 0x10  ; Use memory write and invalidate
-PCI_COMMAND_VGA_PALETTE equ 0x20  ; Enable palette snooping
-PCI_COMMAND_PARITY	equ 0x40  ; Enable parity checking
-PCI_COMMAND_WAIT	equ 0x80  ; Enable address/data stepping
-PCI_COMMAND_SERR	equ 0x100 ; Enable SERR
-PCI_COMMAND_FAST_BACK	equ 0x200 ; Enable back-to-back writes
+PCFG_METHOD_3	    equ 0x03	; PHY Reg 0x03 bit0-3 == 0x0002
 virtual at 0
   tx_desc:
   .status    dd ?
-  .vlan_tag  dd ?
-  .buf_addr  dd ?
+  .vlan_tag  dd ?
+  .buf_addr  dq ?
+  .size = $
-  .buf_Haddr dd ?
+  rb	(NUM_TX_DESC-1)*tx_desc.size
-  .size = $
+  .buf_soft_addr	dd ?
 end virtual
 virtual at 0
   rx_desc:
-  .status    dd ?
-  .vlan_tag  dd ?
+  .status    dd ?
+  .vlan_tag  dd ?
+  .buf_addr  dq ?
-  .buf_addr  dd ?
+  .size = $
-  .buf_Haddr dd ?
+  rb	(NUM_RX_DESC-1)*rx_desc.size
-  .size = $
+  .buf_soft_addr	dd ?
 	.TxDescArrays	dd ? ; Index of Tx Descriptor buffer
 	.RxDescArrays	dd ? ; Index of Rx Descriptor buffer
 	.TxDescArray	dd ? ; Index of 256-alignment Tx Descriptor buffer
 	.RxDescArray	dd ? ; Index of 256-alignment Rx Descriptor buffer
-	rb 255-(($ - ebx) and 255)		;        align 256
+	rb 256-(($ - device) and 255)		   ;        align 256
-	tx_ring rb NUM_TX_DESC * tx_desc.size
+	tx_ring rb NUM_TX_DESC * tx_desc.size * 2
-	rb 255-(($ - ebx) and 255)		;        align 256
+	rb 256-(($ - device) and 255)		   ;        align 256
-	rx_ring rb NUM_RX_DESC * rx_desc.size
+	rx_ring rb NUM_RX_DESC * rx_desc.size * 2
 macro	READ_GMII_REG  RegAddr {
 local	.error, .done
+local	.error, .done
-	mov	eax, RegAddr shl 16
+	set_io	REG_PHYAR
-	set_io	REG_PHYAR
+	mov	eax, RegAddr shl 16
-	in	eax, dx
 	out	dx, eax
 	call	PHY_WAIT
-	jz	.error
+	call	PHY_WAIT
 	jz	.error
 	udelay	1	 ;;;1000
 	push	ecx
 	mov	ecx, 2000
-	; Check if the RTL8169 has completed writing to the specified MII register
+	; Check if the RTL8169 has completed writing/reading to the specified MII register
     @@:
 	in	eax, dx
 	test	eax, 0x80000000
 ; This device doesnt have its own eth_device structure yet, lets create one
   .firstdevice:
 	cmp	[devices], MAX_DEVICES			; First check if the driver can handle one more card
 	jge	.fail
-	push	edx
-	stdcall KernelAlloc, device_size		; Allocate the buffer for eth_device structure
-	pop	edx
-	test	eax, eax
-	jz	.fail
-	mov	ebx, eax				; ebx is always used as a pointer to the structure (in driver, but also in kernel code)
+	allocate_and_clear ebx, device_size, .fail	; Allocate memory to put the device structure in
 ; Fill in the direct call addresses into the struct
 	udelay	100
 	mov	ecx, 10000
 	; wait for auto-negotiation process
     @@: dec	ecx
 	jz	@f
+	set_io	0
 	READ_GMII_REG PHY_STAT_REG
 	udelay	100
 	test	eax, PHY_Auto_Neco_Comp
 	jz	@b
-	set_io	0
 	set_io	REG_PHYstatus
 	in	al, dx
 	jmp	@f
   .tbi_dis:
 	udelay	100
 	call	hw_start
 	mov	[device.mtu], 1500
 	xor	eax, eax
 	DEBUGF	1,"hw_PHY_config: priv.mcfg=%d, priv.pcfg=%d\n",[tpc.mcfg],[tpc.pcfg]
+	cmp	[tpc.mcfg], MCFG_METHOD_04
-	cmp	[tpc.mcfg], MCFG_METHOD_04
+	jne	.not_4
-	jne	.not_4
+	set_io	0
 ;       WRITE_GMII_REG 0x1F, 0x0001
 ;       WRITE_GMII_REG 0x1b, 0x841e
 ;       WRITE_GMII_REG 0x0e, 0x7bfb
   .not_4:
 	cmp	[tpc.mcfg], MCFG_METHOD_02
 	je	@f
 	cmp	[tpc.mcfg], MCFG_METHOD_03
 	jne	.not_2_or_3
+    @@:
+	set_io	0
-    @@: WRITE_GMII_REG 0x1F, 0x0001
+	WRITE_GMII_REG 0x1F, 0x0001
 	WRITE_GMII_REG 0x15, 0x1000
 	WRITE_GMII_REG 0x18, 0x65C7
 	WRITE_GMII_REG 0x04, 0x0000
 	WRITE_GMII_REG 0x03, 0x00A1
 	WRITE_GMII_REG 0x02, 0x0008
 	mov	ecx, (NUM_RX_DESC * rx_desc.size) / 4
 	rep	stosd
 	mov	edi, [tpc.RxDescArray]
 	mov	ecx, NUM_RX_DESC
+  .loop:
-    @@:
+	push	ecx
-	stdcall KernelAlloc, 2048
+	stdcall KernelAlloc, RX_BUF_SIZE
-	mov	[edi + rx_desc.buf_Haddr], eax
+	mov	[edi + rx_desc.buf_soft_addr], eax
-	GetRealAddr
+	call	GetPgAddr
-	mov	[edi + rx_desc.buf_addr], eax
+	mov	dword [edi + rx_desc.buf_addr], eax
 	mov	[edi + rx_desc.status], DSB_OWNbit or RX_BUF_SIZE
+	add	edi, rx_desc.size
-	add	edi, rx_desc.size
+	pop	ecx
-	loop	@b
+	loop	.loop
 	or	[edi - rx_desc.size + rx_desc.status], DSB_EORbit
 	set_io	REG_RxMissed
 	out	dx, eax
+	call	set_rx_mode
 	call	set_rx_mode
 	set_io	0
 	; no early-rx interrupts
 	set_io	REG_MultiIntr
 	in	ax, dx
 read_mac:
 	set_io	0
 	set_io	REG_MAC0
 	xor	ecx, ecx
-	lea	esi, [device.mac]
+	lea	edi, [device.mac]
 	mov	ecx, MAC_ADDR_LEN
 	; Get MAC address. FIXME: read EEPROM
 	lea	esi, [eax + tx_ring]
 ;---------------------------
 ; Program the packet pointer
-	mov	eax, [esp]
+	mov	eax, [esp + 4]
-	mov	[esi + tx_desc.buf_Haddr], eax
+	mov	[esi + tx_desc.buf_soft_addr], eax
 	GetRealAddr
-	mov	[esi + tx_desc.buf_addr], eax
+	mov	dword [esi + tx_desc.buf_addr], eax
 ;------------------------
 ; Program the packet size
-	mov	eax, [esp + 4]
+	mov	eax, [esp + 8]
     @@: or	eax, DSB_OWNbit or DSB_FSbit or DSB_LSbit
 ;-----------------------
 ; Update TX descriptor
 	inc	[tpc.cur_tx]
-	and	[tpc.cur_tx], NUM_TX_DESC - 1
 	and	[tpc.cur_tx], NUM_TX_DESC - 1
 	ret	8
   .fail:
 	jz	.fail
 	mov	esi, device_list
   .nextdevice:
 	mov	ebx, dword [esi]
 	set_io	0
 	set_io	REG_IntrStatus
 	in	ax, dx
 	mul	[tpc.cur_rx]
 	lea	esi, [eax + rx_ring]
 	DEBUGF	1,"RxDesc.status = 0x%x\n", [esi + rx_desc.status]
 	mov	eax, [esi + rx_desc.status]
-	test	[esi + rx_desc.status], DSB_OWNbit
+	test	eax, DSB_OWNbit ;;;
 	jnz	.rx_return
 	and	eax, 0x00001FFF
 	add	eax, -4 			; we dont need CRC
 	push	eax
 	DEBUGF	1,"data length = %u\n", ax
+	push	[esi + rx_desc.buf_soft_addr]
+;----------------------
+; Allocate a new buffer
+	stdcall KernelAlloc, RX_BUF_SIZE
+	mov	[esi + rx_desc.buf_soft_addr], eax
+	GetRealAddr
-	push	[esi + rx_desc.buf_Haddr]
+	mov	dword [esi + rx_desc.buf_addr], eax
 ;---------------
 ; re set OWN bit
 	mov	eax, DSB_OWNbit or RX_BUF_SIZE
 	cmp	[tpc.cur_rx], NUM_RX_DESC - 1
-	jne	@f
-	or	eax, DSB_EORbit
-    @@: mov	[esi + rx_desc.status], eax
-;----------------------
-; Allocate a new buffer
-	stdcall KernelAlloc, RX_BUF_SIZE
-	mov	[esi + rx_desc.buf_Haddr], eax
+	jne	@f
-	GetRealAddr
+	or	eax, DSB_EORbit
-	sub	[esi + rx_desc.buf_addr], eax
+    @@: mov	[esi + rx_desc.status], eax

Subversion Repositories Kolibri OS

(root)/kernel/branches/net/drivers/RTL8169.asm – Rev 1556 → 1557