From owner-p4-projects@FreeBSD.ORG  Tue May 30 19:16:52 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id E91FD16AC48; Tue, 30 May 2006 19:16:51 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 202E016AC03
	for <perforce@freebsd.org>; Tue, 30 May 2006 19:16:50 +0000 (UTC)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id B12EF43D64
	for <perforce@freebsd.org>; Tue, 30 May 2006 19:16:48 +0000 (GMT)
	(envelope-from kmacy@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k4UJFUC2054608
	for <perforce@freebsd.org>; Tue, 30 May 2006 19:15:30 GMT
	(envelope-from kmacy@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k4UJFTYC054605
	for perforce@freebsd.org; Tue, 30 May 2006 19:15:29 GMT
	(envelope-from kmacy@freebsd.org)
Date: Tue, 30 May 2006 19:15:29 GMT
Message-Id: <200605301915.k4UJFTYC054605@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	kmacy@freebsd.org using -f
From: Kip Macy <kmacy@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 98148 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: Tue, 30 May 2006 19:17:07 -0000

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

Change 98148 by kmacy@kmacy_storage:sun4v_work on 2006/05/30 19:15:21

	don't register all 4 PCI interrupts for every device

Affected files ...

.. //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#41 edit

Differences ...

==== //depot/projects/kmacy_sun4v/src/sys/sun4v/sun4v/hv_pci.c#41 (text+ko) ====

@@ -426,41 +426,38 @@
 	struct hvpci_softc *sc;
 	int pciintr, rid;
 	int error;
-	int i;
+
 
 	sc = device_get_softc(dev);
 
-	pciintr = rman_get_start(ires);
+	rid = rman_get_start(ires);
+	pciintr = rid - 1;
+	printf("pciintr=0x%x\n", pciintr);
 	/* sun4v uses 1 through 4 interrupts */
 	KASSERT(pciintr >= 1 && pciintr <= 4, ("interrupt out of range"));
-	for (i = 1; i <= 4; i++) {
-	rid = pciintr = i;
-	pciintr--;
 	if (sc->hs_intr[pciintr] == NULL) {
 		if ((sc->hs_intr[pciintr] = bus_alloc_resource_any(dev,
-		    SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE)) == NULL) {
+			  SYS_RES_IRQ, &rid, RF_SHAREABLE | RF_ACTIVE)) == NULL) {
 			device_printf(dev, "couldn't alloc interrupt\n");
-			return (ENXIO);
+				return (ENXIO);
 		}
 		sc->hs_intrrefcnt[pciintr] = 1;
 	} else
 		sc->hs_intrrefcnt[pciintr]++;
-
+	
 	error = bus_setup_intr(dev, sc->hs_intr[pciintr], flags, intr, arg,
-	    cookiep);
+			       cookiep);
 	if (error) {
 		sc->hs_intrrefcnt[pciintr]--;
 		if (sc->hs_intrrefcnt[pciintr] == 0) {
 			bus_release_resource(dev, SYS_RES_IRQ,
-			    rman_get_rid(sc->hs_intr[pciintr]),
-			    sc->hs_intr[pciintr]);
+					     rman_get_rid(sc->hs_intr[pciintr]),
+					     sc->hs_intr[pciintr]);
 			sc->hs_intr[pciintr] = NULL;
 		}
 		device_printf(dev, "bus_setup_intr: %d\n", error);
-		return (error);
-	}
+			return (error);
 	}
-
 	return (0);
 }