Changes in uspace/drv/nic/rtl8139/driver.c [d87561c:e777847] in mainline

File:

• uspace/drv/nic/rtl8139/driver.c (modified) (48 diffs)

uspace/drv/nic/rtl8139/driver.c ¶

@@ -27 +27 @@
  */
 
-/* XXX Fix this */
-#define _DDF_DATA_IMPLANT
-
 #include <assert.h>
 #include <errno.h>
 #include <align.h>
 #include <byteorder.h>
+#include <libarch/ddi.h>
 #include <libarch/barrier.h>
 
@@ -41 +39 @@
 #include <io/log.h>
 #include <nic.h>
+#include <packet_client.h>
 #include <device/pci.h>
 
@@ -47 +46 @@
 #include <ipc/ns.h>
 
+#include <net_checksum.h>
+
 #include <str.h>
 
@@ -55 +56 @@
 /** Global mutex for work with shared irq structure */
 FIBRIL_MUTEX_INITIALIZE(irq_reg_lock);
-
 /** Lock interrupt structure mutex */
-#define RTL8139_IRQ_STRUCT_LOCK() \
-        fibril_mutex_lock(&irq_reg_lock)
-
+#define RTL8139_IRQ_STRUCT_LOCK() fibril_mutex_lock(&irq_reg_lock)
 /** Unlock interrupt structure mutex */
-#define RTL8139_IRQ_STRUCT_UNLOCK() \
-        fibril_mutex_unlock(&irq_reg_lock)
+#define RTL8139_IRQ_STRUCT_UNLOCK() fibril_mutex_unlock(&irq_reg_lock)
 
 /** PCI clock frequency in kHz */
-#define RTL8139_PCI_FREQ_KHZ  33000
-
-#define RTL8139_AUTONEG_CAPS (ETH_AUTONEG_10BASE_T_HALF | \
-        ETH_AUTONEG_10BASE_T_FULL | ETH_AUTONEG_100BASE_TX_HALF | \
-        ETH_AUTONEG_100BASE_TX_FULL | ETH_AUTONEG_PAUSE_SYMETRIC)
+#define RTL8139_PCI_FREQ_KHZ 33000
+
+#define RTL8139_AUTONEG_CAPS (ETH_AUTONEG_10BASE_T_HALF \
+    | ETH_AUTONEG_10BASE_T_FULL | ETH_AUTONEG_100BASE_TX_HALF \
+    | ETH_AUTONEG_100BASE_TX_FULL | ETH_AUTONEG_PAUSE_SYMETRIC)
 
 /** Lock transmitter and receiver data
- *
- * This function shall be called whenever
- * both transmitter and receiver locking
- * to force safe lock ordering (deadlock prevention)
- *
- * @param rtl8139 RTL8139 private data
- *
+ *  This function shall be called whenever both transmitter and receiver locking
+ *  to force safe lock ordering (deadlock prevention)
+ *
+ *  @param rtl8139  RTL8139 private data
  */
 inline static void rtl8139_lock_all(rtl8139_t *rtl8139)
@@ -89 +83 @@
 /** Unlock transmitter and receiver data
  *
- * @param rtl8139 RTL8139 private data
- *
+ *  @param rtl8139  RTL8139 private data
  */
 inline static void rtl8139_unlock_all(rtl8139_t *rtl8139)
@@ -159 +152 @@
 }
 
