summaryrefslogtreecommitdiffstats
path: root/hw
authorGerd Hoffmann <[email protected]>2011-05-30 14:24:29 (GMT)
committer Gerd Hoffmann <[email protected]>2011-06-23 09:28:06 (GMT)
commit16a2dee6b98ec0d4f60fa17f78ca989ce5c7f831 (patch) (side-by-side diff)
tree53b701a4b2e6eac16dfac44ed17cb1265f04fea4 /hw
parent82887262569d9222befadb6a98bf364beae30a7e (diff)
downloadqemu-kvm-16a2dee6b98ec0d4f60fa17f78ca989ce5c7f831.zip
qemu-kvm-16a2dee6b98ec0d4f60fa17f78ca989ce5c7f831.tar.gz
qemu-kvm-16a2dee6b98ec0d4f60fa17f78ca989ce5c7f831.tar.bz2
ehci: add freq + maxframes properties
Add properties for the wakeup rate and the max number of frames ehci will process at once. The wakeup rate defaults to 1000 which equals the usb frame rate. This can be reduced to make qemu wake up less often when ehci is active. In case the wakeup rate is reduced or the ehci timer is delayed due to latency issues elsewhere in qemu ehci will process multiple frames at once. The maxframes property specifies the upper limit for this. Signed-off-by: Gerd Hoffmann <[email protected]>
Diffstat (limited to 'hw') (more/less context) (ignore whitespace changes)
-rw-r--r--hw/usb-ehci.c14
1 files changed, 12 insertions, 2 deletions
diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c
index e33e546..fa9792e 100644
--- a/hw/usb-ehci.c
+++ b/hw/usb-ehci.c
@@ -373,6 +373,11 @@ struct EHCIState {
target_phys_addr_t mem_base;
int mem;
int num_ports;
+
+ /* properties */
+ uint32_t freq;
+ uint32_t maxframes;
+
/*
* EHCI spec version 1.0 Section 2.3
* Host Controller Operational Registers
@@ -2048,7 +2053,7 @@ static void ehci_frame_timer(void *opaque)
t_now = qemu_get_clock_ns(vm_clock);
- expire_time = t_now + (get_ticks_per_sec() / FRAME_TIMER_FREQ);
+ expire_time = t_now + (get_ticks_per_sec() / ehci->freq);
if (expire_time == t_now) {
expire_time++;
}
@@ -2073,7 +2078,7 @@ static void ehci_frame_timer(void *opaque)
ehci->sofv &= 0x000003ff;
}
- if (frames - i > 10) {
+ if (frames - i > ehci->maxframes) {
skipped_frames++;
} else {
ehci_advance_periodic_state(ehci);
@@ -2146,6 +2151,11 @@ static PCIDeviceInfo ehci_info = {
.device_id = PCI_DEVICE_ID_INTEL_82801D,
.revision = 0x10,
.class_id = PCI_CLASS_SERIAL_USB,
+ .qdev.props = (Property[]) {
+ DEFINE_PROP_UINT32("freq", EHCIState, freq, FRAME_TIMER_FREQ),
+ DEFINE_PROP_UINT32("maxframes", EHCIState, maxframes, 128),
+ DEFINE_PROP_END_OF_LIST(),
+ },
};
static int usb_ehci_initfn(PCIDevice *dev)