From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MGY4I-0005SC-3X for qemu-devel@nongnu.org; Tue, 16 Jun 2009 08:47:14 -0400 Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MGY4D-0005Ox-6X for qemu-devel@nongnu.org; Tue, 16 Jun 2009 08:47:13 -0400 Received: from [199.232.76.173] (port=39205 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MGY4C-0005Og-Vp for qemu-devel@nongnu.org; Tue, 16 Jun 2009 08:47:09 -0400 Received: from mx2.redhat.com ([66.187.237.31]:53381) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MGY4C-0003vl-Go for qemu-devel@nongnu.org; Tue, 16 Jun 2009 08:47:08 -0400 Received: from int-mx2.corp.redhat.com (int-mx2.corp.redhat.com [172.16.27.26]) by mx2.redhat.com (8.13.8/8.13.8) with ESMTP id n5GCl50a023799 for ; Tue, 16 Jun 2009 08:47:05 -0400 Received: from ns3.rdu.redhat.com (ns3.rdu.redhat.com [10.11.255.199]) by int-mx2.corp.redhat.com (8.13.1/8.13.1) with ESMTP id n5GCl4q8020992 for ; Tue, 16 Jun 2009 08:47:05 -0400 Received: from dhcp-1-237.tlv.redhat.com (dhcp-1-237.tlv.redhat.com [10.35.1.237]) by ns3.rdu.redhat.com (8.13.8/8.13.8) with ESMTP id n5GCl32v028575 for ; Tue, 16 Jun 2009 08:47:04 -0400 Date: Tue, 16 Jun 2009 15:47:02 +0300 From: Gleb Natapov Message-ID: <20090616124702.GS19508@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Subject: [Qemu-devel] [PATCH] Register usb-uhci reset function. List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Update irq line on reset. Reseting irq line is required because racing irq from pci device will call piix3_set_irq(). piix3_set_irq() will remember current level in pci_irq_levels[]. The PIC line will be triggered if one of pci_irq_levels[] is set (depends on piix3 config). If for instance pci_irq_levels[0] and pci_irq_levels[1] are mapped to the same PIC irq and during reset pci_irq_levels[1] == 1, but device that drives pci_irq_levels[0] is initialized first the device driver will not be able to lower irq line. Without this patch RHEL4.8 hangs after reboot because usb interrupt does not go away. Signed-off-by: Gleb Natapov diff --git a/hw/usb-uhci.c b/hw/usb-uhci.c index 689d40a..2db9850 100644 --- a/hw/usb-uhci.c +++ b/hw/usb-uhci.c @@ -346,6 +346,7 @@ static void uhci_reset(UHCIState *s) } uhci_async_cancel_all(s); + uhci_update_irq(s); } static void uhci_save(QEMUFile *f, void *opaque) @@ -1093,6 +1094,7 @@ void usb_uhci_piix3_init(PCIBus *bus, int devfn) } s->frame_timer = qemu_new_timer(vm_clock, uhci_frame_timer, s); + qemu_register_reset(uhci_reset, 0, s); uhci_reset(s); /* Use region 4 for consistency with real hardware. BSD guests seem @@ -1127,6 +1129,7 @@ void usb_uhci_piix4_init(PCIBus *bus, int devfn) } s->frame_timer = qemu_new_timer(vm_clock, uhci_frame_timer, s); + qemu_register_reset(uhci_reset, 0, s); uhci_reset(s); /* Use region 4 for consistency with real hardware. BSD guests seem -- Gleb.