|
 |
0a122b |
From e29585889b3c33b370bf09c58cb4a0f4b3fae482 Mon Sep 17 00:00:00 2001
|
|
|
0a122b |
From: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
0a122b |
Date: Wed, 18 Dec 2013 20:05:26 +0100
|
|
|
0a122b |
Subject: [PATCH 10/16] ehci: implement port wakeup
|
|
|
0a122b |
|
|
|
0a122b |
RH-Author: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
0a122b |
Message-id: <1387397126-27754-1-git-send-email-marcel.a@redhat.com>
|
|
|
0a122b |
Patchwork-id: 56377
|
|
|
0a122b |
O-Subject: [RHEL-7 qemu-kvm PATCH v2] ehci: implement port wakeup
|
|
|
0a122b |
Bugzilla: 1039513
|
|
|
0a122b |
RH-Acked-by: Michael S. Tsirkin <mst@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
0a122b |
RH-Acked-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
From: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
0a122b |
|
|
|
0a122b |
Update portsc register and raise irq in case a suspended
|
|
|
0a122b |
port is woken up, so remote wakeup works on our ehci ports.
|
|
|
0a122b |
|
|
|
0a122b |
bugzilla: #1039513 ASSIGNED - Gerd Hoffmann - backport remote wakeup for ehci
|
|
|
0a122b |
brew: http://brewweb.devel.redhat.com/brew/taskinfo?taskID=6755209
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
0a122b |
Signed-off-by: Marcel Apfelbaum <marcel.a@redhat.com>
|
|
|
0a122b |
(cherry picked from commit e489df40caa96d895d9672d77f536f23c9e42f94)
|
|
|
0a122b |
|
|
|
0a122b |
Conflicts:
|
|
|
0a122b |
trace-events
|
|
|
0a122b |
---
|
|
|
0a122b |
v1->v2:
|
|
|
0a122b |
Rebased the patch. Minor conflicts.
|
|
|
0a122b |
|
|
|
0a122b |
hw/usb/hcd-ehci.c | 18 ++++++++++++++++--
|
|
|
0a122b |
trace-events | 3 +++
|
|
|
0a122b |
2 files changed, 19 insertions(+), 2 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
0a122b |
---
|
|
|
0a122b |
hw/usb/hcd-ehci.c | 18 ++++++++++++++++--
|
|
|
0a122b |
trace-events | 3 +++
|
|
|
0a122b |
2 files changed, 19 insertions(+), 2 deletions(-)
|
|
|
0a122b |
|
|
|
0a122b |
diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c
|
|
|
0a122b |
index 0d3799d..02d2ab7 100644
|
|
|
0a122b |
--- a/hw/usb/hcd-ehci.c
|
|
|
0a122b |
+++ b/hw/usb/hcd-ehci.c
|
|
|
0a122b |
@@ -826,9 +826,9 @@ static void ehci_child_detach(USBPort *port, USBDevice *child)
|
|
|
0a122b |
static void ehci_wakeup(USBPort *port)
|
|
|
0a122b |
{
|
|
|
0a122b |
EHCIState *s = port->opaque;
|
|
|
0a122b |
- uint32_t portsc = s->portsc[port->index];
|
|
|
0a122b |
+ uint32_t *portsc = &s->portsc[port->index];
|
|
|
0a122b |
|
|
|
0a122b |
- if (portsc & PORTSC_POWNER) {
|
|
|
0a122b |
+ if (*portsc & PORTSC_POWNER) {
|
|
|
0a122b |
USBPort *companion = s->companion_ports[port->index];
|
|
|
0a122b |
if (companion->ops->wakeup) {
|
|
|
0a122b |
companion->ops->wakeup(companion);
|
|
|
0a122b |
@@ -836,6 +836,12 @@ static void ehci_wakeup(USBPort *port)
|
|
|
0a122b |
return;
|
|
|
0a122b |
}
|
|
|
0a122b |
|
|
|
0a122b |
+ if (*portsc & PORTSC_SUSPEND) {
|
|
|
0a122b |
+ trace_usb_ehci_port_wakeup(port->index);
|
|
|
0a122b |
+ *portsc |= PORTSC_FPRES;
|
|
|
0a122b |
+ ehci_raise_irq(s, USBSTS_PCD);
|
|
|
0a122b |
+ }
|
|
|
0a122b |
+
|
|
|
0a122b |
qemu_bh_schedule(s->async_bh);
|
|
|
0a122b |
}
|
|
|
0a122b |
|
|
|
0a122b |
@@ -1067,6 +1073,14 @@ static void ehci_port_write(void *ptr, hwaddr addr,
|
|
|
0a122b |
}
|
|
|
0a122b |
}
|
|
|
0a122b |
|
|
|
0a122b |
+ if ((val & PORTSC_SUSPEND) && !(*portsc & PORTSC_SUSPEND)) {
|
|
|
0a122b |
+ trace_usb_ehci_port_suspend(port);
|
|
|
0a122b |
+ }
|
|
|
0a122b |
+ if (!(val & PORTSC_FPRES) && (*portsc & PORTSC_FPRES)) {
|
|
|
0a122b |
+ trace_usb_ehci_port_resume(port);
|
|
|
0a122b |
+ val &= ~PORTSC_SUSPEND;
|
|
|
0a122b |
+ }
|
|
|
0a122b |
+
|
|
|
0a122b |
*portsc &= ~PORTSC_RO_MASK;
|
|
|
0a122b |
*portsc |= val;
|
|
|
0a122b |
trace_usb_ehci_portsc_change(addr + PORTSC_BEGIN, addr >> 2, *portsc, old);
|
|
|
0a122b |
diff --git a/trace-events b/trace-events
|
|
|
0a122b |
index e9ee94f..dbbd25d 100644
|
|
|
0a122b |
--- a/trace-events
|
|
|
0a122b |
+++ b/trace-events
|
|
|
0a122b |
@@ -303,6 +303,9 @@ usb_ehci_sitd(uint32_t addr, uint32_t nxt, uint32_t active) "ITD @ %08x: next %0
|
|
|
0a122b |
usb_ehci_port_attach(uint32_t port, const char *owner, const char *device) "attach port #%d, owner %s, device %s"
|
|
|
0a122b |
usb_ehci_port_detach(uint32_t port, const char *owner) "detach port #%d, owner %s"
|
|
|
0a122b |
usb_ehci_port_reset(uint32_t port, int enable) "reset port #%d - %d"
|
|
|
0a122b |
+usb_ehci_port_suspend(uint32_t port) "port #%d"
|
|
|
0a122b |
+usb_ehci_port_wakeup(uint32_t port) "port #%d"
|
|
|
0a122b |
+usb_ehci_port_resume(uint32_t port) "port #%d"
|
|
|
0a122b |
usb_ehci_queue_action(void *q, const char *action) "q %p: %s"
|
|
|
0a122b |
usb_ehci_packet_action(void *q, void *p, const char *action) "q %p p %p: %s"
|
|
|
0a122b |
usb_ehci_irq(uint32_t level, uint32_t frindex, uint32_t sts, uint32_t mask) "level %d, frindex 0x%04x, sts 0x%x, mask 0x%x"
|
|
|
0a122b |
--
|
|
|
0a122b |
1.7.1
|
|
|
0a122b |
|