Changeset 2f11e6c9 in mainline

Timestamp:

2014-08-11T20:42:56Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

2ff9876

Parents:

a41b691

Message:

Add proper TX busy handling, normalize log message levels.

File:

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

uspace/drv/nic/rtl8169/driver.c

@@ -27 +27 @@
  */
 
-#define _DDF_DATA_IMPLANT
-
 #include <assert.h>
 #include <errno.h>
@@ -439 +437 @@
         nic_set_ddf_fun(nic_data, fun);
         ddf_fun_set_ops(fun, &rtl8169_dev_ops);
-//      ddf_fun_data_implant(fun, nic_data);
 
         rc = ddf_fun_bind(fun);
@@ -739 +736 @@
         pio_write_16(rtl8169->regs + RMS, BUFFER_SIZE);
 
-        ddf_msg(LVL_NOTE, "RCR: 0x%08x", pio_read_32(rtl8169->regs + RCR));
-
-
         pio_write_16(rtl8169->regs + IMR, 0xffff);
         irc_enable_interrupt(rtl8169->irq);
@@ -816 +810 @@
         rtl8169_t *rtl8169 = nic_get_specific(nic_data);
         rtl8169_descr_t *descr;
-
-        ddf_msg(LVL_NOTE, "rtl8169_transmit_done()");
+        int sent = 0;
+
+        ddf_msg(LVL_DEBUG, "rtl8169_transmit_done()");
 
         fibril_mutex_lock(&rtl8169->tx_lock);
@@ -828 +823 @@
                 descr->control &= (~CONTROL_OWN);
                 write_barrier();
-                ddf_msg(LVL_NOTE, "TX status for descr %d: 0x%08x", tail, descr->control);
+                ddf_msg(LVL_DEBUG, "TX status for descr %d: 0x%08x", tail, descr->control);
         
                 tail = (tail + 1) % TX_BUFFERS_COUNT;
-        }
+                sent++;
+        }
+
+        if (sent != 0)
+                nic_set_tx_busy(nic_data, 0);
 
         rtl8169->tx_tail = tail;
@@ -849 +848 @@
         int frame_size;
 
-        ddf_msg(LVL_NOTE, "rtl8169_receive_done()");
+        ddf_msg(LVL_DEBUG, "rtl8169_receive_done()");
 
         fibril_mutex_lock(&rtl8169->rx_lock);
@@ -862 +861 @@
 
                 if (descr->control & RXSTATUS_RES) {
-                        ddf_msg(LVL_NOTE, "error at slot %d: 0x%08x\n", tail, descr->control);
+                        ddf_msg(LVL_WARN, "error at slot %d: 0x%08x\n", tail, descr->control);
                         tail = (tail + 1) % RX_BUFFERS_COUNT;
                         continue;
@@ -871 +870 @@
                 
                 if (descr->control & CONTROL_LS) {
-
-                        ddf_msg(LVL_NOTE, "received message at slot %d, control 0x%08x", tail, descr->control);
+                        ddf_msg(LVL_DEBUG, "received message at slot %d, control 0x%08x", tail, descr->control);
 
                         if (fsidx != tail)
@@ -907 +905 @@
         rtl8169_t *rtl8169 = nic_get_specific(nic_data);
 
-        ddf_msg(LVL_NOTE, "rtl8169_irq_handler(): isr=0x%04x", isr);
+        ddf_msg(LVL_DEBUG, "rtl8169_irq_handler(): isr=0x%04x", isr);
         pio_write_16(rtl8169->regs + IMR, 0xffff);
 
@@ -963 +961 @@
         fibril_mutex_lock(&rtl8169->tx_lock);
 
-        ddf_msg(LVL_NOTE, "send_frame: size: %zu, tx_head=%d tx_tail=%d",
+        ddf_msg(LVL_DEBUG, "send_frame: size: %zu, tx_head=%d tx_tail=%d",
             size, rtl8169->tx_head, rtl8169->tx_tail);
 
@@ -986 +984 @@
         prev = &rtl8169->tx_ring[(head - 1) % TX_BUFFERS_COUNT];
 
-        ddf_msg(LVL_NOTE, "current_descr=%p, prev_descr=%p", descr, prev);
+        ddf_msg(LVL_DEBUG, "current_descr=%p, prev_descr=%p", descr, prev);
 
         descr->control = CONTROL_OWN | CONTROL_FS | CONTROL_LS;