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

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                                                 ;;
-;; Copyright (C) KolibriOS team 2004-2015. All rights reserved.    ;;
+;; Copyright (C) KolibriOS team 2004-2021. All rights reserved.    ;;
 ;; Distributed under terms of the GNU General Public License       ;;
 ;;                                                                 ;;
 ;;  R6040 driver for KolibriOS                                     ;;
 ;;                                                                 ;;
 ;;  based on R6040.c from linux                                    ;;
 ;;          GNU GENERAL PUBLIC LICENSE                             ;;
 ;;             Version 2, June 1991                                ;;
 ;;                                                                 ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; TODO: test for RX-overrun
 format PE DLL native
 entry START
         W_MAX_TIMEOUT           = 0x0FFF        ; max time out delay time
         TX_TIMEOUT              = 6000          ; Time before concluding the transmitter is hung, in ms
-        TX_RING_SIZE            = 4             ; RING sizes must be a power of 2
+        TX_RING_SIZE            = 16            ; RING sizes must be a power of 2
 ;;        Actual Hardware dependent code starts here                      ;;
 ;;                                                                        ;;
 ;;/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\/\;;
-;mdio_read:
-;        stdcall phy_read, [ebx + device.io_addr], [ebx + device.phy_addr], ecx
-;        ret
-;mdio_write:
-;        stdcall phy_write, [ebx + device.io_addr], [ebx + device.phy_addr], ecx, eax
-;        ret
 align 4
 unload:
         ; TODO: (in this particular order)
         out     dx, ax
         ;Enable RX
         mov     ax, [ebx + device.mcr0]
         or      ax, MCR0_RCVEN
-        set_io  [ebx + device.io_addr], 0
+        set_io  [ebx + device.io_addr], MCR0
         out     dx, ax
         ;Let TX poll the descriptors
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;;                                         ;;
 ;; Transmit                                ;;
 ;;                                         ;;
 ;; In: pointer to device structure in ebx  ;;
+;; Out: eax = 0 on success                 ;;
 ;;                                         ;;
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+align 16
 proc transmit stdcall bufferptr
-        pushf
-        cli
+        spin_lock_irqsave
         mov     esi, [bufferptr]
         DEBUGF  1,"Transmitting packet, buffer:%x, size:%u\n", [bufferptr], [esi + NET_BUFF.length]
         lea     eax, [esi + NET_BUFF.data]
         DEBUGF  1,"To: %x-%x-%x-%x-%x-%x From: %x-%x-%x-%x-%x-%x Type:%x%x\n",\
         [eax+00]:2,[eax+01]:2,[eax+02]:2,[eax+03]:2,[eax+04]:2,[eax+05]:2,\
         [eax+06]:2,[eax+07]:2,[eax+08]:2,[eax+09]:2,[eax+10]:2,[eax+11]:2,\
         [eax+13]:2,[eax+12]:2
         cmp     [esi + NET_BUFF.length], 1514
-        ja      .fail
+        ja      .error
         cmp     [esi + NET_BUFF.length], 60
-        jb      .fail
+        jb      .error
         movzx   edi, [ebx + device.cur_tx]
         shl     edi, 5
         add     edi, ebx
-        add     edi, device.tx_ring
-        DEBUGF  1,"TX buffer status: 0x%x\n", [edi + x_head.status]:4
         add     edi, device.tx_ring
         test    [edi + x_head.status], DSC_OWNER_MAC    ; check if buffer is available
-        jnz     .wait_to_send
+        DEBUGF  1,"TX buffer status: 0x%x\n", [edi + x_head.status]:4
         inc     [ebx + device.packets_tx]
         mov     eax, [esi + NET_BUFF.length]
         add     dword[ebx + device.bytes_tx], eax
         adc     dword[ebx + device.bytes_tx + 4], 0
-        popf
+        spin_unlock_irqrestore
         xor     eax, eax
         ret
