XenOn/kolibrios-fun
1
1
Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Wiki Activity

RTL8169: RX overrun fixed

Browse Source 
git-svn-id: svn://kolibrios.org@8997 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
hidnplayr 2021-07-04 17:43:16 +00:00
parent 861d24c21a
commit 28a3191504
1 changed files with 67 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
drivers/ethernet/RTL8169.asm
View File

@ -1,6 +1,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;; ;; ;;
;; Copyright (C) KolibriOS team 2004-2018. All rights reserved. ;; ;; Copyright (C) KolibriOS team 2004-2021. All rights reserved. ;;
;; Distributed under terms of the GNU General Public License ;; ;; Distributed under terms of the GNU General Public License ;;
;; ;; ;; ;;
;; RTL8169 driver for KolibriOS ;; ;; RTL8169 driver for KolibriOS ;;
@ -25,13 +25,17 @@ entry START
COMPATIBLE_API = 0x0100 COMPATIBLE_API = 0x0100
API_VERSION = (COMPATIBLE_API shl 16) + CURRENT_API API_VERSION = (COMPATIBLE_API shl 16) + CURRENT_API
MAX_DEVICES = 16 ; configureable area
__DEBUG__ = 1 MAX_DEVICES = 16 ; Maximum number of devices this driver may handle
__DEBUG__ = 1 ; 1 = on, 0 = off
__DEBUG_LEVEL__ = 2 ; 1 = verbose, 2 = errors only __DEBUG_LEVEL__ = 2 ; 1 = verbose, 2 = errors only
NUM_TX_DESC = 4 NUM_TX_DESC = 32 ; Number of packets in send ring buffer
NUM_RX_DESC = 4 NUM_RX_DESC = 32 ; Number of packets in receive ring buffer
; end configureable area
section '.flat' readable writable executable section '.flat' readable writable executable
@ -41,6 +45,16 @@ include '../macros.inc'
include '../fdo.inc' include '../fdo.inc'
include '../netdrv.inc' include '../netdrv.inc'
if (bsr NUM_TX_DESC)>(bsf NUM_TX_DESC)
display 'NUM_TX_DESC must be a power of two'
err
end if
if (bsr NUM_RX_DESC)>(bsf NUM_RX_DESC)
display 'NUM_RX_DESC must be a power of two'
err
end if
REG_MAC0 = 0x0 ; Ethernet hardware address REG_MAC0 = 0x0 ; Ethernet hardware address
REG_MAR0 = 0x8 ; Multicast filter REG_MAR0 = 0x8 ; Multicast filter
REG_TxDescStartAddr = 0x20 REG_TxDescStartAddr = 0x20
@ -90,10 +104,12 @@ include '../netdrv.inc'
ISB_RxOK = 0x01 ISB_RxOK = 0x01
; RxStatusDesc ; RxStatusDesc
SD_RxRES = 0x00200000 SD_RxBOVF = (1 shl 24)
SD_RxCRC = 0x00080000 SD_RxFOVF = (1 shl 23)
SD_RxRUNT = 0x00100000 SD_RxRWT = (1 shl 22)
SD_RxRWT = 0x00400000 SD_RxRES = (1 shl 21)
SD_RxRUNT = (1 shl 20)
SD_RxCRC = (1 shl 19)
; ChipCmdBits ; ChipCmdBits
CMD_Reset = 0x10 CMD_Reset = 0x10
@ -1030,9 +1046,9 @@ proc transmit stdcall bufferptr
[eax+13]:2,[eax+12]:2 [eax+13]:2,[eax+12]:2
cmp [esi + NET_BUFF.length], 1514 cmp [esi + NET_BUFF.length], 1514
ja .fail ja .error
cmp [esi + NET_BUFF.length], 60 cmp [esi + NET_BUFF.length], 60
jb .fail jb .error
;---------------------------------- ;----------------------------------
; Find currentTX descriptor address ; Find currentTX descriptor address
@ -1047,7 +1063,7 @@ proc transmit stdcall bufferptr
; Check if the descriptor is in use ; Check if the descriptor is in use
test [esi + tx_desc.status], DSB_OWNbit test [esi + tx_desc.status], DSB_OWNbit
jnz .desc jnz .overrun
;--------------------------- ;---------------------------
; Program the packet pointer ; Program the packet pointer
@ -1095,11 +1111,20 @@ proc transmit stdcall bufferptr
xor eax, eax xor eax, eax
ret ret
.desc: .error:
DEBUGF 2,"Descriptor is still in use!\n" DEBUGF 2, "TX packet error\n"
.fail: inc [ebx + device.packets_tx_err]
DEBUGF 2,"Transmit failed\n"
invoke NetFree, [bufferptr] invoke NetFree, [bufferptr]
popf
or eax, -1
ret
.overrun:
DEBUGF 2, "TX overrun\n"
inc [ebx + device.packets_tx_ovr]
invoke NetFree, [bufferptr]
popf popf
or eax, -1 or eax, -1
ret ret
@ -1168,11 +1193,12 @@ 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 ecx, [esi + rx_desc.status] mov ecx, [esi + rx_desc.status]
test ecx, DSB_OWNbit test ecx, DSB_OWNbit
jnz .rx_return jnz .rx_done
DEBUGF 1,"cur_rx = %u\n", [ebx + device.cur_rx] DEBUGF 1,"cur_rx = %u\n", [ebx + device.cur_rx]
test ecx, SD_RxRES test ecx, SD_RxRES
jnz .rx_reuse jnz .rx_error
push ebx push ebx
push .rx_loop push .rx_loop
@ -1198,7 +1224,7 @@ int_handler:
mov [esi + rx_desc.status], 0 mov [esi + rx_desc.status], 0
invoke NetAlloc, RX_BUF_SIZE+NET_BUFF.data invoke NetAlloc, RX_BUF_SIZE+NET_BUFF.data
test eax, eax test eax, eax
jz .no_more_buffers jz .rx_overrun
mov [esi + rx_desc.buf_soft_addr], eax mov [esi + rx_desc.buf_soft_addr], eax
invoke GetPhysAddr invoke GetPhysAddr
add eax, NET_BUFF.data add eax, NET_BUFF.data
@ -1214,7 +1240,6 @@ int_handler:
@@: @@:
mov [esi + rx_desc.status], eax mov [esi + rx_desc.status], eax
.no_more_buffers:
;-------------- ;--------------
; Update rx ptr ; Update rx ptr
@ -1223,7 +1248,27 @@ int_handler:
jmp [EthInput] jmp [EthInput]
.rx_reuse: .rx_overrun:
DEBUGF 2,"RX FIFO overrun\n"
inc [ebx + device.packets_rx_ovr]
jmp .rx_next
.rx_error:
inc [ebx + device.packets_rx_err]
test ecx, SD_RxRWT or SD_RxRUNT
jz @f
DEBUGF 2,"RX length error"
@@:
test ecx, SD_RxCRC
jz @f
DEBUGF 2,"RX CRC error"
@@:
test ecx, SD_RxFOVF
jz @f
DEBUGF 2,"RX FIFO error"
@@:
.rx_next:
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
jne @f jne @f
@ -1233,7 +1278,7 @@ int_handler:
push ebx push ebx
jmp .rx_loop jmp .rx_loop
.rx_return: .rx_done:
pop ax pop ax
.no_rx: .no_rx: