Changeset 64966 in vbox for trunk/src/VBox/Devices/Network

Timestamp:

Dec 20, 2016 11:38:55 AM (8 years ago)

Author:

vboxsync

Message:

Dev/E1000: (bugref:8624) Bring the link up in 2 seconds, PHY soft reset triggers delayed link-up event.

Location:

trunk/src/VBox/Devices/Network

Files:

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

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

@@ -2643 +2643 @@
 
 /**
+ * A callback used by PHY to indicate that the link needs to be updated due to
+ * reset of PHY.
+ *
+ * @param   pPhy        A pointer to phy member of the device state structure.
+ * @thread  any
+ */
+void e1kPhyLinkResetCallback(PPHY pPhy)
+{
+    /* PHY is aggregated into e1000, get pThis from pPhy. */
+    PE1KSTATE pThis = RT_FROM_MEMBER(pPhy, E1KSTATE, phy);
+    /* Make sure we have cable connected and MAC can talk to PHY */
+    if (pThis->fCableConnected && (CTRL & CTRL_SLU))
+        e1kArmTimer(pThis, pThis->CTX_SUFF(pLUTimer), E1K_INIT_LINKUP_DELAY_US);
+}
+
+/**
  * Write handler for Device Control register.
  *
@@ -7649 +7665 @@
     /* Initialize internal PHY. */
     Phy::init(&pThis->phy, iInstance, pThis->eChip == E1K_CHIP_82543GC ? PHY_EPID_M881000 : PHY_EPID_M881011);
-    Phy::setLinkStatus(&pThis->phy, pThis->fCableConnected);
 
     /* Initialize critical sections. We do our own locking. */

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

@@ -47 +47 @@
 
 #define REG(x) pPhy->au16Regs[x##_IDX]
+
+
+/* External callback declaration */
+void e1kPhyLinkResetCallback(PPHY pPhy);
 
 
@@ -300 +304 @@
 {
     pPhy->iInstance = iNICInstance;
-    /* Make sure the link is down */
-    REG(PSTATUS)  = 0;
     /* The PHY identifier composed of bits 3 through 18 of the OUI */
     /* (Organizationally Unique Identifier). OUI is 0x05043.       */
@@ -352 +354 @@
 {
     PhyLog(("PHY#%d Soft reset\n", pPhy->iInstance));
+
+    REG(PCTRL)    = REG(PCTRL) & (PCTRL_SPDSELM | PCTRL_DUPMOD | PCTRL_ANEG | PCTRL_SPDSELL);
     /*
      * 100 and 10 FD/HD, Extended Status, MF Preamble Suppression,
@@ -357 +361 @@
      */
     REG(PSTATUS)  = 0x7949;
-    REG(PSSTAT)   = 0x0000;
+    REG(PSSTAT)  &= 0xe001;
     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));
+
+    e1kPhyLinkResetCallback(pPhy);
 }
 
@@ -384 +389 @@
     if (fLinkIsUp)
     {
-        REG(PSSTAT)  |= PSSTAT_LINK;
-        REG(PSTATUS) |= PSTATUS_NEGCOMP;
+        REG(PSSTAT)  |= PSSTAT_LINK_ALL;
+        REG(PSTATUS) |= PSTATUS_NEGCOMP; /* PSTATUS_LNKSTAT is latched low */
     }
     else
     {
-        REG(PSSTAT)  &= ~PSSTAT_LINK;
-        REG(PSTATUS) &= ~PSTATUS_LNKSTAT;
+        REG(PSSTAT)  &= ~PSSTAT_LINK_ALL;
+        REG(PSTATUS) &= ~(PSTATUS_LNKSTAT | PSTATUS_NEGCOMP);
     }
     PhyLog(("PHY#%d setLinkStatus: PSTATUS=%04x PSSTAT=%04x\n", pPhy->iInstance, REG(PSTATUS), REG(PSSTAT)));

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

@@ -38 +38 @@
  * Receive Pause Enable
  */
-#define PSSTAT_LINK     0xBC08
+#define PSSTAT_LINK_ALL 0xBC08
+#define PSSTAT_LINK     0x0400
 
 namespace Phy