WebSVN – Kolibri OS – Diff – /drivers/ethernet/RTL8169.asm

         irq_line        db ?
                         rb 3 ; align 4
         mmio_addr       dd ? ; memory map physical address
         pcfg            dd ?
         mcfg            dd ?
         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
-        TxDescArrays    dd ? ; Index of Tx Descriptor buffer
-        RxDescArrays    dd ? ; Index of Rx Descriptor buffer
+        last_tx         dd ?
-        TxDescArray     dd ? ; Index of 256-alignment Tx Descriptor buffer
-        RxDescArray     dd ? ; Index of 256-alignment Rx Descriptor buffer
         mac_version     dd ?
         rb 0x100-($ and 0xff)   ; align 256
 align 4
 reset:
-        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
+        DEBUGF  1,"resetting\n"
         call    init_ring
         lea     edi, [ebx + device.bytes_tx]
         mov     ecx, 6
         rep     stosd
-        mov     [ebx + device.mtu], 1500
+        mov     [ebx + device.mtu], 1500
-; Set link state to unknown
-        mov     [ebx + device.state], ETH_LINK_UNKNOWN
+        call    detect_link
         DEBUGF  2,"init OK!\n"
         DEBUGF  1,"init_ring\n"
         xor     eax, 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]
-        mov     ecx, (NUM_TX_DESC * sizeof.tx_desc) / 4
+        mov     ecx, (NUM_TX_DESC * sizeof.tx_desc) / 4 * 2
         rep     stosd
         lea     edi, [ebx + device.rx_ring]
         mov     ecx, (NUM_RX_DESC * sizeof.rx_desc) / 4
         rep     stosd
-        mov     edi, [ebx + device.RxDescArray]
+        lea     edi, [ebx + device.rx_ring]
         mov     ecx, NUM_RX_DESC
   .loop:
         push    ecx
         invoke  KernelAlloc, RX_BUF_SIZE
         mov     dword [edi + rx_desc.buf_soft_addr], eax
-        invoke  GetPgAddr
+        invoke  GetPhysAddr
         mov     dword [edi + rx_desc.buf_addr], eax
         xor     ecx, ecx
         lea     edi, [ebx + device.mac]
         mov     ecx, 6
+        ; Get MAC address. FIXME: read EEPROM
-        ; Get MAC address. FIXME: read EEPROM
+    @@:
-    @@: in      al, dx
+        in      al, dx
         stosb
         inc     edx
         loop    @r
         mul     [ebx + device.cur_tx]
         lea     esi, [ebx + device.tx_ring + eax]
+        DEBUGF  1,"Using TX desc: %x\n", esi
+;----------------------------------
+; Check if the descriptor is in use
+        test    [esi + tx_desc.status], DSB_OWNbit
-        DEBUGF  1,"Using TX desc: %x\n", esi
+        jnz     .desc
 ;---------------------------
 ; Program the packet pointer
 ;------------------------
 ; 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
+        jne     @f
-        jne     @f
+        or      eax, DSB_EORbit
-        or      eax, DSB_EORbit
+    @@:
-    @@: mov     [esi + tx_desc.status], eax
+        mov     [esi + tx_desc.status], eax
         popf
         xor     eax, eax
+        ret
-        ret
+  .desc:
         DEBUGF  2,"Descriptor is still in use!\n"
   .fail:
         DEBUGF  2,"Transmit failed\n"
         invoke  KernelFree, [bufferptr]
         popf
         or      eax, -1
-        ret
-endp
+        ret
 endp
 ;;;DSB_OWNbit
         mov     ebx, [esi]
         set_io  [ebx + device.io_addr], 0
         set_io  [ebx + device.io_addr], REG_IntrStatus
+        in      ax, dx
+        out     dx, ax                                  ; ACK all interrupts
+        cmp     ax, 0xffff                              ; if so, hardware is no longer present
-        in      ax, dx
+        je      .nothing
         test    ax, ax
         jnz     .got_it
   .continue:
         add     esi, 4
         xor     eax, eax
         ret                                             ; If no device was found, abort (The irq was probably for a device, not registered to this driver)
   .got_it:
-        DEBUGF  1,"Device: %x Status: %x\n", ebx, ax
-        cmp     ax, 0xFFFF      ; if so, hardware is no longer present
+  .got_it:
-        je      .fail
+        DEBUGF  1,"Device: %x Status: %x\n", ebx, ax
 ;--------