-/** Update the mask of accepted frames in the RCR register according to
+/** Update the mask of accepted packets in the RCR register according to
  * rcr_accept_mode value in rtl8139_t
  *
@@ -177 +170 @@
 }
 
-/** Fill the mask of accepted multicast frames in the card registers
+/** Fill the mask of accepted multicast packets in the card registers
  *
  *  @param rtl8139  The rtl8139 private data
@@ -214 +207 @@
         rtl8139_regs_lock(rtl8139->io_port);
 
-        async_sess_t *pci_sess =
-                ddf_dev_parent_sess_get(nic_get_ddf_dev(rtl8139->nic_data));
-
         if (bit_val) {
+                async_sess_t *pci_sess =
+                        nic_get_ddf_dev(rtl8139->nic_data)->parent_sess;
                 uint8_t pmen;
                 pci_config_space_read_8(pci_sess, 0x55, &pmen);
                 pci_config_space_write_8(pci_sess, 0x55, pmen | 1 | (1 << 7));
         } else {
+                async_sess_t *pci_sess =
+                        nic_get_ddf_dev(rtl8139->nic_data)->parent_sess;
                 uint8_t pmen;
                 pci_config_space_read_8(pci_sess, 0x55, &pmen);
@@ -400 +394 @@
 #define rtl8139_tbuf_busy(tsd) ((pio_read_32(tsd) & TSD_OWN) == 0)
 
-/** Send frame with the hardware
+/** Send packet with the hardware
  *
  * note: the main_lock is locked when framework calls this function
@@ -418 +412 @@
         ddf_msg(LVL_DEBUG, "Sending frame");
 
-        if (size > RTL8139_FRAME_MAX_LENGTH) {
+        if (size > RTL8139_PACKET_MAX_LENGTH) {
                 ddf_msg(LVL_ERROR, "Send frame: frame too long, %zu bytes",
                     size);
@@ -443 +437 @@
         fibril_mutex_unlock(&rtl8139->tx_lock);
 
-        /* Get address of the buffer descriptor and frame data */
+        /* Get address of the buffer descriptor and packet data */
         void *tsd = rtl8139->io_port + TSD0 + tx_curr * 4;
         void *buf_addr = rtl8139->tx_buff[tx_curr];
@@ -464 +458 @@
         pio_write_32(tsd, tsd_value);
         return;
-        
+
 err_busy_no_inc:
 err_size:
@@ -511 +505 @@
 }
 
