|
 |
958e1b |
From c5deaa70b6b347189a53bd2b058164dffc439a59 Mon Sep 17 00:00:00 2001
|
|
|
958e1b |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
958e1b |
Date: Fri, 11 Jul 2014 14:20:56 +0200
|
|
|
958e1b |
Subject: [PATCH 22/43] uhci: invalidate queue on device address changes
|
|
|
958e1b |
|
|
|
958e1b |
Message-id: <1405088470-24115-24-git-send-email-kraxel@redhat.com>
|
|
|
958e1b |
Patchwork-id: 59851
|
|
|
958e1b |
O-Subject: [RHEL-7.1 qemu-kvm PATCH 23/37] uhci: invalidate queue on device address changes
|
|
|
958e1b |
Bugzilla: 1111450
|
|
|
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 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
958e1b |
(cherry picked from commit c348e481759057c925cce4bf54336f1518b8c702)
|
|
|
958e1b |
---
|
|
|
958e1b |
hw/usb/hcd-uhci.c | 2 ++
|
|
|
958e1b |
1 file changed, 2 insertions(+)
|
|
|
958e1b |
|
|
|
958e1b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
958e1b |
---
|
|
|
958e1b |
hw/usb/hcd-uhci.c | 2 ++
|
|
|
958e1b |
1 file changed, 2 insertions(+)
|
|
|
958e1b |
|
|
|
958e1b |
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
|
|
|
958e1b |
index 989c37a..f38f737 100644
|
|
|
958e1b |
--- a/hw/usb/hcd-uhci.c
|
|
|
958e1b |
+++ b/hw/usb/hcd-uhci.c
|
|
|
958e1b |
@@ -254,9 +254,11 @@ static bool uhci_queue_verify(UHCIQueue *queue, uint32_t qh_addr, UHCI_TD *td,
|
|
|
958e1b |
uint32_t td_addr, bool queuing)
|
|
|
958e1b |
{
|
|
|
958e1b |
UHCIAsync *first = QTAILQ_FIRST(&queue->asyncs);
|
|
|
958e1b |
+ uint32_t queue_token_addr = (queue->token >> 8) & 0x7f;
|
|
|
958e1b |
|
|
|
958e1b |
return queue->qh_addr == qh_addr &&
|
|
|
958e1b |
queue->token == uhci_queue_token(td) &&
|
|
|
958e1b |
+ queue_token_addr == queue->ep->dev->addr &&
|
|
|
958e1b |
(queuing || !(td->ctrl & TD_CTRL_ACTIVE) || first == NULL ||
|
|
|
958e1b |
first->td_addr == td_addr);
|
|
|
958e1b |
}
|
|
|
958e1b |
--
|
|
|
958e1b |
1.8.3.1
|
|
|
958e1b |
|