[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 4/4] wakeup: uhci support
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 4/4] wakeup: uhci support |
Date: |
Thu, 6 Sep 2012 09:42:47 +0200 |
Implement the (intel-specific) pci configuration register 0xc4, which is
a bitmask saying which ports are allowed to wakeup the system.
Also assign gpe bit 0x0b (used only in case uhci handles device 01.2).
Signed-off-by: Gerd Hoffmann <address@hidden>
---
hw/usb/hcd-uhci.c | 35 +++++++++++++++++++++++++++++++++++
1 files changed, 35 insertions(+), 0 deletions(-)
diff --git a/hw/usb/hcd-uhci.c b/hw/usb/hcd-uhci.c
index b0db921..cc0e2de 100644
--- a/hw/usb/hcd-uhci.c
+++ b/hw/usb/hcd-uhci.c
@@ -32,6 +32,7 @@
#include "iov.h"
#include "dma.h"
#include "trace.h"
+#include "sysemu.h"
//#define DEBUG
//#define DEBUG_DUMP_DATA
@@ -129,6 +130,7 @@ struct UHCIState {
uint32_t fl_base_addr; /* frame list base address */
uint8_t sof_timing;
uint8_t status2; /* bit 0 and 1 are used to generate UHCI_STS_USBINT */
+ uint8_t system_wakeup;
int64_t expire_time;
QEMUTimer *frame_timer;
QEMUBH *bh;
@@ -677,6 +679,22 @@ static void uhci_wakeup(USBPort *port1)
}
}
+static void uhci_wakeup_endpoint(USBBus *bus, USBEndpoint *ep)
+{
+ USBPort *port1 = ep->dev->port;
+ UHCIState *s = port1->opaque;
+
+ if (!(s->system_wakeup & (1 << port1->index))) {
+ return;
+ }
+ if (s->dev.devfn == PCI_DEVFN(1, 2)) {
+ /* piix3/4 chipset uhci controller */
+ qemu_system_wakeup_request(QEMU_WAKEUP_REASON_GPE_b);
+ } else {
+ qemu_system_wakeup_request(QEMU_WAKEUP_REASON_OTHER);
+ }
+}
+
static USBDevice *uhci_find_device(UHCIState *s, uint8_t addr)
{
USBDevice *dev;
@@ -1209,6 +1227,7 @@ static USBPortOps uhci_port_ops = {
};
static USBBusOps uhci_bus_ops = {
+ .wakeup_endpoint = uhci_wakeup_endpoint,
};
static int usb_uhci_common_initfn(PCIDevice *dev)
@@ -1270,6 +1289,17 @@ static int usb_uhci_common_initfn(PCIDevice *dev)
return 0;
}
+static void usb_uhci_intel_write_config(PCIDevice *dev, uint32_t addr,
+ uint32_t val, int len)
+{
+ UHCIState *s = DO_UPCAST(UHCIState, dev, dev);
+
+ pci_default_write_config(dev, addr, val, len);
+ if (addr == 0xc4) {
+ s->system_wakeup = val;
+ }
+}
+
static int usb_uhci_vt82c686b_initfn(PCIDevice *dev)
{
UHCIState *s = DO_UPCAST(UHCIState, dev, dev);
@@ -1306,6 +1336,7 @@ static void piix3_uhci_class_init(ObjectClass *klass,
void *data)
k->init = usb_uhci_common_initfn;
k->exit = usb_uhci_exit;
+ k->config_write = usb_uhci_intel_write_config;
k->vendor_id = PCI_VENDOR_ID_INTEL;
k->device_id = PCI_DEVICE_ID_INTEL_82371SB_2;
k->revision = 0x01;
@@ -1328,6 +1359,7 @@ static void piix4_uhci_class_init(ObjectClass *klass,
void *data)
k->init = usb_uhci_common_initfn;
k->exit = usb_uhci_exit;
+ k->config_write = usb_uhci_intel_write_config;
k->vendor_id = PCI_VENDOR_ID_INTEL;
k->device_id = PCI_DEVICE_ID_INTEL_82371AB_2;
k->revision = 0x01;
@@ -1371,6 +1403,7 @@ static void ich9_uhci1_class_init(ObjectClass *klass,
void *data)
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
k->init = usb_uhci_common_initfn;
+ k->config_write = usb_uhci_intel_write_config;
k->vendor_id = PCI_VENDOR_ID_INTEL;
k->device_id = PCI_DEVICE_ID_INTEL_82801I_UHCI1;
k->revision = 0x03;
@@ -1392,6 +1425,7 @@ static void ich9_uhci2_class_init(ObjectClass *klass,
void *data)
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
k->init = usb_uhci_common_initfn;
+ k->config_write = usb_uhci_intel_write_config;
k->vendor_id = PCI_VENDOR_ID_INTEL;
k->device_id = PCI_DEVICE_ID_INTEL_82801I_UHCI2;
k->revision = 0x03;
@@ -1413,6 +1447,7 @@ static void ich9_uhci3_class_init(ObjectClass *klass,
void *data)
PCIDeviceClass *k = PCI_DEVICE_CLASS(klass);
k->init = usb_uhci_common_initfn;
+ k->config_write = usb_uhci_intel_write_config;
k->vendor_id = PCI_VENDOR_ID_INTEL;
k->device_id = PCI_DEVICE_ID_INTEL_82801I_UHCI3;
k->revision = 0x03;
--
1.7.1
- Re: [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable, (continued)
- Re: [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable, Peter Maydell, 2012/09/06
- Re: [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable, Gerd Hoffmann, 2012/09/06
- Re: [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable, Blue Swirl, 2012/09/08
- Re: [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable, Paolo Bonzini, 2012/09/08
- Re: [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable, Anthony Liguori, 2012/09/10
- Re: [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable, Paolo Bonzini, 2012/09/10
- Re: [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable, Peter Maydell, 2012/09/10
- Re: [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable, Anthony Liguori, 2012/09/10
- Re: [Qemu-devel] [PATCH 3/4] wakeup: make serial configurable, Gerd Hoffmann, 2012/09/10
[Qemu-devel] [PATCH 1/4] wakeup: add acpi gpe wakeup reasons, Gerd Hoffmann, 2012/09/06
[Qemu-devel] [PATCH 4/4] wakeup: uhci support,
Gerd Hoffmann <=
[Qemu-devel] [PATCH 2/4] wakeup: make ps/2 configurable, Gerd Hoffmann, 2012/09/06