-  .wait_to_send:
-        DEBUGF  1,"Waiting for TX buffer\n"
+  .error:
-        invoke  GetTimerTicks           ; returns in eax
-        lea     edx, [eax + 100]
+        DEBUGF  2, "TX packet error\n"
-  .l2:
-        mov     esi, [bufferptr]
-        test    [edi + x_head.status], DSC_OWNER_MAC
-        jz      .do_send
-        popf
-        mov     esi, 10
-        invoke  Sleep
-        invoke  GetTimerTicks
-        pushf
-        cli
-        cmp     edx, eax
+        inc     [ebx + device.packets_tx_err]
+        invoke  NetFree, [bufferptr]
+        spin_unlock_irqrestore
-        jb      .l2
+        or      eax, -1
+        ret
-        DEBUGF  2,"Send timeout\n"
+  .overrun:
+        DEBUGF  2, "TX overrun\n"
-  .fail:
+        inc     [ebx + device.packets_tx_ovr]
-        DEBUGF  2,"Send failed\n"
+        invoke  NetFree, [bufferptr]
         invoke  NetFree, [bufferptr]
-        popf
+        spin_unlock_irqrestore
 ;;;;;;;;;;;;;;;;;;;;;;;
 ;;                   ;;
 ;; Interrupt handler ;;
 ;;                   ;;
 ;;;;;;;;;;;;;;;;;;;;;;;
-align 4
+align 16
 int_handler:
+        push    ebx esi edi
-        push    ebx esi edi
-        DEBUGF  1,"int\n"
-; Find pointer of device wich made IRQ occur
-        mov     ecx, [devices]
+        mov     ebx, [esp+4*4]
-        test    ecx, ecx
-        jz      .nothing
-        mov     esi, device_list
+        DEBUGF  1,"INT for 0x%x\n", ebx
   .nextdevice:
-        mov     ebx, [esi]
+; TODO? if we are paranoid, we can check that the value from ebx is present in the current device_list
         set_io  [ebx + device.io_addr], 0
-        set_io  [ebx + device.io_addr], MISR
+        set_io  [ebx + device.io_addr], 0
-        in      ax, dx
-        out     dx, ax                  ; send it back to ACK
-        test    ax, ax
-        jnz     .got_it
-  .continue:
-        add     esi, 4
-        dec     ecx
-        jnz     .nextdevice
-  .nothing:
-        pop     edi esi ebx
-        xor     eax, eax
-        ret                             ; If no device was found, abort
+        set_io  [ebx + device.io_addr], MISR
+        in      ax, dx
-; At this point, test for all possible reasons, and handle accordingly
+        test    ax, ax
         jz      .nothing
   .got_it:
         inc     [ebx + device.cur_rx]
         and     [ebx + device.cur_rx], RX_RING_SIZE - 1
         ; At last, send packet to kernel
-        jmp     [EthInput]
         jmp     [EthInput]
+  .no_RX:
   .no_RX:
         test    word[esp], TX_FINISH
-        jz      .no_TX
         jz      .no_TX
   .loop_tx:
         movzx   edi, [ebx + device.last_tx]
         shl     edi, 5
         inc     [ebx + device.last_tx]
         and     [ebx + device.last_tx], TX_RING_SIZE - 1
         jmp     .loop_tx
+        jmp     .loop_tx
   .no_TX:
   .no_TX:
         test    word[esp], RX_NO_DESC
-        jz      .no_rxdesc
         jz      .no_rxdesc
         DEBUGF  2, "No more RX descriptors!\n"
   .no_rxdesc:
   .no_rxdesc:
-        test    word[esp], RX_FIFO_FULL
-        jz      .no_rxfifo
+        test    word[esp], RX_FIFO_FULL
+        jz      .no_rxfifo
         DEBUGF  2, "RX FIFO full!\n"
   .no_rxfifo:
-  .no_rxfifo:
         test    word[esp], RX_EARLY
+        test    word[esp], RX_EARLY
         jz      .no_rxearly
         DEBUGF  2, "RX early\n"
   .no_rxearly:
         test    word[esp], TX_EARLY
         jz      .no_txearly
-        DEBUGF  2, "TX early\n"
         DEBUGF  2, "TX early\n"
+  .no_txearly:
   .no_txearly:
         test    word[esp], EVENT_OVRFL
         jz      .no_ovrfl
         DEBUGF  2, "Event counter overflow!\n"
+        DEBUGF  2, "Event counter overflow!\n"
   .no_ovrfl:
   .no_ovrfl:
+        test    word[esp], LINK_CHANGED
+        jz      .no_link
+        DEBUGF  2, "Link changed\n"
+  .no_link:
+        pop     ax
-        test    word[esp], LINK_CHANGED
+        pop     edi esi ebx

Subversion Repositories Kolibri OS

(root)/drivers/ethernet/R6040.asm @ 4470 – Rev 5522 → 9158