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

Timestamp:

Dec 12, 2016 4:59:20 PM (8 years ago)

Author:

vboxsync

Message:

Dev/E1000: bugref:8624: reverted r112175 as it seems to introduce regressions with Windows guests

File:

• trunk/src/VBox/Devices/Network/DevE1000.cpp (modified) (2 diffs)

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

@@ -66 +66 @@
  */
 #define E1K_LSC_ON_SLU
-/** @def E1K_INIT_LINKUP_DELAY_US
- * E1K_INIT_LINKUP_DELAY_US prevents the link going up while the driver is still
- * in init (see @bugref{8624}). The units are microseconds.
- */
-#define E1K_INIT_LINKUP_DELAY_US (500 * 1000)
+/** @def E1K_INIT_LINKUP_DELAY
+ * E1K_INIT_LINKUP_DELAY prevents the link going up while the driver is still
+ * in init (see @bugref{8624}).
+ */
+//#define E1K_INIT_LINKUP_DELAY (500 * 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
             /*
-             * Arch Linux guests urge us to bring up the link immediately or risk
-             * hitting Tx unit hang detection by the driver. The interrupt must
-             * be delayed though, to avoid interrupt storms in Windows guests.
-             * See @bugref{8624} for details. */
+             * 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);
-#ifdef E1K_INIT_LINKUP_DELAY
-            /* We need to deliver a link-up interrupt for macOS guests. */
-            e1kArmTimer(pThis, pThis->CTX_SUFF(pLUTimer), E1K_INIT_LINKUP_DELAY_US);
-#else /* !E1K_INIT_LINKUP_DELAY */
-            /*
-             * Raising an interrupt immediately may cause an interrupt storm in
-             * Windows guests when the guest's driver enables interrupts from
-             * e1000 during init. Usually the driver will have interrupts
-             * disabled when it sets CTRL_SLU, so we won't actually raise an
-             * interrupt here, but we will do it as soon as the guest enables
-             * interrupts via IMS. See @bugref{8624} for details.
-             */
-            e1kRaiseInterrupt(pThis, VERR_SEM_BUSY, ICR_LSC);
 #endif /* !E1K_INIT_LINKUP_DELAY */
         }