|
 |
958e1b |
From 38134ed684f0ec9eb40e3051e3052e5fd3bad000 Mon Sep 17 00:00:00 2001
|
|
|
958e1b |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
958e1b |
Date: Fri, 11 Jul 2014 14:20:57 +0200
|
|
|
958e1b |
Subject: [PATCH 23/43] xhci iso: fix time calculation
|
|
|
958e1b |
|
|
|
958e1b |
Message-id: <1405088470-24115-25-git-send-email-kraxel@redhat.com>
|
|
|
958e1b |
Patchwork-id: 59852
|
|
|
958e1b |
O-Subject: [RHEL-7.1 qemu-kvm PATCH 24/37] xhci iso: fix time calculation
|
|
|
958e1b |
Bugzilla: 949385
|
|
|
958e1b |
RH-Acked-by: Dr. David Alan Gilbert (git) <dgilbert@redhat.com>
|
|
|
958e1b |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
958e1b |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
958e1b |
|
|
|
958e1b |
Frameid specifies frames not microframes, so we
|
|
|
958e1b |
need to shift it to get the microframe index.
|
|
|
958e1b |
|
|
|
958e1b |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
958e1b |
(cherry picked from commit 786ad214c72226fa5bd4ebf18aeb4c6b54d3ba80)
|
|
|
958e1b |
---
|
|
|
958e1b |
hw/usb/hcd-xhci.c | 4 ++--
|
|
|
958e1b |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
958e1b |
|
|
|
958e1b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
958e1b |
---
|
|
|
958e1b |
hw/usb/hcd-xhci.c | 4 ++--
|
|
|
958e1b |
1 file changed, 2 insertions(+), 2 deletions(-)
|
|
|
958e1b |
|
|
|
958e1b |
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
|
|
|
958e1b |
index 5f0840b..2799539 100644
|
|
|
958e1b |
--- a/hw/usb/hcd-xhci.c
|
|
|
958e1b |
+++ b/hw/usb/hcd-xhci.c
|
|
|
958e1b |
@@ -1977,8 +1977,8 @@ static void xhci_calc_iso_kick(XHCIState *xhci, XHCITransfer *xfer,
|
|
|
958e1b |
xfer->mfindex_kick = asap;
|
|
|
958e1b |
}
|
|
|
958e1b |
} else {
|
|
|
958e1b |
- xfer->mfindex_kick = (xfer->trbs[0].control >> TRB_TR_FRAMEID_SHIFT)
|
|
|
958e1b |
- & TRB_TR_FRAMEID_MASK;
|
|
|
958e1b |
+ xfer->mfindex_kick = ((xfer->trbs[0].control >> TRB_TR_FRAMEID_SHIFT)
|
|
|
958e1b |
+ & TRB_TR_FRAMEID_MASK) << 3;
|
|
|
958e1b |
xfer->mfindex_kick |= mfindex & ~0x3fff;
|
|
|
958e1b |
if (xfer->mfindex_kick < mfindex) {
|
|
|
958e1b |
xfer->mfindex_kick += 0x4000;
|
|
|
958e1b |
--
|
|
|
958e1b |
1.8.3.1
|
|
|
958e1b |
|