sebastianting/kolibrios
1
0 Fork 0
forked from KolibriOS/kolibrios
Code Pull Requests Activity

RTL8169: enable gigabit and restart auto-negotiation on init (#440)

Browse Source 
Fix bug in enabling gigabit and restart auto-negotiation setup for most RTL8169/RTL8168/RTL8111

Reviewed-on: KolibriOS/kolibrios#440
This commit is contained in:
hidnplayr committed 2026-05-15 17:03:16 +00:00
1 parent 641603693f
commit 8235572f7b
1 file changed
+13 -6
Download Patch File Download Diff File Expand all files Collapse all files
drivers/ethernet/RTL8169.asm
+13 -6
View File
@@ -1,6 +1,6 @@
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; ;; ;; ;;
;; Copyright (C) KolibriOS team 2004-2024. All rights reserved. ;; ;; Copyright (C) KolibriOS team 2004-2026. 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 ;;
@@ -583,10 +583,7 @@ init_board:
mov ecx, [esi+12] mov ecx, [esi+12]
mov [ebx + device.name], ecx mov [ebx + device.name], ecx
DEBUGF 2, "Detected chip: %s\n", ecx DEBUGF 2, "Detected chip: %s\n", ecx
cmp dword[esi], 0
jne @f
DEBUGF 1, "TxConfig = 0x%x\n", eax DEBUGF 1, "TxConfig = 0x%x\n", eax
@@:
xor eax, eax xor eax, eax
ret ret
@@ -638,6 +635,9 @@ probe:
WRITE_GMII_REG 0x0b, 0x0000 ; w 0x0b 15 0 0 WRITE_GMII_REG 0x0b, 0x0000 ; w 0x0b 15 0 0
@@: @@:
; if TBI is not enabled ; if TBI is not enabled
cmp [ebx + device.mac_version], 01 ; Ten bit interface was only present on the original RTL8169
jne .tbi_dis
set_io [ebx + device.io_addr], 0 set_io [ebx + device.io_addr], 0
set_io [ebx + device.io_addr], REG_PHYstatus set_io [ebx + device.io_addr], REG_PHYstatus
in al, dx in al, dx
@@ -649,6 +649,12 @@ probe:
and eax, 0x0C1F and eax, 0x0C1F
or eax, PHY_Cap_10_Half or PHY_Cap_10_Full or PHY_Cap_100_Half or PHY_Cap_100_Full or eax, PHY_Cap_10_Half or PHY_Cap_10_Full or PHY_Cap_100_Half or PHY_Cap_100_Full
WRITE_GMII_REG PHY_AUTO_NEGO_REG, ax WRITE_GMII_REG PHY_AUTO_NEGO_REG, ax
jmp .wait_aneg
.tbi_dis:
DEBUGF 1, "Enabling 1000mbit modes\n"
set_io [ebx + device.io_addr], 0
; enable 1000 Full Mode ; enable 1000 Full Mode
WRITE_GMII_REG PHY_1000_CTRL_REG, PHY_Cap_1000_Full or PHY_Cap_1000_Half ; rtl8168 WRITE_GMII_REG PHY_1000_CTRL_REG, PHY_Cap_1000_Full or PHY_Cap_1000_Half ; rtl8168
@@ -656,8 +662,9 @@ probe:
; Enable auto-negotiation and restart auto-nigotiation ; Enable auto-negotiation and restart auto-nigotiation
WRITE_GMII_REG PHY_CTRL_REG, PHY_Enable_Auto_Nego or PHY_Restart_Auto_Nego WRITE_GMII_REG PHY_CTRL_REG, PHY_Enable_Auto_Nego or PHY_Restart_Auto_Nego
.wait_aneg:
udelay 1 ; 100 udelay 1 ; 100
mov ecx, 200 ; 10000 mov ecx, 2000 ; 10000
DEBUGF 1, "Waiting for auto-negotiation to complete\n" DEBUGF 1, "Waiting for auto-negotiation to complete\n"
; wait for auto-negotiation process ; wait for auto-negotiation process
@@: dec ecx @@: dec ecx
@@ -670,7 +677,7 @@ probe:
set_io [ebx + device.io_addr], REG_PHYstatus set_io [ebx + device.io_addr], REG_PHYstatus
in al, dx in al, dx
jmp @f jmp @f
.tbi_dis: DEBUGF 1, "auto-negotiation timed-out\n"
udelay 1 ; 100 udelay 1 ; 100
@@: @@:
DEBUGF 1, "auto-negotiation complete\n" DEBUGF 1, "auto-negotiation complete\n"