Changeset 68929 in vbox

Timestamp:

Sep 29, 2017 12:31:58 PM (7 years ago)

Author:

vboxsync

Message:

Dev/E1000: (bugref:8942) Fixed Windows XP boot freeze.

Location:

trunk

Files:

• doc/manual/user_ChangeLogImpl.xml (modified) (1 diff)
• src/VBox/Devices/Network/DevE1000.cpp (modified) (6 diffs)

trunk/doc/manual/user_ChangeLogImpl.xml

@@ -100 +100 @@
       <listitem>
         <para>EFI: better video mode handling</para>
+      </listitem>
+
+      <listitem>
+        <para>E1000: Windows XP freeze when booting with unplugged cable</para>
       </listitem>
 

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

@@ -60 +60 @@
  */
 #define E1K_INIT_RA0
+/** @def E1K_LSC_ON_RESET
+ * E1K_LSC_ON_RESET causes e1000 to generate Link Status Change
+ * interrupt after hard reset. This makes the E1K_LSC_ON_SLU option unnecessary.
+ * With unplugged cable, LSC is triggerred for 82543GC only.
+ */
+#define E1K_LSC_ON_RESET
 /** @def E1K_LSC_ON_SLU
  * E1K_LSC_ON_SLU causes E1000 to generate Link Status Change interrupt when
@@ -65 +71 @@
  * that requires it is Mac OS X (see @bugref{4657}).
  */
-#define E1K_LSC_ON_SLU
+//#define E1K_LSC_ON_SLU
 /** @def E1K_INIT_LINKUP_DELAY
  * E1K_INIT_LINKUP_DELAY prevents the link going up while the driver is still
@@ -1668 +1674 @@
     }
 #endif /* E1K_WITH_RXD_CACHE */
+#ifdef E1K_LSC_ON_RESET
+    E1kLog(("%s Will trigger LSC in %d seconds...\n",
+            pThis->szPrf, pThis->cMsLinkUpDelay / 1000));
+    e1kArmTimer(pThis, pThis->CTX_SUFF(pLUTimer), pThis->cMsLinkUpDelay * 1000);
+#endif /* E1K_LSC_ON_RESET */
 }
 
@@ -2576 +2587 @@
     E1kLog(("%s Link is down\n", pThis->szPrf));
     STATUS &= ~STATUS_LU;
+#ifdef E1K_LSC_ON_RESET
+    Phy::setLinkStatus(&pThis->phy, false);
+#endif /* E1K_LSC_ON_RESET */
     e1kRaiseInterrupt(pThis, VERR_SEM_BUSY, ICR_LSC);
     if (pThis->pDrvR3)
@@ -3414 +3428 @@
      * This can happen if we set the link status to down when the Link up timer was
      * already armed (shortly after e1kLoadDone() or when the cable was disconnected
-     * and connect+disconnect the cable very quick.
+     * and connect+disconnect the cable very quick. Moreover, 82543GC triggers LSC
+     * on reset even if the cable is unplugged (see @bugref{8942}).
      */
-    if (!pThis->fCableConnected)
-        return;
-
-    e1kR3LinkUp(pThis);
+    if (pThis->fCableConnected)
+        e1kR3LinkUp(pThis);
+#ifdef E1K_LSC_ON_RESET
+    else if (pThis->eChip == E1K_CHIP_82543GC)
+        e1kR3LinkDown(pThis);
+#endif /* E1K_LSC_ON_RESET */
 }
 
@@ -7652 +7669 @@
                                 N_("Configuration error: Failed to get the value of 'TidEnabled'"));
 
-    rc = CFGMR3QueryU32Def(pCfg, "LinkUpDelay", (uint32_t*)&pThis->cMsLinkUpDelay, 5000); /* ms */
+    rc = CFGMR3QueryU32Def(pCfg, "LinkUpDelay", (uint32_t*)&pThis->cMsLinkUpDelay, 3000); /* ms */
     if (RT_FAILURE(rc))
         return PDMDEV_SET_ERROR(pDevIns, rc,