-; Receive
+;--------
 ; Receive
         test    ax, ISB_RxOK
         lea     esi, [ebx + device.rx_ring + eax]
         DEBUGF  1,"RxDesc.status = 0x%x\n", [esi + rx_desc.status]
         mov     eax, [esi + rx_desc.status]
         test    eax, DSB_OWNbit ;;;
-        jnz     .rx_return
+        jnz     .no_own
         DEBUGF  1,"cur_rx = %u\n", [ebx + device.cur_rx]
         and     eax, 0x00001FFF
         add     eax, -4                         ; we dont need CRC
         push    eax
         DEBUGF  1,"data length = %u\n", ax
 ;-------------
-; Update stats
+        ; Update stats
         add     dword [ebx + device.bytes_rx], eax
         adc     dword [ebx + device.bytes_rx + 4], 0
-        inc     [ebx + device.packets_rx]
         inc     [ebx + device.packets_rx]
         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
-        mov     [esi + rx_desc.buf_soft_addr], eax
+        invoke  KernelAlloc, RX_BUF_SIZE
-        invoke  GetPhysAddr
+        mov     [esi + rx_desc.buf_soft_addr], eax
-        mov     dword [esi + rx_desc.buf_addr], eax
+        invoke  GetPhysAddr
         mov     dword [esi + rx_desc.buf_addr], eax
 ;---------------
-; re set OWN bit
+        ; reset OWN bit
         mov     eax, DSB_OWNbit or RX_BUF_SIZE
-        cmp     [ebx + device.cur_rx], NUM_RX_DESC - 1
+        mov     eax, DSB_OWNbit or RX_BUF_SIZE
-        jne     @f
+        cmp     [ebx + device.cur_rx], NUM_RX_DESC - 1
-        or      eax, DSB_EORbit
+        jne     @f
-    @@:
+        or      eax, DSB_EORbit
+    @@:
         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]
-  .rx_return:
-        pop     ax
-  .no_rx:
+  .rx_return:
+        DEBUGF  1,"RX error!\n"
+  .no_own:
+        pop     ax
+  .no_rx:
-;---------
+;-----------------
-; Transmit
+; Transmit cleanup
-        test    ax, ISB_TxOK
-        jz      .no_tx
+        test    ax, ISB_TxOK or ISB_TxErr or ISB_TxDescUnavail
-        push    ax
+        jz      .no_tx
+        DEBUGF  1,"TX done!\n"
-        DEBUGF  1,"TX ok!\n"
+  .txloop:
+        mov     esi, [ebx + device.last_tx]
+        imul    esi, sizeof.tx_desc
-        mov     ecx, NUM_TX_DESC
+        lea     esi, [ebx + device.tx_ring + esi]
-        lea     esi, [ebx + device.tx_ring]
-  .txloop:
+        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
-        jnz     .maybenext
-        push    ecx
+        test    [esi + tx_desc.status], DSB_OWNbit
-        DEBUGF  1,"Freeing up TX desc: %x\n", esi
+        jnz     .no_tx
-        invoke  KernelFree, [esi + tx_desc.buf_soft_addr]
+        DEBUGF  1,"Freeing up TX desc: 0x%x\n", esi
-        pop     ecx
-        and     dword [esi + tx_desc.buf_soft_addr], 0
+        DEBUGF  1,"buff: 0x%x\n", [esi + tx_desc.buf_soft_addr]
         push    eax
-  .maybenext:
+        push    dword [esi + tx_desc.buf_soft_addr]
-        add     esi, sizeof.tx_desc
+        and     dword [esi + tx_desc.buf_soft_addr], 0
+        invoke  KernelFree
+        pop     eax
+        inc     [ebx + device.last_tx]
+        and     [ebx + device.last_tx], NUM_TX_DESC-1
+        jmp     .txloop
+  .no_tx:
+        test    ax, ISB_LinkChg
+        jz      .no_linkchange
+        DEBUGF  2, "Link change detected\n"
+        call    detect_link
+  .no_linkchange:
+        pop     edi esi ebx
+        xor     eax, eax
+        inc     eax
+        ret
+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
-        dec     ecx
+        or      cl, ETH_LINK_100M
-        jnz     .txloop
+  @@:
         test    al, PHYS_1000bpsF

Subversion Repositories Kolibri OS

(root)/drivers/ethernet/RTL8169.asm – Rev 5494 → 5498