forked from KolibriOS/kolibrios
RTL8169: cleanup + link state detection.
Netstat: fixed some link state messages. git-svn-id: svn://kolibrios.org@5498 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr
parent
e687adb27e
commit
1f31c584e7
@ -249,12 +249,10 @@ struct device ETH_DEVICE
|
|||||||
mmio_addr dd ? ; memory map physical address
|
mmio_addr dd ? ; memory map physical address
|
||||||
pcfg dd ?
|
pcfg dd ?
|
||||||
mcfg dd ?
|
mcfg dd ?
|
||||||
|
|
||||||
cur_rx dd ? ; Index into the Rx descriptor buffer of next Rx pkt
|
cur_rx dd ? ; Index into the Rx descriptor buffer of next Rx pkt
|
||||||
cur_tx dd ? ; Index into the Tx descriptor buffer of next Rx pkt
|
cur_tx dd ? ; Index into the Tx descriptor buffer of next Rx pkt
|
||||||
TxDescArrays dd ? ; Index of Tx Descriptor buffer
|
last_tx dd ?
|
||||||
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
|
|
||||||
mac_version dd ?
|
mac_version dd ?
|
||||||
|
|
||||||
rb 0x100-($ and 0xff) ; align 256
|
rb 0x100-($ and 0xff) ; align 256
|
||||||
@ -663,14 +661,6 @@ reset:
|
|||||||
|
|
||||||
DEBUGF 1,"resetting\n"
|
DEBUGF 1,"resetting\n"
|
||||||
|
|
||||||
lea eax, [ebx + device.tx_ring]
|
|
||||||
mov [ebx + device.TxDescArrays], eax
|
|
||||||
mov [ebx + device.TxDescArray], eax
|
|
||||||
|
|
||||||
lea eax, [ebx + device.rx_ring]
|
|
||||||
mov [ebx + device.RxDescArrays], eax
|
|
||||||
mov [ebx + device.RxDescArray], eax
|
|
||||||
|
|
||||||
call init_ring
|
call init_ring
|
||||||
call hw_start
|
call hw_start
|
||||||
|
|
||||||
@ -682,9 +672,7 @@ reset:
|
|||||||
rep stosd
|
rep stosd
|
||||||
|
|
||||||
mov [ebx + device.mtu], 1500
|
mov [ebx + device.mtu], 1500
|
||||||
|
call detect_link
|
||||||
; Set link state to unknown
|
|
||||||
mov [ebx + device.state], ETH_LINK_UNKNOWN
|
|
||||||
|
|
||||||
DEBUGF 2,"init OK!\n"
|
DEBUGF 2,"init OK!\n"
|
||||||
xor eax, eax
|
xor eax, eax
|
||||||
@ -798,22 +786,23 @@ init_ring:
|
|||||||
xor eax, eax
|
xor eax, eax
|
||||||
mov [ebx + device.cur_rx], eax
|
mov [ebx + device.cur_rx], eax
|
||||||
mov [ebx + device.cur_tx], eax
|
mov [ebx + device.cur_tx], eax
|
||||||
|
mov [ebx + device.last_tx], eax
|
||||||
|
|
||||||
lea edi, [ebx + device.tx_ring]
|
lea edi, [ebx + device.tx_ring]
|
||||||
mov ecx, (NUM_TX_DESC * sizeof.tx_desc) / 4
|
mov ecx, (NUM_TX_DESC * sizeof.tx_desc) / 4 * 2
|
||||||
rep stosd
|
rep stosd
|
||||||
|
|
||||||
lea edi, [ebx + device.rx_ring]
|
lea edi, [ebx + device.rx_ring]
|
||||||
mov ecx, (NUM_RX_DESC * sizeof.rx_desc) / 4
|
mov ecx, (NUM_RX_DESC * sizeof.rx_desc) / 4
|
||||||
rep stosd
|
rep stosd
|
||||||
|
|
||||||
mov edi, [ebx + device.RxDescArray]
|
lea edi, [ebx + device.rx_ring]
|
||||||
mov ecx, NUM_RX_DESC
|
mov ecx, NUM_RX_DESC
|
||||||
.loop:
|
.loop:
|
||||||
push ecx
|
push ecx
|
||||||
invoke KernelAlloc, RX_BUF_SIZE
|
invoke KernelAlloc, RX_BUF_SIZE
|
||||||
mov dword [edi + rx_desc.buf_soft_addr], eax
|
mov dword [edi + rx_desc.buf_soft_addr], eax
|
||||||
invoke GetPgAddr
|
invoke GetPhysAddr
|
||||||
mov dword [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
|
mov [edi + rx_desc.status], DSB_OWNbit or RX_BUF_SIZE
|
||||||
add edi, sizeof.rx_desc
|
add edi, sizeof.rx_desc
|
||||||
@ -973,7 +962,8 @@ read_mac:
|
|||||||
mov ecx, 6
|
mov ecx, 6
|
||||||
|
|
||||||
; Get MAC address. FIXME: read EEPROM
|
; Get MAC address. FIXME: read EEPROM
|
||||||
@@: in al, dx
|
@@:
|
||||||
|
in al, dx
|
||||||
stosb
|
stosb
|
||||||
inc edx
|
inc edx
|
||||||
loop @r
|
loop @r
|
||||||
@ -1026,6 +1016,12 @@ proc transmit stdcall bufferptr, buffersize
|
|||||||
|
|
||||||
DEBUGF 1,"Using TX desc: %x\n", esi
|
DEBUGF 1,"Using TX desc: %x\n", esi
|
||||||
|
|
||||||
|
;----------------------------------
|
||||||
|
; Check if the descriptor is in use
|
||||||
|
|
||||||
|
test [esi + tx_desc.status], DSB_OWNbit
|
||||||
|
jnz .desc
|
||||||
|
|
||||||
;---------------------------
|
;---------------------------
|
||||||
; Program the packet pointer
|
; Program the packet pointer
|
||||||
|
|
||||||
@ -1038,11 +1034,13 @@ proc transmit stdcall bufferptr, buffersize
|
|||||||
; Program the packet size
|
; Program the packet size
|
||||||
|
|
||||||
mov eax, [buffersize]
|
mov eax, [buffersize]
|
||||||
@@: or eax, DSB_OWNbit or DSB_FSbit or DSB_LSbit
|
@@:
|
||||||
|
or eax, DSB_OWNbit or DSB_FSbit or DSB_LSbit
|
||||||
cmp [ebx + device.cur_tx], NUM_TX_DESC - 1
|
cmp [ebx + device.cur_tx], NUM_TX_DESC - 1
|
||||||
jne @f
|
jne @f
|
||||||
or eax, DSB_EORbit
|
or eax, DSB_EORbit
|
||||||
@@: mov [esi + tx_desc.status], eax
|
@@:
|
||||||
|
mov [esi + tx_desc.status], eax
|
||||||
|
|
||||||
;-----------------------------------------
|
;-----------------------------------------
|
||||||
; Set the polling bit (start transmission)
|
; Set the polling bit (start transmission)
|
||||||
@ -1070,6 +1068,8 @@ proc transmit stdcall bufferptr, buffersize
|
|||||||
xor eax, eax
|
xor eax, eax
|
||||||
ret
|
ret
|
||||||
|
|
||||||
|
.desc:
|
||||||
|
DEBUGF 2,"Descriptor is still in use!\n"
|
||||||
.fail:
|
.fail:
|
||||||
DEBUGF 2,"Transmit failed\n"
|
DEBUGF 2,"Transmit failed\n"
|
||||||
invoke KernelFree, [bufferptr]
|
invoke KernelFree, [bufferptr]
|
||||||
@ -1080,8 +1080,6 @@ proc transmit stdcall bufferptr, buffersize
|
|||||||
endp
|
endp
|
||||||
|
|
||||||
|
|
||||||
;;;DSB_OWNbit
|
|
||||||
|
|
||||||
|
|
||||||
;;;;;;;;;;;;;;;;;;;;;;;
|
;;;;;;;;;;;;;;;;;;;;;;;
|
||||||
;; ;;
|
;; ;;
|
||||||
@ -1108,6 +1106,9 @@ int_handler:
|
|||||||
set_io [ebx + device.io_addr], 0
|
set_io [ebx + device.io_addr], 0
|
||||||
set_io [ebx + device.io_addr], REG_IntrStatus
|
set_io [ebx + device.io_addr], REG_IntrStatus
|
||||||
in ax, dx
|
in ax, dx
|
||||||
|
out dx, ax ; ACK all interrupts
|
||||||
|
cmp ax, 0xffff ; if so, hardware is no longer present
|
||||||
|
je .nothing
|
||||||
test ax, ax
|
test ax, ax
|
||||||
jnz .got_it
|
jnz .got_it
|
||||||
.continue:
|
.continue:
|
||||||
@ -1121,15 +1122,10 @@ int_handler:
|
|||||||
ret ; If no device was found, abort (The irq was probably for a device, not registered to this driver)
|
ret ; If no device was found, abort (The irq was probably for a device, not registered to this driver)
|
||||||
|
|
||||||
.got_it:
|
.got_it:
|
||||||
|
|
||||||
DEBUGF 1,"Device: %x Status: %x\n", ebx, ax
|
DEBUGF 1,"Device: %x Status: %x\n", ebx, ax
|
||||||
|
|
||||||
cmp ax, 0xFFFF ; if so, hardware is no longer present
|
|
||||||
je .fail
|
|
||||||
|
|
||||||
;--------
|
;--------
|
||||||
; Receive
|
; Receive
|
||||||
|
|
||||||
test ax, ISB_RxOK
|
test ax, ISB_RxOK
|
||||||
jz .no_rx
|
jz .no_rx
|
||||||
|
|
||||||
@ -1145,7 +1141,7 @@ int_handler:
|
|||||||
DEBUGF 1,"RxDesc.status = 0x%x\n", [esi + rx_desc.status]
|
DEBUGF 1,"RxDesc.status = 0x%x\n", [esi + rx_desc.status]
|
||||||
mov eax, [esi + rx_desc.status]
|
mov eax, [esi + rx_desc.status]
|
||||||
test eax, DSB_OWNbit ;;;
|
test eax, DSB_OWNbit ;;;
|
||||||
jnz .rx_return
|
jnz .no_own
|
||||||
|
|
||||||
DEBUGF 1,"cur_rx = %u\n", [ebx + device.cur_rx]
|
DEBUGF 1,"cur_rx = %u\n", [ebx + device.cur_rx]
|
||||||
|
|
||||||
@ -1159,8 +1155,7 @@ int_handler:
|
|||||||
push eax
|
push eax
|
||||||
DEBUGF 1,"data length = %u\n", ax
|
DEBUGF 1,"data length = %u\n", ax
|
||||||
|
|
||||||
;-------------
|
; Update stats
|
||||||
; Update stats
|
|
||||||
|
|
||||||
add dword [ebx + device.bytes_rx], eax
|
add dword [ebx + device.bytes_rx], eax
|
||||||
adc dword [ebx + device.bytes_rx + 4], 0
|
adc dword [ebx + device.bytes_rx + 4], 0
|
||||||
@ -1168,16 +1163,14 @@ int_handler:
|
|||||||
|
|
||||||
pushd [esi + rx_desc.buf_soft_addr]
|
pushd [esi + rx_desc.buf_soft_addr]
|
||||||
|
|
||||||
;----------------------
|
; Allocate a new buffer
|
||||||
; Allocate a new buffer
|
|
||||||
|
|
||||||
invoke KernelAlloc, RX_BUF_SIZE
|
invoke KernelAlloc, RX_BUF_SIZE
|
||||||
mov [esi + rx_desc.buf_soft_addr], eax
|
mov [esi + rx_desc.buf_soft_addr], eax
|
||||||
invoke GetPhysAddr
|
invoke GetPhysAddr
|
||||||
mov dword [esi + rx_desc.buf_addr], eax
|
mov dword [esi + rx_desc.buf_addr], eax
|
||||||
|
|
||||||
;---------------
|
; reset OWN bit
|
||||||
; re set OWN bit
|
|
||||||
|
|
||||||
mov eax, DSB_OWNbit or RX_BUF_SIZE
|
mov eax, DSB_OWNbit or RX_BUF_SIZE
|
||||||
cmp [ebx + device.cur_rx], NUM_RX_DESC - 1
|
cmp [ebx + device.cur_rx], NUM_RX_DESC - 1
|
||||||
@ -1186,58 +1179,55 @@ int_handler:
|
|||||||
@@:
|
@@:
|
||||||
mov [esi + rx_desc.status], eax
|
mov [esi + rx_desc.status], eax
|
||||||
|
|
||||||
;--------------
|
; Update rx ptr
|
||||||
; Update rx ptr
|
|
||||||
|
|
||||||
inc [ebx + device.cur_rx]
|
inc [ebx + device.cur_rx]
|
||||||
and [ebx + device.cur_rx], NUM_RX_DESC - 1
|
and [ebx + device.cur_rx], NUM_RX_DESC - 1
|
||||||
|
|
||||||
jmp [Eth_input]
|
jmp [Eth_input]
|
||||||
.rx_return:
|
.rx_return:
|
||||||
|
DEBUGF 1,"RX error!\n"
|
||||||
|
.no_own:
|
||||||
pop ax
|
pop ax
|
||||||
.no_rx:
|
.no_rx:
|
||||||
|
|
||||||
;---------
|
;-----------------
|
||||||
; Transmit
|
; Transmit cleanup
|
||||||
|
|
||||||
test ax, ISB_TxOK
|
test ax, ISB_TxOK or ISB_TxErr or ISB_TxDescUnavail
|
||||||
jz .no_tx
|
jz .no_tx
|
||||||
push ax
|
|
||||||
|
|
||||||
DEBUGF 1,"TX ok!\n"
|
DEBUGF 1,"TX done!\n"
|
||||||
|
|
||||||
mov ecx, NUM_TX_DESC
|
|
||||||
lea esi, [ebx + device.tx_ring]
|
|
||||||
.txloop:
|
.txloop:
|
||||||
|
mov esi, [ebx + device.last_tx]
|
||||||
|
imul esi, sizeof.tx_desc
|
||||||
|
lea esi, [ebx + device.tx_ring + esi]
|
||||||
|
|
||||||
cmp dword [esi + tx_desc.buf_soft_addr], 0
|
cmp dword [esi + tx_desc.buf_soft_addr], 0
|
||||||
jz .maybenext
|
je .no_tx
|
||||||
|
|
||||||
test [esi + tx_desc.status], DSB_OWNbit
|
test [esi + tx_desc.status], DSB_OWNbit
|
||||||
jnz .maybenext
|
jnz .no_tx
|
||||||
|
|
||||||
push ecx
|
DEBUGF 1,"Freeing up TX desc: 0x%x\n", esi
|
||||||
DEBUGF 1,"Freeing up TX desc: %x\n", esi
|
DEBUGF 1,"buff: 0x%x\n", [esi + tx_desc.buf_soft_addr]
|
||||||
invoke KernelFree, [esi + tx_desc.buf_soft_addr]
|
push eax
|
||||||
pop ecx
|
push dword [esi + tx_desc.buf_soft_addr]
|
||||||
and dword [esi + tx_desc.buf_soft_addr], 0
|
and dword [esi + tx_desc.buf_soft_addr], 0
|
||||||
|
invoke KernelFree
|
||||||
|
pop eax
|
||||||
|
|
||||||
.maybenext:
|
inc [ebx + device.last_tx]
|
||||||
add esi, sizeof.tx_desc
|
and [ebx + device.last_tx], NUM_TX_DESC-1
|
||||||
dec ecx
|
jmp .txloop
|
||||||
jnz .txloop
|
|
||||||
|
|
||||||
pop ax
|
|
||||||
.no_tx:
|
.no_tx:
|
||||||
|
|
||||||
;-------
|
test ax, ISB_LinkChg
|
||||||
; Finish
|
jz .no_linkchange
|
||||||
|
DEBUGF 2, "Link change detected\n"
|
||||||
|
call detect_link
|
||||||
|
.no_linkchange:
|
||||||
|
|
||||||
set_io [ebx + device.io_addr], 0
|
|
||||||
set_io [ebx + device.io_addr], REG_IntrStatus
|
|
||||||
out dx, ax ; ACK all interrupts
|
|
||||||
|
|
||||||
.fail:
|
|
||||||
pop edi esi ebx
|
pop edi esi ebx
|
||||||
xor eax, eax
|
xor eax, eax
|
||||||
inc eax
|
inc eax
|
||||||
@ -1246,6 +1236,54 @@ int_handler:
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
align 4
|
||||||
|
detect_link:
|
||||||
|
|
||||||
|
set_io [ebx + device.io_addr], 0
|
||||||
|
|
||||||
|
; set_io [ebx + device.io_addr], REG_TBICSR
|
||||||
|
; in eax, dx
|
||||||
|
; test eax, TBI_LinkOK
|
||||||
|
; jz .down
|
||||||
|
|
||||||
|
; mov [ebx + device.state], ETH_LINK_UNKNOWN
|
||||||
|
; invoke NetLinkChanged
|
||||||
|
; ret
|
||||||
|
|
||||||
|
set_io [ebx + device.io_addr], REG_PHYstatus
|
||||||
|
in al, dx
|
||||||
|
test al, PHYS_LinkStatus
|
||||||
|
jz .down
|
||||||
|
DEBUGF 2, "Link is up, phystatus=0x%x\n", al
|
||||||
|
xor ecx, ecx
|
||||||
|
test al, PHYS_10bps
|
||||||
|
jz @f
|
||||||
|
or cl, ETH_LINK_10M
|
||||||
|
@@:
|
||||||
|
test al, PHYS_100bps
|
||||||
|
jz @f
|
||||||
|
or cl, ETH_LINK_100M
|
||||||
|
@@:
|
||||||
|
test al, PHYS_1000bpsF
|
||||||
|
jz @f
|
||||||
|
or cl, ETH_LINK_1G ;or ETH_LINK_FD
|
||||||
|
@@:
|
||||||
|
test al, PHYS_FullDup
|
||||||
|
jz @f
|
||||||
|
or cl, ETH_LINK_FD
|
||||||
|
@@:
|
||||||
|
mov [ebx + device.state], ecx
|
||||||
|
invoke NetLinkChanged
|
||||||
|
ret
|
||||||
|
|
||||||
|
.down:
|
||||||
|
DEBUGF 2, "Link is down\n"
|
||||||
|
mov [ebx + device.state], ETH_LINK_DOWN
|
||||||
|
invoke NetLinkChanged
|
||||||
|
ret
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
; End of code
|
; End of code
|
||||||
|
|
||||||
data fixups
|
data fixups
|
||||||
|
|||||||
@ -301,12 +301,12 @@ draw_stats:
|
|||||||
mov edx, str_100mfd
|
mov edx, str_100mfd
|
||||||
jmp .print_link
|
jmp .print_link
|
||||||
@@:
|
@@:
|
||||||
cmp al, 10000b
|
cmp al, 1100b
|
||||||
jnz @f
|
jnz @f
|
||||||
mov edx, str_1g
|
mov edx, str_1g
|
||||||
jmp .print_link
|
jmp .print_link
|
||||||
@@:
|
@@:
|
||||||
cmp al, 10010b
|
cmp al, 1110b
|
||||||
jnz @f
|
jnz @f
|
||||||
mov edx, str_1gfd
|
mov edx, str_1gfd
|
||||||
jmp .print_link
|
jmp .print_link
|
||||||
@ -842,14 +842,14 @@ str_dumped db 'Packets dumped:',0
|
|||||||
str_queued db 'Packets queued:',0
|
str_queued db 'Packets queued:',0
|
||||||
str_link db 'Link state:',0
|
str_link db 'Link state:',0
|
||||||
|
|
||||||
str_down db 'down', 0
|
str_down db 'disconnected ', 0
|
||||||
str_unknown db 'unknown', 0
|
str_unknown db 'unknown ', 0
|
||||||
str_10m db '10 Mbit Half duplex', 0
|
str_10m db '10 Mbit Half duplex ', 0
|
||||||
str_10mfd db '10 Mbit Full duplex', 0
|
str_10mfd db '10 Mbit Full duplex ', 0
|
||||||
str_100m db '100 Mbit Half duplex', 0
|
str_100m db '100 Mbit Half duplex', 0
|
||||||
str_100mfd db '100 Mbit Full duplex', 0
|
str_100mfd db '100 Mbit Full duplex', 0
|
||||||
str_1g db '1 Gbit Half duplex', 0
|
str_1g db '1 Gbit Half duplex ', 0
|
||||||
str_1gfd db '1 Gbit Full duplex', 0
|
str_1gfd db '1 Gbit Full duplex ', 0
|
||||||
|
|
||||||
str_ARP_legend db 'IP-address MAC-address Status TTL', 0
|
str_ARP_legend db 'IP-address MAC-address Status TTL', 0
|
||||||
str_ARP_entry db ' . . . - - - - -', 0
|
str_ARP_entry db ' . . . - - - - -', 0
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user