[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 06/22] xhci: set pls in xhci_port_update & xhci_port
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 06/22] xhci: set pls in xhci_port_update & xhci_port_reset |
Date: |
Tue, 30 Oct 2012 15:26:38 +0100 |
Set the port link state to the correct values in xhci_port_update and
xhci_port_reset functions.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/hcd-xhci.c | 26 ++++++++++++++++++++++++--
1 files changed, 24 insertions(+), 2 deletions(-)
diff --git a/hw/usb/hcd-xhci.c b/hw/usb/hcd-xhci.c
index 1db803c..84d1b26 100644
--- a/hw/usb/hcd-xhci.c
+++ b/hw/usb/hcd-xhci.c
@@ -2365,33 +2365,55 @@ static void xhci_port_notify(XHCIPort *port, uint32_t
bits)
static void xhci_port_update(XHCIPort *port, int is_detach)
{
+ uint32_t pls = PLS_RX_DETECT;
+
port->portsc = PORTSC_PP;
if (!is_detach && xhci_port_have_device(port)) {
port->portsc |= PORTSC_CCS;
switch (port->uport->dev->speed) {
case USB_SPEED_LOW:
port->portsc |= PORTSC_SPEED_LOW;
+ pls = PLS_POLLING;
break;
case USB_SPEED_FULL:
port->portsc |= PORTSC_SPEED_FULL;
+ pls = PLS_POLLING;
break;
case USB_SPEED_HIGH:
port->portsc |= PORTSC_SPEED_HIGH;
+ pls = PLS_POLLING;
break;
case USB_SPEED_SUPER:
port->portsc |= PORTSC_SPEED_SUPER;
+ port->portsc |= PORTSC_PED;
+ pls = PLS_U0;
break;
}
}
-
+ set_field(&port->portsc, pls, PORTSC_PLS);
xhci_port_notify(port, PORTSC_CSC);
}
static void xhci_port_reset(XHCIPort *port)
{
DPRINTF("xhci: port %d reset\n", port);
+ if (!xhci_port_have_device(port)) {
+ return;
+ }
+
usb_device_reset(port->uport->dev);
- port->portsc |= PORTSC_PRC | PORTSC_PED;
+
+ switch (port->uport->dev->speed) {
+ case USB_SPEED_LOW:
+ case USB_SPEED_FULL:
+ case USB_SPEED_HIGH:
+ set_field(&port->portsc, PLS_U0, PORTSC_PLS);
+ port->portsc |= PORTSC_PED;
+ break;
+ }
+
+ port->portsc &= ~PORTSC_PR;
+ xhci_port_notify(port, PORTSC_PRC);
}
static void xhci_reset(DeviceState *dev)
--
1.7.1
- [Qemu-devel] [PATCH 00/22] usb patch queue, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 04/22] xhci: add xhci_port_notify, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 02/22] xhci: s/xhci_update_port/xhci_port_update/, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 07/22] xhci: add port trace points, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 05/22] xhci: add xhci_port_reset, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 03/22] xhci: add xhci_port_have_device, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 06/22] xhci: set pls in xhci_port_update & xhci_port_reset,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 08/22] xhci: allow address slot being called multiple times, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 01/22] xhci: add {get, set}_field macros & enum for pls, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 18/22] usb/ehci-pci: dynamic type generation, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 22/22] trace: allow disabling events in events file, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 16/22] uhci: stick irq routing info into UHCIInfo too., Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 10/22] usb/ehci: Abstract away PCI DMA API, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 19/22] usb/ehci-pci: add ich9 00:1a.* variant, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 15/22] uhci: dynamic type generation, Gerd Hoffmann, 2012/10/30
- [Qemu-devel] [PATCH 14/22] usb/ehci: add sysbus variant, Gerd Hoffmann, 2012/10/30