[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 6/6] ehci: improve expire time calculation
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 6/6] ehci: improve expire time calculation |
Date: |
Thu, 12 Jul 2012 15:08:39 +0200 |
Move down the expire time calculation down in the frame timer, to the
point where the timer is actually reloaded. This way we'll notice any
async_stepdown changes (especially resetting to 0 due to usb activity).
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/hcd-ehci.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
index 6040e86..b043e7c 100644
--- a/hw/usb/hcd-ehci.c
+++ b/hw/usb/hcd-ehci.c
@@ -2372,7 +2372,7 @@ static void ehci_frame_timer(void *opaque)
if (ehci_periodic_enabled(ehci) || ehci->pstate != EST_INACTIVE) {
need_timer++;
- expire_time = t_now + (get_ticks_per_sec() / FRAME_TIMER_FREQ);
+ ehci->async_stepdown = 0;
if (frames > ehci->maxframes) {
skipped_frames = frames - ehci->maxframes;
@@ -2391,8 +2391,6 @@ static void ehci_frame_timer(void *opaque)
if (ehci->async_stepdown < ehci->maxframes / 2) {
ehci->async_stepdown++;
}
- expire_time = t_now + (get_ticks_per_sec()
- * ehci->async_stepdown / FRAME_TIMER_FREQ);
ehci_update_frindex(ehci, frames);
ehci->last_run_ns += FRAME_TIMER_NS * frames;
}
@@ -2402,7 +2400,7 @@ static void ehci_frame_timer(void *opaque)
*/
if (ehci_async_enabled(ehci) || ehci->astate != EST_INACTIVE) {
need_timer++;
- qemu_bh_schedule(ehci->async_bh);
+ ehci_advance_async_state(ehci);
}
ehci_commit_irq(ehci);
@@ -2412,6 +2410,8 @@ static void ehci_frame_timer(void *opaque)
}
if (need_timer) {
+ expire_time = t_now + (get_ticks_per_sec()
+ * (ehci->async_stepdown+1) / FRAME_TIMER_FREQ);
qemu_mod_timer(ehci->frame_timer, expire_time);
}
}
--
1.7.1
- [Qemu-devel] [PULL 0/6] usb patch queue, Gerd Hoffmann, 2012/07/12
- [Qemu-devel] [PATCH 3/6] uhci: initialize expire_time when loading v1 vmstate, Gerd Hoffmann, 2012/07/12
- [Qemu-devel] [PATCH 5/6] ehci: implement Interrupt Threshold Control support, Gerd Hoffmann, 2012/07/12
- [Qemu-devel] [PATCH 4/6] ehci: raise irq in the frame timer, Gerd Hoffmann, 2012/07/12
- [Qemu-devel] [PATCH 1/6] scsi: add free_request callback, Gerd Hoffmann, 2012/07/12
- [Qemu-devel] [PATCH 6/6] ehci: improve expire time calculation,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 2/6] usb: add usb attached scsi emulation, Gerd Hoffmann, 2012/07/12