From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39281) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScZ4F-0000SP-G1 for qemu-devel@nongnu.org; Thu, 07 Jun 2012 05:31:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ScZ42-0004Hu-EN for qemu-devel@nongnu.org; Thu, 07 Jun 2012 05:31:47 -0400 Received: from mx1.redhat.com ([209.132.183.28]:32000) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ScZ42-0004Gc-5z for qemu-devel@nongnu.org; Thu, 07 Jun 2012 05:31:34 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id q579VWcG016913 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK) for ; Thu, 7 Jun 2012 05:31:32 -0400 From: Gerd Hoffmann Date: Thu, 7 Jun 2012 11:31:22 +0200 Message-Id: <1339061486-28513-34-git-send-email-kraxel@redhat.com> In-Reply-To: <1339061486-28513-1-git-send-email-kraxel@redhat.com> References: <1339061486-28513-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 33/37] ehci: fix halt status handling List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann When the enable bits for controller / async schedule / periodic schedule change just make sure we kick the frame timer and let ehci_advance_periodic_state and ehci_advance_async_state handle the controller state changes. This will make ehci set USBSTS_HALT when the controller shutdown is actually done, once both schedules are in inactive state and the USBSTS_PSS and USBSTS_ASS bits are clear. Signed-off-by: Gerd Hoffmann --- hw/usb/hcd-ehci.c | 39 ++++++++++++++++++++++++--------------- 1 files changed, 24 insertions(+), 15 deletions(-) diff --git a/hw/usb/hcd-ehci.c b/hw/usb/hcd-ehci.c index 0a550f9..f77a26d 100644 --- a/hw/usb/hcd-ehci.c +++ b/hw/usb/hcd-ehci.c @@ -586,6 +586,17 @@ static inline void ehci_commit_interrupt(EHCIState *s) s->usbsts_pending = 0; } +static void ehci_update_halt(EHCIState *s) +{ + if (s->usbcmd & USBCMD_RUNSTOP) { + ehci_clear_usbsts(s, USBSTS_HALT); + } else { + if (s->astate == EST_INACTIVE && s->pstate == EST_INACTIVE) { + ehci_set_usbsts(s, USBSTS_HALT); + } + } +} + static void ehci_set_state(EHCIState *s, int async, int state) { if (async) { @@ -593,6 +604,7 @@ static void ehci_set_state(EHCIState *s, int async, int state) s->astate = state; if (s->astate == EST_INACTIVE) { ehci_clear_usbsts(s, USBSTS_ASS); + ehci_update_halt(s); } else { ehci_set_usbsts(s, USBSTS_ASS); } @@ -601,6 +613,7 @@ static void ehci_set_state(EHCIState *s, int async, int state) s->pstate = state; if (s->pstate == EST_INACTIVE) { ehci_clear_usbsts(s, USBSTS_PSS); + ehci_update_halt(s); } else { ehci_set_usbsts(s, USBSTS_PSS); } @@ -1138,21 +1151,15 @@ static void ehci_mem_writel(void *ptr, target_phys_addr_t addr, uint32_t val) break; } - if ((val & USBCMD_RUNSTOP) && !(s->usbcmd & USBCMD_RUNSTOP)) { - qemu_mod_timer(s->frame_timer, qemu_get_clock_ns(vm_clock)); - SET_LAST_RUN_CLOCK(s); - ehci_clear_usbsts(s, USBSTS_HALT); - } - - if (!(val & USBCMD_RUNSTOP) && (s->usbcmd & USBCMD_RUNSTOP)) { - qemu_del_timer(s->frame_timer); - qemu_bh_cancel(s->async_bh); - ehci_queues_rip_all(s, 0); - ehci_queues_rip_all(s, 1); - ehci_set_usbsts(s, USBSTS_HALT); + if (((USBCMD_RUNSTOP | USBCMD_PSE | USBCMD_ASE) & val) != + ((USBCMD_RUNSTOP | USBCMD_PSE | USBCMD_ASE) & s->usbcmd)) { + if (!ehci_enabled(s)) { + qemu_mod_timer(s->frame_timer, qemu_get_clock_ns(vm_clock)); + SET_LAST_RUN_CLOCK(s); + } + ehci_update_halt(s); } - /* not supporting dynamic frame list size at the moment */ if ((val & USBCMD_FLS) && !(s->usbcmd & USBCMD_FLS)) { fprintf(stderr, "attempt to set frame list size -- value %d\n", @@ -2291,7 +2298,7 @@ static void ehci_frame_timer(void *opaque) frames = ns_elapsed / FRAME_TIMER_NS; for (i = 0; i < frames; i++) { - if ( !(ehci->usbsts & USBSTS_HALT)) { + if (ehci_enabled(ehci)) { ehci->frindex += 8; if (ehci->frindex == 0x00002000) { @@ -2324,7 +2331,9 @@ static void ehci_frame_timer(void *opaque) */ qemu_bh_schedule(ehci->async_bh); - qemu_mod_timer(ehci->frame_timer, expire_time); + if (ehci_enabled(ehci)) { + qemu_mod_timer(ehci->frame_timer, expire_time); + } } static void ehci_async_bh(void *opaque) -- 1.7.1