|
 |
9ae3a8 |
From 4092201c71c55673c526887b3985002d8a9ba2d9 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
Date: Wed, 7 Aug 2013 09:22:45 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 14/28] xhci: add XHCISlot->addressed
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1375867368-18979-3-git-send-email-kraxel@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 53039
|
|
|
9ae3a8 |
O-Subject: [RHEL-7 qemu-kvm PATCH 2/5] xhci: add XHCISlot->addressed
|
|
|
9ae3a8 |
Bugzilla: 838170
|
|
|
9ae3a8 |
RH-Acked-by: Hans de Goede <hdegoede@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Laszlo Ersek <lersek@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Orit Wasserman <owasserm@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Preparing for live-migration support, post_load will need that.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
(cherry picked from commit 4034e6938a4cba090a8fac02499c8a9567201665)
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/usb/hcd-xhci.c | 3 +++
|
|
|
9ae3a8 |
1 file changed, 3 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
hw/usb/hcd-xhci.c | 3 +++
|
|
|
9ae3a8 |
1 files changed, 3 insertions(+), 0 deletions(-)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
|
|
|
9ae3a8 |
index d88c1ae..4111e68 100644
|
|
|
9ae3a8 |
--- a/hw/usb/hcd-xhci.c
|
|
|
9ae3a8 |
+++ b/hw/usb/hcd-xhci.c
|
|
|
9ae3a8 |
@@ -405,6 +405,7 @@ struct XHCIEPContext {
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
typedef struct XHCISlot {
|
|
|
9ae3a8 |
bool enabled;
|
|
|
9ae3a8 |
+ bool addressed;
|
|
|
9ae3a8 |
dma_addr_t ctx;
|
|
|
9ae3a8 |
USBPort *uport;
|
|
|
9ae3a8 |
XHCIEPContext * eps[31];
|
|
|
9ae3a8 |
@@ -2041,6 +2042,7 @@ static TRBCCode xhci_disable_slot(XHCIState *xhci, unsigned int slotid)
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
xhci->slots[slotid-1].enabled = 0;
|
|
|
9ae3a8 |
+ xhci->slots[slotid-1].addressed = 0;
|
|
|
9ae3a8 |
return CC_SUCCESS;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@@ -2167,6 +2169,7 @@ static TRBCCode xhci_address_slot(XHCIState *xhci, unsigned int slotid,
|
|
|
9ae3a8 |
xhci_dma_write_u32s(xhci, octx, slot_ctx, sizeof(slot_ctx));
|
|
|
9ae3a8 |
xhci_dma_write_u32s(xhci, octx+32, ep0_ctx, sizeof(ep0_ctx));
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+ xhci->slots[slotid-1].addressed = 1;
|
|
|
9ae3a8 |
return res;
|
|
|
9ae3a8 |
}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.7.1
|
|
|
9ae3a8 |
|