From owner-p4-projects@FreeBSD.ORG  Thu Aug  5 15:48:38 2010
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 8EDA9106567B; Thu,  5 Aug 2010 15:48:38 +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 5394B106566B
	for <perforce@FreeBSD.org>; Thu,  5 Aug 2010 15:48:38 +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 25EEB8FC1A
	for <perforce@FreeBSD.org>; Thu,  5 Aug 2010 15:48:38 +0000 (UTC)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id o75FmcWq006119
	for <perforce@FreeBSD.org>; Thu, 5 Aug 2010 15:48:38 GMT
	(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.4/8.14.4/Submit) id o75Fmc4g006117
	for perforce@freebsd.org; Thu, 5 Aug 2010 15:48:38 GMT
	(envelope-from hselasky@FreeBSD.org)
Date: Thu, 5 Aug 2010 15:48:38 GMT
Message-Id: <201008051548.o75Fmc4g006117@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>
Precedence: bulk
Cc: 
Subject: PERFORCE change 181868 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Thu, 05 Aug 2010 15:48:38 -0000

http://p4web.freebsd.org/@@181868?ac=10

Change 181868 by hselasky@hselasky_laptop001 on 2010/08/05 15:48:33

	USB controller (XHCI):
		- make vendor ID string nicer
		- correct extended capabilities scan loop

Affected files ...

.. //depot/projects/usb/src/sys/dev/usb/controller/xhci_pci.c#7 edit

Differences ...

==== //depot/projects/usb/src/sys/dev/usb/controller/xhci_pci.c#7 (text+ko) ====

@@ -198,7 +198,7 @@
 	}
 	device_set_ivars(sc->sc_bus.bdev, &sc->sc_bus);
 
-	sprintf(sc->sc_vendor, "(0x%04x)", pci_get_vendor(self));
+	sprintf(sc->sc_vendor, "0x%04x", pci_get_vendor(self));
 
 #if (__FreeBSD_version >= 700031)
 	err = bus_setup_intr(self, sc->sc_irq_res, INTR_TYPE_BIO | INTR_MPSAFE,
@@ -276,31 +276,34 @@
 {
 	struct xhci_softc *sc = device_get_softc(self);
 	uint32_t cparams;
+	uint32_t eecp;
 	uint32_t eec;
 	uint16_t to;
-	uint8_t eecp;
 	uint8_t bios_sem;
 
 	cparams = XREAD4(sc, capa, XHCI_HCSPARAMS0);
 
+	eec = -1;
+
 	/* Synchronise with the BIOS if it owns the controller. */
-	for (eecp = XHCI_HCS0_XECP(cparams); eecp != 0;
-	    eecp = XHCI_XECP_NEXT(eec)) {
-		eec = pci_read_config(self, eecp, 4);
+	for (eecp = XHCI_HCS0_XECP(cparams) << 2; eecp != 0 && XHCI_XECP_NEXT(eec);
+	    eecp += XHCI_XECP_NEXT(eec) << 2) {
+		eec = XREAD4(sc, capa, eecp);
+
 		if (XHCI_XECP_ID(eec) != XHCI_ID_USB_LEGACY)
 			continue;
-		bios_sem = pci_read_config(self, eecp +
-		    XHCI_XECP_BIOS_SEM, 1);
+		bios_sem = XREAD1(sc, capa, eecp +
+		    XHCI_XECP_BIOS_SEM);
 		if (bios_sem == 0)
 			continue;
 		device_printf(sc->sc_bus.bdev, "waiting for BIOS "
 		    "to give up control\n");
-		pci_write_config(self, eecp +
-		    XHCI_XECP_OS_SEM, 1, 1);
+		XWRITE1(sc, capa, eecp +
+		    XHCI_XECP_OS_SEM, 1);
 		to = 500;
 		while (1) {
-			bios_sem = pci_read_config(self, eecp +
-			    XHCI_XECP_BIOS_SEM, 1);
+			bios_sem = XREAD1(sc, capa, eecp +
+			    XHCI_XECP_BIOS_SEM);
 			if (bios_sem == 0)
 				break;