Changeset 64925 in vbox for trunk/src/VBox/Devices

Timestamp:

Dec 16, 2016 7:28:31 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

112338

Message:

Dev/E1000: (bugref:8624) Bring the link up in 2 seconds, PHY soft reset implemented partially.

Location:

trunk/src/VBox/Devices/Network

Files:

• DevE1000.cpp (modified) (2 diffs)
• DevE1000Phy.cpp (modified) (4 diffs)
• DevE1000Phy.h (modified) (1 diff)

trunk/src/VBox/Devices/Network/DevE1000.cpp

@@ -70 +70 @@
  * in init (see @bugref{8624}).
  */
-//#define E1K_INIT_LINKUP_DELAY (500 * 1000)
+#define E1K_INIT_LINKUP_DELAY_US (2000 * 1000)
 /** @def E1K_IMS_INT_DELAY_NS
  * E1K_IMS_INT_DELAY_NS prevents interrupt storms in Windows guests on enabling
@@ -2678 +2678 @@
             && !(STATUS & STATUS_LU))
         {
-#ifdef E1K_INIT_LINKUP_DELAY
-            /*
-             * The driver indicates that we should bring up the link. Our default 5-second delay is too long,
-             * as Linux guests detect Tx hang after 2 seconds. Let's use 500 ms delay instead. */
-            e1kArmTimer(pThis, pThis->CTX_SUFF(pLUTimer), E1K_INIT_LINKUP_DELAY);
-#else /* !E1K_INIT_LINKUP_DELAY */
-            /* Bring up the link immediately, no need for an interrupt though. */
-            STATUS |= STATUS_LU;
-            Phy::setLinkStatus(&pThis->phy, true);
-#endif /* !E1K_INIT_LINKUP_DELAY */
+            /* It should take about 2 seconds for the link to come up */
+            e1kArmTimer(pThis, pThis->CTX_SUFF(pLUTimer), E1K_INIT_LINKUP_DELAY_US);
         }
         if (value & CTRL_VME)

trunk/src/VBox/Devices/Network/DevE1000Phy.cpp

@@ -320 +320 @@
     REG(PCTRL) = PCTRL_SPDSELM | PCTRL_DUPMOD | PCTRL_ANEG;
     /*
-     * 100 and 10 FD/HD, MF Preamble Suppression, Auto-Negotiation Complete,
+     * 100 and 10 FD/HD, Extended Status, MF Preamble Suppression,
      * AUTO NEG AB, EXT CAP
      */
-    REG(PSTATUS)  = (REG(PSTATUS) & ~PSTATUS_LNKSTAT) | 0x7969;
+    REG(PSTATUS)  = 0x7949;
     REG(ANA)      = 0x01E1;
     /* No flow control by our link partner, all speeds */
@@ -351 +351 @@
 static void Phy::softReset(PPHY pPhy)
 {
-    RT_NOREF1(pPhy);
-    PhyLog(("PHY#%d Soft reset is not yet implemented!\n", pPhy->iInstance));
+    PhyLog(("PHY#%d Soft reset\n", pPhy->iInstance));
+    /*
+     * 100 and 10 FD/HD, Extended Status, MF Preamble Suppression,
+     * AUTO NEG AB, EXT CAP
+     */
+    REG(PSTATUS)  = 0x7949;
+    REG(PSSTAT)   = 0x0000;
+    PhyLog(("PHY#%d PSTATUS=%04x PSSTAT=%04x\n", pPhy->iInstance, REG(PSTATUS), REG(PSSTAT)));
+    PhyLog(("PHY#%d Soft reset is not yet fully implemented!\n", pPhy->iInstance));
 }
 
@@ -376 +383 @@
 {
     if (fLinkIsUp)
+    {
         REG(PSSTAT)  |= PSSTAT_LINK;
+        REG(PSTATUS) |= PSTATUS_NEGCOMP;
+    }
     else
     {
@@ -382 +392 @@
         REG(PSTATUS) &= ~PSTATUS_LNKSTAT;
     }
+    PhyLog(("PHY#%d setLinkStatus: PSTATUS=%04x PSSTAT=%04x\n", pPhy->iInstance, REG(PSTATUS), REG(PSSTAT)));
 }
 

trunk/src/VBox/Devices/Network/DevE1000Phy.h

@@ -28 +28 @@
 
 #define PSTATUS_LNKSTAT 0x0004
+#define PSTATUS_NEGCOMP 0x0020
 
 /*