Changeset 91e057c in mainline

Timestamp:

2014-06-23T22:24:46Z (11 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

727e639

Parents:

5a78e4e

Message:

Fixed ownership bit setting in TX interrupt handler, removed some
unneeded debug messages and reworked interrupt handling to (hopefully)
not miss any interrupts.

File:

• uspace/drv/nic/rtl8169/driver.c (modified) (13 diffs)

uspace/drv/nic/rtl8169/driver.c

@@ -237 +237 @@
 
         /* Allocate TX ring */
+        rtl8169->tx_ring = AS_AREA_ANY;
         rc = dmamem_map_anonymous(TX_RING_SIZE, DMAMEM_4GiB, 
             AS_AREA_READ | AS_AREA_WRITE, 0, &rtl8169->tx_ring_phys,
@@ -244 +245 @@
                 return rc;
 
+        ddf_msg(LVL_DEBUG, "TX ring address: phys=0x%08lx, virt=%p",
+            rtl8169->tx_ring_phys, rtl8169->tx_ring);
+
         memset(rtl8169->tx_ring, 0, TX_RING_SIZE);
 
         /* Allocate RX ring */
+        rtl8169->rx_ring = AS_AREA_ANY;
         rc = dmamem_map_anonymous(RX_RING_SIZE, DMAMEM_4GiB, 
             AS_AREA_READ | AS_AREA_WRITE, 0, &rtl8169->rx_ring_phys,
@@ -254 +259 @@
                 return rc;
 
+        ddf_msg(LVL_DEBUG, "RX ring address: phys=0x%08lx, virt=%p",
+            rtl8169->rx_ring_phys, rtl8169->rx_ring);
+
         memset(rtl8169->rx_ring, 0, RX_RING_SIZE);
 
         /* Allocate TX buffers */
+        rtl8169->tx_buff = AS_AREA_ANY;
         rc = dmamem_map_anonymous(TX_BUFFERS_SIZE, DMAMEM_4GiB, 
             AS_AREA_READ | AS_AREA_WRITE, 0, &rtl8169->tx_buff_phys,
@@ -264 +273 @@
                 return rc;
 
+        ddf_msg(LVL_DEBUG, "TX buffers base address: phys=0x%08lx, virt=%p",
+            rtl8169->tx_buff_phys, rtl8169->tx_buff);
+
         /* Allocate RX buffers */
+        rtl8169->rx_buff = AS_AREA_ANY;
         rc = dmamem_map_anonymous(RX_BUFFERS_SIZE, DMAMEM_4GiB, 
             AS_AREA_READ | AS_AREA_WRITE, 0, &rtl8169->rx_buff_phys,
@@ -271 +284 @@
         if (rc != EOK)
                 return rc;
+
+        ddf_msg(LVL_DEBUG, "RX buffers base address: phys=0x%08lx, virt=%p",
+            rtl8169->rx_buff_phys, rtl8169->rx_buff);
 
         return EOK;
@@ -556 +572 @@
 static int rtl8169_on_activated(nic_t *nic_data)
 {
+        int rc;
+
         ddf_msg(LVL_NOTE, "Activating device");
 
@@ -565 +583 @@
 
         /* Allocate buffers */
-        rtl8169_allocate_buffers(rtl8169);
+        rc = rtl8169_allocate_buffers(rtl8169);
+        if (rc != EOK) {
+                ddf_msg(LVL_ERROR, "Error allocating buffers: %d", rc);
+                return 0;
+        }
 
         /* Initialize RX ring */
@@ -688 +710 @@
         while (tail != head) {
                 descr = &rtl8169->tx_ring[tail];
-                descr->control |= CONTROL_OWN;
+                descr->control &= (~CONTROL_OWN);
+                write_barrier();
                 ddf_msg(LVL_NOTE, "TX status for descr %d: 0x%08x", tail, descr->control);
-
+        
                 tail = (tail + 1) % TX_BUFFERS_COUNT;
         }
@@ -769 +792 @@
 
         ddf_msg(LVL_NOTE, "rtl8169_irq_handler(): isr=0x%04x", isr);
+        pio_write_16(rtl8169->regs + IMR, 0xffff);
 
         while (isr != 0) {
+                ddf_msg(LVL_DEBUG, "irq handler: remaining isr=0x%04x", isr);
+
                 /* Packet underrun or link change */
                 if (isr & INT_PUN) {
@@ -796 +822 @@
         }
 
-        pio_write_16(rtl8169->regs + IMR, 0xffff);
         pio_write_16(rtl8169->regs + ISR, 0xffff);
 }
@@ -816 +841 @@
         fibril_mutex_lock(&rtl8169->tx_lock);
 
-        ddf_msg(LVL_NOTE, "send_frame()");
-        ddf_msg(LVL_NOTE, "size: %ld", size);
-        ddf_msg(LVL_NOTE, "tx ring virtual at %p", rtl8169->tx_ring);
-        ddf_msg(LVL_NOTE, "tx_head=%d tx_tail=%d", rtl8169->tx_head, rtl8169->tx_tail);
+        ddf_msg(LVL_NOTE, "send_frame: size: %ld, tx_head=%d tx_tail=%d",
+            size, rtl8169->tx_head, rtl8169->tx_tail);
 
         head = rtl8169->tx_head;
@@ -854 +877 @@
         rtl8169->tx_head = (head + 1) % TX_BUFFERS_COUNT;
 
+        ddf_msg(LVL_DEBUG, "control: 0x%08x", descr->control);
+
         write_barrier();
 
@@ -859 +884 @@
         pio_write_8(rtl8169->regs + TPPOLL, TPPOLL_NPQ);
         write_barrier();
-
-        ddf_msg(LVL_NOTE, "triggered TPPOLL");
 
         fibril_mutex_unlock(&rtl8169->tx_lock);