From owner-p4-projects@FreeBSD.ORG  Sun Mar  9 09:04:59 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9CC791065672; Sun,  9 Mar 2008 09:04:59 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5C6D6106566B
	for <perforce@FreeBSD.org>; Sun,  9 Mar 2008 09:04:59 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 480308FC1F
	for <perforce@FreeBSD.org>; Sun,  9 Mar 2008 09:04:59 +0000 (UTC)
	(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m2994xTh072377
	for <perforce@FreeBSD.org>; Sun, 9 Mar 2008 09:04:59 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m2994x1S072375
	for perforce@freebsd.org; Sun, 9 Mar 2008 09:04:59 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Sun, 9 Mar 2008 09:04:59 GMT
Message-Id: <200803090904.m2994x1S072375@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 137211 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 09 Mar 2008 09:05:00 -0000

http://perforce.freebsd.org/chv.cgi?CH=137211

Change 137211 by hselasky@hselasky_laptop001 on 2008/03/09 09:04:40

	
	EHCI bugfix from Ivan Voras.
	
	See "usb/120017: CS5536 (AMD Geode) USB 2.0 quirk".
	
	PR:		usb/120017

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#30 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/ehci_pci.c#30 (text+ko) ====

@@ -150,6 +150,9 @@
 	if (device_id == 0x10227463)
 		return "AMD 8111 USB 2.0 controller";
 
+	if (device_id == 0x20951022)
+		return ("AMD CS5536 (Geode) USB 2.0 controller");
+
 	if (device_id == 0x43451002)
 		return "ATI SB200 USB 2.0 controller";
 	if (device_id == 0x43731002)
@@ -235,9 +238,14 @@
 	case PCI_USBREV_PRE_1_0:
 	case PCI_USBREV_1_0:
 	case PCI_USBREV_1_1:
-		sc->sc_bus.usbrev = USBREV_UNKNOWN;
-		device_printf(self, "pre-2.0 USB rev\n");
-		return (ENXIO);
+		/*
+		 * NOTE: some EHCI USB controllers have the wrong USB
+		 * revision number. It appears those controllers are
+		 * fully compliant so we just ignore this value in
+		 * some common cases.
+		 */
+		device_printf(self, "pre-2.0 USB revision (ignored)\n");
+		/* fallthrough */
 	case PCI_USBREV_2_0:
 		sc->sc_bus.usbrev = USBREV_2_0;
 		break;