Changeset cbfece7 in mainline for uspace/drv/nic/rtl8169/driver.c

Timestamp:

2014-07-21T22:10:18Z (10 years ago)

Author:

Agnieszka Tabaka <nufcia@…>

Branches:

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

Children:

1f1fa64

Parents:

96e368a (diff), 54a1ca7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

• Merged mainline changes
• Refactored rtl8169 driver to work with recent driver framework changes
• Fixed speed selection in rtl8169 (disables autonegotiation first)
• Added support for restarting autonegotiation
• Added new switch to 'nic' utility which restarts autonegotiation

File:

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

uspace/drv/nic/rtl8169/driver.c

@@ -33 +33 @@
 #include <align.h>
 #include <byteorder.h>
+#include <irc.h>
 #include <libarch/barrier.h>
 
@@ -388 +389 @@
         rtl8169_t *rtl8169 = nic_get_specific(nic_data);
 
+        /* Get PCI VID & PID */
+        rc = pci_config_space_read_16(ddf_dev_parent_sess_get(dev),
+            PCI_VENDOR_ID, &rtl8169->pci_vid);
+        if (rc != EOK)
+                return rc;
+
+        rc = pci_config_space_read_16(ddf_dev_parent_sess_get(dev),
+            PCI_DEVICE_ID, &rtl8169->pci_pid);
+        if (rc != EOK)
+                return rc;
+
         /* Map register space */
         rc = pio_enable(rtl8169->regs_phys, RTL8169_IO_SIZE, &rtl8169->regs);
@@ -418 +430 @@
         uint8_t cr_value = pio_read_8(rtl8169->regs + CR);
         pio_write_8(rtl8169->regs + CR, cr_value | CR_TE | CR_RE);
-
-        rc = nic_connect_to_services(nic_data);
-        if (rc != EOK) {
-                ddf_msg(LVL_ERROR, "Failed to connect to services (%d)", rc);
-                goto err_irq;
-        }
 
         fun = ddf_fun_create(nic_get_ddf_dev(nic_data), fun_exposed, "port0");
@@ -473 +479 @@
         int rc;
 
-        rtl8169_set_hwaddr(rtl8169, addr);
+        fibril_mutex_lock(&rtl8169->rx_lock);
+        fibril_mutex_lock(&rtl8169->tx_lock);
 
         rc = nic_report_address(nic_data, addr);
@@ -479 +486 @@
                 return rc;
 
+        rtl8169_set_hwaddr(rtl8169, addr);
+
+        fibril_mutex_unlock(&rtl8169->rx_lock);
+        fibril_mutex_unlock(&rtl8169->tx_lock);
+
         return EOK;
 }
@@ -484 +496 @@
 static int rtl8169_get_device_info(ddf_fun_t *fun, nic_device_info_t *info)
 {
-
-        str_cpy(info->vendor_name, NIC_VENDOR_MAX_LENGTH, "Realtek");
-        str_cpy(info->model_name, NIC_MODEL_MAX_LENGTH, "RTL8169");
+        nic_t *nic_data = nic_get_from_ddf_fun(fun);
+        rtl8169_t *rtl8169 = nic_get_specific(nic_data);
+
+        str_cpy(info->vendor_name, NIC_VENDOR_MAX_LENGTH, "Unknown");
+        str_cpy(info->model_name, NIC_MODEL_MAX_LENGTH, "Unknown");
+
+        if (rtl8169->pci_vid == PCI_VID_REALTEK)
+                str_cpy(info->vendor_name, NIC_VENDOR_MAX_LENGTH, "Realtek");
+        
+        if (rtl8169->pci_vid == PCI_VID_DLINK)
+                str_cpy(info->vendor_name, NIC_VENDOR_MAX_LENGTH, "D-Link");
+        
+        if (rtl8169->pci_pid == 0x8168)
+                str_cpy(info->model_name, NIC_MODEL_MAX_LENGTH, "RTL8168");
+        
+        if (rtl8169->pci_pid == 0x8169)
+                str_cpy(info->model_name, NIC_MODEL_MAX_LENGTH, "RTL8169");
+
+        if (rtl8169->pci_pid == 0x8110)
+                str_cpy(info->model_name, NIC_MODEL_MAX_LENGTH, "RTL8110");
 
         return EOK;
@@ -541 +570 @@
         bmcr &= ~(BMCR_DUPLEX | BMCR_SPD_100 | BMCR_SPD_1000);
         
+        /* Disable autonegotiation */
+        bmcr &= ~BMCR_AN_ENABLE;
+
         if (duplex == NIC_CM_FULL_DUPLEX)
                 bmcr |= BMCR_DUPLEX;
@@ -609 +641 @@
 static int rtl8169_autoneg_restart(ddf_fun_t *fun)
 {
+        rtl8169_t *rtl8169 = nic_get_specific(nic_get_from_ddf_fun(fun));
+        uint16_t bmcr = rtl8169_mii_read(rtl8169, MII_BMCR);
+
+        bmcr |= BMCR_AN_ENABLE;
+        rtl8169_mii_write(rtl8169, MII_BMCR, bmcr);
         return EOK;
 }
@@ -706 +743 @@
 
         pio_write_16(rtl8169->regs + IMR, 0xffff);
-        nic_enable_interrupt(nic_data, rtl8169->irq);
+        irc_enable_interrupt(rtl8169->irq);
 
         return EOK;
@@ -888 +925 @@
                 }
 
+                /* Receive underrun */
+                if (isr & INT_RXOVW) {
+                        /* just ack.. */
+                        pio_write_16(rtl8169->regs + ISR, INT_RXOVW);
+                }
+
                 if (isr & INT_SERR) {
                         ddf_msg(LVL_ERROR, "System error interrupt");