| From 21946e621f14553b72cde7fae221ae390a427eac Mon Sep 17 00:00:00 2001 |
| From: Gerd Hoffmann <kraxel@redhat.com> |
| Date: Thu, 23 Feb 2012 13:24:00 +0000 |
| Subject: [PATCH 139/140] usb-ehci: fix reset |
| |
| Two reset fixes: |
| * pick up s->usbcmd value after ehci_reset call to make sure it |
| keeps the reset value and doesn't get rubbish filled in when |
| val is written back to the mmio register array later on. |
| * make sure the frame timer is zapped on reset. |
| |
| Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> |
| |
| hw/usb-ehci.c | 3 ++- |
| 1 file changed, 2 insertions(+), 1 deletion(-) |
| |
| diff --git a/hw/usb-ehci.c b/hw/usb-ehci.c |
| index ba1b9da..ad0f6e1 100644 |
| |
| |
| @@ -900,6 +900,7 @@ static void ehci_reset(void *opaque) |
| } |
| ehci_queues_rip_all(s, 0); |
| ehci_queues_rip_all(s, 1); |
| + qemu_del_timer(s->frame_timer); |
| } |
| |
| static uint32_t ehci_mem_readb(void *ptr, target_phys_addr_t addr) |
| @@ -1059,7 +1060,7 @@ static void ehci_mem_writel(void *ptr, target_phys_addr_t addr, uint32_t val) |
| |
| if (val & USBCMD_HCRESET) { |
| ehci_reset(s); |
| - val &= ~USBCMD_HCRESET; |
| + val = s->usbcmd; |
| } |
| |
| /* not supporting dynamic frame list size at the moment */ |
| -- |
| 1.7.9.3 |
| |