From owner-p4-projects@FreeBSD.ORG  Fri Jul 12 22:18:45 2013
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id 4A5CE229; Fri, 12 Jul 2013 22:18:45 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 0B4AE227
 for <perforce@freebsd.org>; Fri, 12 Jul 2013 22:18:45 +0000 (UTC)
 (envelope-from jhb@freebsd.org)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org [8.8.178.74])
 by mx1.freebsd.org (Postfix) with ESMTP id F0B40124D
 for <perforce@freebsd.org>; Fri, 12 Jul 2013 22:18:44 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.7/8.14.7) with ESMTP id r6CMIiBl097102
 for <perforce@freebsd.org>; Fri, 12 Jul 2013 22:18:44 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.7/8.14.6/Submit) id r6CMIilP097099
 for perforce@freebsd.org; Fri, 12 Jul 2013 22:18:44 GMT
 (envelope-from jhb@freebsd.org)
Date: Fri, 12 Jul 2013 22:18:44 GMT
Message-Id: <201307122218.r6CMIilP097099@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 231119 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.14
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/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: Fri, 12 Jul 2013 22:18:45 -0000

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

Change 231119 by jhb@jhb_jhbbsd on 2013/07/12 22:18:04

	Trim debugging.

Affected files ...

.. //depot/projects/pci/sys/dev/pci/pci_pci.c#40 edit

Differences ...

==== //depot/projects/pci/sys/dev/pci/pci_pci.c#40 (text+ko) ====

@@ -193,9 +193,8 @@
 }
 
 /*
- * This is used to reject allocations that conflict with an ISA alias
- * before trying to grow the window.  Note that this check overrides
- * subtractive decode.
+ * This is used to reject I/O port allocations that conflict with an
+ * ISA alias range.
  */
 static int
 pcib_is_isa_range(struct pcib_softc *sc, u_long start, u_long end, u_long count)
@@ -230,8 +229,10 @@
 	return (0);
 
 alias:
-	device_printf(sc->dev,
-	    "I/O range %#lx-%#lx overlaps with an ISA alias\n", start, end);
+	if (bootverbose)
+		device_printf(sc->dev,
+		    "I/O range %#lx-%#lx overlaps with an ISA alias\n", start,
+		    end);
 	return (1);
 }
 
@@ -320,10 +321,9 @@
 
 	w = &as->sc->io;
 	rid = w->reg;
-	/* XXX */
-	if (bootverbose || 1)
+	if (bootverbose)
 		device_printf(as->sc->dev,
-		    "Allocating non-ISA range %#lx-%#lx\n", start, end);
+		    "allocating non-ISA range %#lx-%#lx\n", start, end);
 	as->res[as->count] = bus_alloc_resource(as->sc->dev, SYS_RES_IOPORT,
 	    &rid, start, end, end - start + 1, 0);
 	if (as->res[as->count] == NULL)
@@ -338,10 +338,6 @@
 	struct alloc_state as;
 	int i, new_count;
 
-	/* XXX */
-	device_printf(sc->dev, "Allocating non-ISA ranges of %#lx-%#lx\n",
-	    start, end);
-
 	/* First, see how many ranges we need. */
 	new_count = 0;
 	pcib_walk_nonisa_ranges(start, end, count_ranges, &new_count);