Changeset 53911 in vbox for trunk/src/VBox

Timestamp:

Jan 22, 2015 11:34:26 AM (10 years ago)

Author:

vboxsync

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

97782

Message:

OHCI: Immediately wake up the frame thread when an URB completed and reset the frame rate to 1KHz

File:

• trunk/src/VBox/Devices/USB/DevOHCI.cpp (modified) (5 diffs)

trunk/src/VBox/Devices/USB/DevOHCI.cpp

@@ -2154 +2154 @@
 
 /**
+ * Calculate frame timer variables given a frame rate (1,000 Hz is the full speed).
+ */
+static void ohciCalcTimerIntervals(POHCI pThis, uint32_t u32FrameRate)
+{
+    Assert(u32FrameRate <= OHCI_DEFAULT_TIMER_FREQ);
+
+    pThis->cTicksPerFrame = pThis->u64TimerHz / u32FrameRate;
+    if (!pThis->cTicksPerFrame)
+        pThis->cTicksPerFrame = 1;
+    pThis->cTicksPerUsbTick   = pThis->u64TimerHz >= VUSB_BUS_HZ ? pThis->u64TimerHz / VUSB_BUS_HZ : 1;
+    pThis->nsWait             = RT_NS_1SEC / u32FrameRate;
+    pThis->uFrameRate         = u32FrameRate;
+}
+
+
+/**
+ * Calculates the new frame rate based on the idle detection and number of idle
+ * cycles.
+ *
+ * @returns nothing.
+ * @param   pThis    The OHCI device data.
+ */
+static void ohciFramerateCalcNew(POHCI pThis)
+{
+    uint32_t uNewFrameRate = pThis->uFrameRate;
+
+    /*
+     * Adjust the frame timer interval based on idle detection.
+     */
+    if (pThis->fIdle)
+    {
+        pThis->cIdleCycles++;
+        /* Set the new frame rate based on how long we've been idle. Tunable. */
+        switch (pThis->cIdleCycles)
+        {
+            case 4: uNewFrameRate = 500;    break;  /*  2ms interval */
+            case 16:uNewFrameRate = 125;    break;  /*  8ms interval */
+            case 24:uNewFrameRate = 50;     break;  /* 20ms interval */
+            default:    break;
+        }
+        /* Avoid overflow. */
+        if (pThis->cIdleCycles > 60000)
+            pThis->cIdleCycles = 20000;
+    }
+    else
+    {
+        if (pThis->cIdleCycles)
+        {
+            pThis->cIdleCycles = 0;
+            uNewFrameRate      = OHCI_DEFAULT_TIMER_FREQ;
+        }
+    }
+    if (uNewFrameRate != pThis->uFrameRate)
+        ohciCalcTimerIntervals(pThis, uNewFrameRate);
+}
+
+
+/**
  * Returns the OHCI_CC_* corresponding to the VUSB status code.
  *
@@ -2538 +2596 @@
     /* finally write back the endpoint descriptor. */
     ohciWriteEd(pThis, pUrb->Hci.EdAddr, &Ed);
+
+    /* Calculate new frame rate and wakeup the . */
+    ohciFramerateCalcNew(pThis);
+    RTSemEventSignal(pThis->hSemEventFrame);
     RTCritSectLeave(&pThis->CritSect);
 }
@@ -3581 +3643 @@
 
 /**
- * Calculate frame timer variables given a frame rate (1,000 Hz is the full speed).
- */
-static void ohciCalcTimerIntervals(POHCI pThis, uint32_t u32FrameRate)
-{
-    Assert(u32FrameRate <= OHCI_DEFAULT_TIMER_FREQ);
-
-    pThis->cTicksPerFrame = pThis->u64TimerHz / u32FrameRate;
-    if (!pThis->cTicksPerFrame)
-        pThis->cTicksPerFrame = 1;
-    pThis->cTicksPerUsbTick   = pThis->u64TimerHz >= VUSB_BUS_HZ ? pThis->u64TimerHz / VUSB_BUS_HZ : 1;
-    pThis->nsWait             = RT_NS_1SEC / u32FrameRate;
-    pThis->uFrameRate         = u32FrameRate;
-}
-
-/**
  * Go over the in-flight URB list and cancel any URBs that are no longer in use.
  * This occurs when the host removes EDs or TDs from the lists and we don't notice
@@ -3694 +3741 @@
 static void ohciStartOfFrame(POHCI pThis)
 {
-    uint32_t    uNewFrameRate = pThis->uFrameRate;
 #ifdef LOG_ENABLED
     const uint32_t status_old = pThis->status;
@@ -3796 +3842 @@
      * Adjust the frame timer interval based on idle detection.
      */
-    if (pThis->fIdle)
-    {
-        pThis->cIdleCycles++;
-        /* Set the new frame rate based on how long we've been idle. Tunable. */
-        switch (pThis->cIdleCycles)
-        {
-        case 4: uNewFrameRate = 500;    break;  /*  2ms interval */
-        case 16:uNewFrameRate = 125;    break;  /*  8ms interval */
-        case 24:uNewFrameRate = 50;     break;  /* 20ms interval */
-        default:    break;
-        }
-        /* Avoid overflow. */
-        if (pThis->cIdleCycles > 60000)
-            pThis->cIdleCycles = 20000;
-    }
-    else
-    {
-        if (pThis->cIdleCycles)
-        {
-            pThis->cIdleCycles = 0;
-            uNewFrameRate      = OHCI_DEFAULT_TIMER_FREQ;
-        }
-    }
-    if (uNewFrameRate != pThis->uFrameRate)
-        ohciCalcTimerIntervals(pThis, uNewFrameRate);
+    ohciFramerateCalcNew(pThis);
 }