Subject: Re: Call for testers: ACPI suspend/resume, part 2
To: Jared D. McNeill <jmcneill@invisible.ca>
From: Matthias Drochner <M.Drochner@fz-juelich.de>
List: port-i386
Date: 12/20/2007 14:32:26
This is a multipart MIME message.

--==_Exmh_62093376977980
Content-Type: text/plain; charset=us-ascii


jmcneill@invisible.ca said:
> we really need to look at this USB issue

For me, the appended patch helps. Don't know what this
"dying" stuff is good for. In our situation it is
clearly wrong.

best regards
Matthias





-------------------------------------------------------------------
-------------------------------------------------------------------
Forschungszentrum Juelich GmbH
52425 Juelich

Sitz der Gesellschaft: Juelich
Eingetragen im Handelsregister des Amtsgerichts Dueren Nr. HR B 3498
Vorsitzende des Aufsichtsrats: MinDirig'in Baerbel Brumme-Bothe
Geschaeftsfuehrung: Prof. Dr. Achim Bachem (Vorsitzender),
Dr. Ulrich Krafft (stellv. Vorsitzender), Dr. Sebastian M. Schmidt
-------------------------------------------------------------------
-------------------------------------------------------------------

--==_Exmh_62093376977980
Content-Type: text/plain ; name="uhci.txt"; charset=us-ascii
Content-Description: uhci.txt
Content-Disposition: attachment; filename="uhci.txt"

#
# old_revision [0a771c46bfc69659df8e7e5ad7974204d8db8c5e]
#
# patch "sys/dev/usb/uhci.c"
#  from [38ae96c726e1a49959f585b2acae84bb049a27d5]
#    to [c942d5d432bbc177f736ac52d3938dcd2e13ed36]
#
============================================================
--- sys/dev/usb/uhci.c	38ae96c726e1a49959f585b2acae84bb049a27d5
+++ sys/dev/usb/uhci.c	c942d5d432bbc177f736ac52d3938dcd2e13ed36
@@ -1249,7 +1249,7 @@ uhci_intr1(uhci_softc_t *sc)
 		       USBDEVNAME(sc->sc_bus.bdev));
 	}
 	if (status & UHCI_STS_HCH) {
-		/* no acknowledge needed */
+		ack |= UHCI_STS_HCH;
 		if (!sc->sc_dying) {
 			printf("%s: host controller halted\n",
 			    USBDEVNAME(sc->sc_bus.bdev));
@@ -1257,7 +1257,6 @@ uhci_intr1(uhci_softc_t *sc)
 			uhci_dump_all(sc);
 #endif
 		}
-		sc->sc_dying = 1;
 	}
 
 	if (!ack)

--==_Exmh_62093376977980--