-/** Create frame structure from the buffer data
+/** Create packet structure from the buffer data
  *
  * @param nic_data      NIC driver data
  * @param rx_buffer     The receiver buffer
  * @param rx_size       The buffer size
- * @param frame_start   The offset where packet data start
- * @param frame_size    The size of the frame data
- *
- * @return The frame list node (not connected)
- *
- */
-static nic_frame_t *rtl8139_read_frame(nic_t *nic_data,
-    void *rx_buffer, size_t rx_size, size_t frame_start, size_t frame_size)
-{
-        nic_frame_t *frame = nic_alloc_frame(nic_data, frame_size);
+ * @param packet_start  The offset where packet data start
+ * @param packet_size   The size of the packet data
+ *
+ * @return The packet   list node (not connected)
+ */
+static nic_frame_t *rtl8139_read_packet(nic_t *nic_data,
+    void *rx_buffer, size_t rx_size, size_t packet_start, size_t packet_size)
+{
+        nic_frame_t *frame = nic_alloc_frame(nic_data, packet_size);
         if (! frame) {
-                ddf_msg(LVL_ERROR, "Can not allocate frame for received frame.");
+                ddf_msg(LVL_ERROR, "Can not allocate frame for received packet.");
                 return NULL;
         }
 
-        void *ret = rtl8139_memcpy_wrapped(frame->data, rx_buffer, frame_start,
-            RxBUF_SIZE, frame_size);
+        void *packet_data = packet_suffix(frame->packet, packet_size);
+        if (!packet_data) {
+                ddf_msg(LVL_ERROR, "Can not get the packet suffix.");
+                nic_release_frame(nic_data, frame);
+                return NULL;
+        }
+
+        void *ret = rtl8139_memcpy_wrapped(packet_data, rx_buffer, packet_start,
+            RxBUF_SIZE, packet_size);
         if (ret == NULL) {
                 nic_release_frame(nic_data, frame);
@@ -568 +568 @@
 }
 
-/** Receive all frames in queue
+/** Receive all packets in queue
  *
  *  @param nic_data  The controller data
- *  @return The linked list of nic_frame_list_t nodes, each containing one frame
- */
-static nic_frame_list_t *rtl8139_frame_receive(nic_t *nic_data)
+ *  @return The linked list of packet_list_t nodes, each containing one packet
+ */
+static nic_frame_list_t *rtl8139_packet_receive(nic_t *nic_data)
 {
         rtl8139_t *rtl8139 = nic_get_specific(nic_data);
@@ -581 +581 @@
         nic_frame_list_t *frames = nic_alloc_frame_list();
         if (!frames)
-                ddf_msg(LVL_ERROR, "Can not allocate frame list for received frames.");
+                ddf_msg(LVL_ERROR, "Can not allocate frame list for received packets.");
 
         void *rx_buffer = rtl8139->rx_buff_virt;
@@ -605 +605 @@
         while (!rtl8139_hw_buffer_empty(rtl8139)) {
                 void *rx_ptr = rx_buffer + rx_offset % RxBUF_SIZE;
-                uint32_t frame_header = uint32_t_le2host( *((uint32_t*)rx_ptr) );
-                uint16_t size = frame_header >> 16;
-                uint16_t frame_size = size - RTL8139_CRC_SIZE;
-                /* received frame flags in frame header */
-                uint16_t rcs = (uint16_t) frame_header;
+                uint32_t packet_header = uint32_t_le2host( *((uint32_t*)rx_ptr) );
+                uint16_t size = packet_header >> 16;
+                uint16_t packet_size = size - RTL8139_CRC_SIZE;
+                /* received packet flags in packet header */
+                uint16_t rcs = (uint16_t) packet_header;
 
                 if (size == RTL8139_EARLY_SIZE) {
-                        /* The frame copying is still in progress, break receiving */
+                        /* The packet copying is still in progress, break receiving */
                         ddf_msg(LVL_DEBUG, "Early threshold reached, not completely coppied");
                         break;
@@ -618 +618 @@
 
                 /* Check if the header is valid, otherwise we are lost in the buffer */
-                if (size == 0 || size > RTL8139_FRAME_MAX_LENGTH) {
-                        ddf_msg(LVL_ERROR, "Receiver error -> receiver reset (size: %4" PRIu16 ", "
-                            "header 0x%4" PRIx32 ". Offset: %" PRIu16 ")", size, frame_header,
+                if (size == 0 || size > RTL8139_PACKET_MAX_LENGTH) {
+                        ddf_msg(LVL_ERROR, "Receiver error -> receiver reset (size: %4"PRIu16", "
+                            "header 0x%4"PRIx16". Offset: %zu)", size, packet_header, 
                             rx_offset);
                         goto rx_err;
@@ -629 +629 @@
                 }
 
-                cur_read += size + RTL_FRAME_HEADER_SIZE;
+                cur_read += size + RTL_PACKET_HEADER_SIZE;
                 if (cur_read > max_read)
                         break;
 
                 if (frames) {
-                        nic_frame_t *frame = rtl8139_read_frame(nic_data, rx_buffer,
-                            RxBUF_SIZE, rx_offset + RTL_FRAME_HEADER_SIZE, frame_size);
+                        nic_frame_t *frame = rtl8139_read_packet(nic_data, rx_buffer,
+                            RxBUF_SIZE, rx_offset + RTL_PACKET_HEADER_SIZE, packet_size);
 
                         if (frame)
@@ -642 +642 @@
 
                 /* Update offset */
-                rx_offset = ALIGN_UP(rx_offset + size + RTL_FRAME_HEADER_SIZE, 4);
-
-                /* Write lesser value to prevent overflow into unread frame
+                rx_offset = ALIGN_UP(rx_offset + size + RTL_PACKET_HEADER_SIZE, 4);
+
+                /* Write lesser value to prevent overflow into unread packet
                  * (the recomendation from the RealTech rtl8139 programming guide)
                  */
@@ -735 +735 @@
                 tx_used++;
 
-                /* If the frame was sent */
+                /* If the packet was sent */
                 if (tsd_value & TSD_TOK) {
                         size_t size = REG_GET_VAL(tsd_value, TSD_SIZE);
@@ -765 +765 @@
 }
 
-/** Receive all frames from the buffer
+/** Receive all packets from the buffer
  *
  *  @param rtl8139  driver private data
  */
-static void rtl8139_receive_frames(nic_t *nic_data)
+static void rtl8139_receive_packets(nic_t *nic_data)
 {
         assert(nic_data);
@@ -777 +777 @@
 
         fibril_mutex_lock(&rtl8139->rx_lock);
-        nic_frame_list_t *frames = rtl8139_frame_receive(nic_data);
+        nic_frame_list_t *frames = rtl8139_packet_receive(nic_data);
         fibril_mutex_unlock(&rtl8139->rx_lock);
 
@@ -833 +833 @@
         }
 
-        /* Check transmittion interrupts first to allow transmit next frames
+        /* Check transmittion interrupts first to allow transmit next packets
          * sooner
          */
@@ -840 +840 @@
         }
         if (isr & INT_ROK) {
-                rtl8139_receive_frames(nic_data);
+                rtl8139_receive_packets(nic_data);
         }
         if (isr & (INT_RER | INT_RXOVW | INT_FIFOOVW)) {
@@ -942 +942 @@
 }
 
-/** Activate the device to receive and transmit frames
+/** Activate the device to receive and transmit packets
  *
  *  @param nic_data  The nic driver data
@@ -1020 +1020 @@
         }
 
-        memset(rtl8139, 0, sizeof(rtl8139_t));
+        bzero(rtl8139, sizeof(rtl8139_t));
 
         rtl8139->nic_data = nic_data;
@@ -1053 +1053 @@
         assert(dev);
 
-        if (ddf_dev_data_get(dev))
+        if (dev->driver_data)
                 nic_unbind_and_destroy(dev);
+
+        if (dev->parent_sess != NULL) {
+                async_hangup(dev->parent_sess);
+                dev->parent_sess = NULL;
+        }
 }
 
@@ -1076 +1081 @@
 
         if (hw_resources->irqs.count != 1) {
-                ddf_msg(LVL_ERROR, "%s device: unexpected irq count", ddf_dev_get_name(dev));
+                ddf_msg(LVL_ERROR, "%s device: unexpected irq count", dev->name);
                 return EINVAL;
         };
         if (hw_resources->io_ranges.count != 1) {
-                ddf_msg(LVL_ERROR, "%s device: unexpected io ranges count", ddf_dev_get_name(dev));
+                ddf_msg(LVL_ERROR, "%s device: unexpected io ranges count", dev->name);
                 return EINVAL;
         }
 
         rtl8139->irq = hw_resources->irqs.irqs[0];
-        ddf_msg(LVL_DEBUG, "%s device: irq 0x%x assigned", ddf_dev_get_name(dev), rtl8139->irq);
+        ddf_msg(LVL_DEBUG, "%s device: irq 0x%x assigned", dev->name, rtl8139->irq);
 
         rtl8139->io_addr = IOADDR_TO_PTR(hw_resources->io_ranges.ranges[0].address);
         if (hw_resources->io_ranges.ranges[0].size < RTL8139_IO_SIZE) {
                 ddf_msg(LVL_ERROR, "i/o range assigned to the device "
-                    "%s is too small.", ddf_dev_get_name(dev));
+                    "%s is too small.", dev->name);
                 return EINVAL;
         }
-        ddf_msg(LVL_DEBUG, "%s device: i/o addr %p assigned.", ddf_dev_get_name(dev), rtl8139->io_addr);
+        ddf_msg(LVL_DEBUG, "%s device: i/o addr %p assigned.", dev->name, rtl8139->io_addr);
 
         return EOK;
@@ -1161 +1166 @@
 
         /* Allocate buffer for receiver */
-        ddf_msg(LVL_DEBUG, "Allocating receiver buffer of the size %d bytes",
+        ddf_msg(LVL_DEBUG, "Allocating receiver buffer of the size %zu bytes",
             RxBUF_TOT_LENGTH);
 
@@ -1188 +1193 @@
 static int rtl8139_device_initialize(ddf_dev_t *dev)
 {
-        ddf_msg(LVL_DEBUG, "rtl8139_dev_initialize %s", ddf_dev_get_name(dev));
+        ddf_msg(LVL_DEBUG, "rtl8139_dev_initialize %s", dev->name);
 
         int ret = EOK;
@@ -1197 +1202 @@
         rtl8139_t *rtl8139 = rtl8139_create_dev_data(dev);
         if (rtl8139 == NULL) {
-                ddf_msg(LVL_ERROR, "Not enough memory for initializing %s.", ddf_dev_get_name(dev));
+                ddf_msg(LVL_ERROR, "Not enough memory for initializing %s.", dev->name);
                 return ENOMEM;
         }
@@ -1217 +1222 @@
                 goto failed;
 
-        /* Set default frame acceptance */
+        /* Set default packet acceptance */
         rtl8139->rcr_data.ucast_mask = RTL8139_RCR_UCAST_DEFAULT;
         rtl8139->rcr_data.mcast_mask = RTL8139_RCR_MCAST_DEFAULT;
         rtl8139->rcr_data.bcast_mask = RTL8139_RCR_BCAST_DEFAULT;
         rtl8139->rcr_data.defect_mask = RTL8139_RCR_DEFECT_DEFAULT;
-        /* Set receiver early treshold to 8/16 of frame length */
+        /* Set receiver early treshold to 8/16 of packet length */
         rtl8139->rcr_data.rcr_base = (0x8 << RCR_ERTH_SHIFT);
 
         ddf_msg(LVL_DEBUG, "The device is initialized");
         return ret;
-        
+
 failed:
         ddf_msg(LVL_ERROR, "The device initialization failed");
@@ -1242 +1247 @@
 static int rtl8139_pio_enable(ddf_dev_t *dev)
 {
-        ddf_msg(LVL_DEBUG, NAME ": rtl8139_pio_enable %s", ddf_dev_get_name(dev));
+        ddf_msg(LVL_DEBUG, NAME ": rtl8139_pio_enable %s", dev->name);
 
         rtl8139_t *rtl8139 = nic_get_specific(nic_get_from_ddf_dev(dev));
@@ -1248 +1253 @@
         /* Gain control over port's registers. */
         if (pio_enable(rtl8139->io_addr, RTL8139_IO_SIZE, &rtl8139->io_port)) {
-                ddf_msg(LVL_ERROR, "Cannot gain the port %p for device %s.", rtl8139->io_addr,
-                    ddf_dev_get_name(dev));
+                ddf_msg(LVL_ERROR, "Cannot gain the port %lx for device %s.", rtl8139->io_addr,
+                    dev->name);
                 return EADDRNOTAVAIL;
         }
@@ -1292 +1297 @@
 int rtl8139_dev_add(ddf_dev_t *dev)
 {
-        ddf_fun_t *fun;
-
         assert(dev);
-        ddf_msg(LVL_NOTE, "RTL8139_dev_add %s (handle = %zu)",
-            ddf_dev_get_name(dev), ddf_dev_get_handle(dev));
+        ddf_msg(LVL_NOTE, "RTL8139_dev_add %s (handle = %d)", dev->name, dev->handle);
 
         /* Init device structure for rtl8139 */
@@ -1327 +1329 @@
         rc = nic_connect_to_services(nic_data);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed to connect to services (%d)", rc);
+                ddf_msg(LVL_ERROR, "Failed to connect to services", rc);
                 goto err_irq;
         }
 
-        fun = ddf_fun_create(nic_get_ddf_dev(nic_data), fun_exposed, "port0");
-        if (fun == NULL) {
-                ddf_msg(LVL_ERROR, "Failed creating device function");
-                goto err_srv;
-        }
-        nic_set_ddf_fun(nic_data, fun);
-        ddf_fun_set_ops(fun, &rtl8139_dev_ops);
-        ddf_fun_data_implant(fun, nic_data);
-
-        rc = ddf_fun_bind(fun);
+        rc = nic_register_as_ddf_fun(nic_data, &rtl8139_dev_ops);
         if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed binding device function");
-                goto err_fun_create;
-        }
-        rc = ddf_fun_add_to_category(fun, DEVICE_CATEGORY_NIC);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed adding function to category");
-                goto err_fun_bind;
+                ddf_msg(LVL_ERROR, "Failed to register as DDF function - error %d", rc);
+                goto err_irq;
         }
 
         ddf_msg(LVL_NOTE, "The %s device has been successfully initialized.",
-            ddf_dev_get_name(dev));
-
-        return EOK;
-        
-err_fun_bind:
-        ddf_fun_unbind(fun);
-err_fun_create:
-        ddf_fun_destroy(fun);
-err_srv:
-        /* XXX Disconnect from services */
+            dev->name);
+
+        return EOK;
+
 err_irq:
         unregister_interrupt_handler(dev, rtl8139->irq);
@@ -1504 +1486 @@
 };
 
-/** Check if pause frame operations are valid in current situation 
+/** Check if pause packet operations are valid in current situation 
  *
  *  @param rtl8139  RTL8139 private structure
@@ -1529 +1511 @@
 }
 
-/** Get current pause frame configuration
+/** Get current pause packet configuration
  *
  *  Values are filled with NIC_RESULT_NOT_AVAILABLE if the value has no sense in
@@ -1535 +1517 @@
  *
  *  @param[in]  fun         The DDF structure of the RTL8139
- *  @param[out] we_send     Sign if local constroller sends pause frame
- *  @param[out] we_receive  Sign if local constroller receives pause frame
- *  @param[out] time        Time filled in pause frames. 0xFFFF in rtl8139
+ *  @param[out] we_send     Sign if local constroller sends pause packets
+ *  @param[out] we_receive  Sign if local constroller receives pause packets
+ *  @param[out] time        Time filled in pause packets. 0xFFFF in rtl8139
  *
  *  @return EOK if succeed
@@ -1567 +1549 @@
 };
 
-/** Set current pause frame configuration
+/** Set current pause packet configuration
  *
  *  @param fun            The DDF structure of the RTL8139
- *  @param allow_send     Sign if local constroller sends pause frame
- *  @param allow_receive  Sign if local constroller receives pause frames
+ *  @param allow_send     Sign if local constroller sends pause packets
+ *  @param allow_receive  Sign if local constroller receives pause packets
  *  @param time           Time to use, ignored (not supported by device)
  *
- *  @return EOK if succeed, INVAL if the pause frame has no sence
+ *  @return EOK if succeed, INVAL if the pause packet has no sence
  */
 static int rtl8139_pause_set(ddf_fun_t *fun, int allow_send, int allow_receive, 
@@ -1823 +1805 @@
 }
 
-/** Set unicast frames acceptance mode
+/** Set unicast packets acceptance mode
  *
  *  @param nic_data  The nic device to update
@@ -1881 +1863 @@
 }
 
-/** Set multicast frames acceptance mode
+/** Set multicast packets acceptance mode
  *
  *  @param nic_data  The nic device to update
@@ -1926 +1908 @@
 }
 
-/** Set broadcast frames acceptance mode
+/** Set broadcast packets acceptance mode
  *
  *  @param nic_data  The nic device to update
@@ -1956 +1938 @@
 }
 
-/** Get state of acceptance of weird frames
+/** Get state of acceptance of weird packets
  *
  *  @param[in]  device  The device to check
@@ -1978 +1960 @@
 };
 
-/** Set acceptance of weird frames
+/** Set acceptance of weird packets
  *
  *  @param device  The device to update
@@ -2138 +2120 @@
                 pio_write_32(rtl8139->io_port + TCTR, 0);
 
-                ddf_msg(LVL_DEBUG, "Periodic mode. Interrupt mask %" PRIx16 ", "
-                    "poll.full_skips %zu, last timer %" PRIu32,
-                    rtl8139->int_mask, rtl8139->poll_timer.full_skips,
-                    rtl8139->poll_timer.last_val);
+                ddf_msg(LVL_DEBUG, "Periodic mode. Interrupt mask %"PRIx16", poll.full_skips %"
+                    PRIu32", last timer %"PRIu32".", rtl8139->int_mask, 
+                    rtl8139->poll_timer.full_skips, rtl8139->poll_timer.last_val);
                 break;
         default:
@@ -2155 +2136 @@
 }
 
-/** Force receiving all frames in the receive buffer
+/** Force receiving all packets in the receive buffer
  *
  *  @param device  The device to receive
@@ -2186 +2167 @@
                 &rtl8139_driver_ops, &rtl8139_dev_ops, &rtl8139_nic_iface);
 
-        ddf_log_init(NAME);
+        ddf_log_init(NAME, LVL_ERROR);
         ddf_msg(LVL_NOTE, "HelenOS RTL8139 driver started");
         return ddf_driver_main(&rtl8139_driver);