Changeset 27002 in vbox for trunk/src/VBox

Timestamp:

Mar 3, 2010 6:34:42 PM (15 years ago)

Author:

vboxsync

Message:

e1000: A workaround for Windows lockups on link status interrupt.

Location:

trunk/src/VBox/Devices

Files:

• Network/DevE1000.cpp (modified) (9 diffs)
• testcase/tstDeviceStructSizeRC.cpp (modified) (1 diff)

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

@@ -863 +863 @@
     PTMTIMERR3              pTADTimerR3;   /**< Tranmsit Absolute Delay Timer - R3. */
     PTMTIMERR3              pIntTimerR3;            /**< Late Interrupt Timer - R3. */
+    PTMTIMERR3              pLUTimerR3;               /**< Link Up(/Restore) Timer. */
 
     PPDMDEVINSR0            pDevInsR0;                   /**< Device instance - R0. */
@@ -872 +873 @@
     PTMTIMERR0              pTADTimerR0;   /**< Tranmsit Absolute Delay Timer - R0. */
     PTMTIMERR0              pIntTimerR0;            /**< Late Interrupt Timer - R0. */
+    PTMTIMERR0              pLUTimerR0;          /**< Link Up(/Restore) Timer - R0. */
 
     PPDMDEVINSRC            pDevInsRC;                   /**< Device instance - RC. */
@@ -881 +883 @@
     PTMTIMERRC              pTADTimerRC;   /**< Tranmsit Absolute Delay Timer - RC. */
     PTMTIMERRC              pIntTimerRC;            /**< Late Interrupt Timer - RC. */
-
-    PTMTIMERR3  pLUTimer;                             /**< Link Up(/Restore) Timer. */
+    PTMTIMERRC              pLUTimerRC;          /**< Link Up(/Restore) Timer - RC. */
+
+#if HC_ARCH_BITS != 32
+    uint32_t                u32Padding2;
+#endif
+
     PPDMTHREAD  pTxThread;                                    /**< Transmit thread. */
     PDMCRITSECT cs;                  /**< Critical section - what is it protecting? */
@@ -2108 +2114 @@
         {
             /* The driver indicates that we should bring up the link */
-            STATUS |= STATUS_LU;
-#ifdef E1K_LSC_ON_SLU
-            Phy::setLinkStatus(&pState->phy, true);
-            e1kRaiseInterrupt(pState, VERR_SEM_BUSY, ICR_LSC);
-#endif /* E1K_LSC_ON_SLU */
+            /* Do so in 5 seconds. */
+            e1kArmTimer(pState, pState->CTX_SUFF(pLUTimer), 5000000);
         }
         if (value & CTRL_VME)
@@ -4459 +4462 @@
             e1kRaiseInterrupt(pState, VERR_SEM_BUSY, ICR_LSC);
             /* Restore the link back in 5 second. */
-            e1kArmTimer(pState, pState->pLUTimer, 5000000);
+            e1kArmTimer(pState, pState->pLUTimerR3, 5000000);
         }
         else
@@ -4734 +4737 @@
         e1kRaiseInterrupt(pState, VERR_SEM_BUSY, ICR_LSC);
         /* Restore the link back in five seconds. */
-        e1kArmTimer(pState, pState->pLUTimer, 5000000);
+        e1kArmTimer(pState, pState->pLUTimerR3, 5000000);
     }
     e1kMutexRelease(pState);
@@ -4832 +4835 @@
         e1kRaiseInterrupt(pState, VERR_SEM_BUSY, ICR_LSC);
         /* Restore the link back in 5 second. */
-        e1kArmTimer(pState, pState->pLUTimer, 5000000);
+        e1kArmTimer(pState, pState->pLUTimerR3, 5000000);
     }
 
@@ -4893 +4896 @@
 #endif /* E1K_USE_TX_TIMERS */
     pState->pIntTimerRC   = TMTimerRCPtr(pState->pIntTimerR3);
+    pState->pLUTimerRC    = TMTimerRCPtr(pState->pLUTimerR3);
 }
 
@@ -5249 +5253 @@
     rc = PDMDevHlpTMTimerCreate(pDevIns, TMCLOCK_VIRTUAL, e1kLinkUpTimer, pState,
                                 TMTIMER_FLAGS_DEFAULT_CRIT_SECT, /** @todo check locking here. */
-                                "E1000 Link Up Timer", &pState->pLUTimer);
+                                "E1000 Link Up Timer", &pState->pLUTimerR3);
     if (RT_FAILURE(rc))
         return rc;
+    pState->pLUTimerR0 = TMTimerR0Ptr(pState->pLUTimerR3);
+    pState->pLUTimerRC = TMTimerRCPtr(pState->pLUTimerR3);
 
     /* Status driver */

trunk/src/VBox/Devices/testcase/tstDeviceStructSizeRC.cpp

@@ -1297 +1297 @@
     GEN_CHECK_OFF(E1KSTATE, pIntTimerR0);
     GEN_CHECK_OFF(E1KSTATE, pIntTimerRC);
-    GEN_CHECK_OFF(E1KSTATE, pLUTimer);
+    GEN_CHECK_OFF(E1KSTATE, pLUTimerR3);
+    GEN_CHECK_OFF(E1KSTATE, pLUTimerR0);
+    GEN_CHECK_OFF(E1KSTATE, pLUTimerRC);
     GEN_CHECK_OFF(E1KSTATE, pTxThread);
     GEN_CHECK_OFF(E1KSTATE, cs);