From owner-p4-projects@FreeBSD.ORG  Wed Feb  5 19:53:05 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id E54344F3; Wed,  5 Feb 2014 19:53:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A77644F1
 for <perforce@freebsd.org>; Wed,  5 Feb 2014 19:53:04 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8FB7711D6
 for <perforce@freebsd.org>; Wed,  5 Feb 2014 19:53:04 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.8/8.14.8) with ESMTP id s15Jr4AV057542
 for <perforce@freebsd.org>; Wed, 5 Feb 2014 19:53:04 GMT
 (envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.8/8.14.8/Submit) id s15Jr4Sw057539
 for perforce@freebsd.org; Wed, 5 Feb 2014 19:53:04 GMT
 (envelope-from jhb@freebsd.org)
Date: Wed, 5 Feb 2014 19:53:04 GMT
Message-Id: <201402051953.s15Jr4Sw057539@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 1190661 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.17
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: Wed, 05 Feb 2014 19:53:05 -0000

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

Change 1190661 by jhb@jhb_ralph on 2014/02/05 19:52:21

	Tidy.

Affected files ...

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

Differences ...

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

@@ -105,9 +105,9 @@
 #ifdef NEW_PCIB
 SYSCTL_DECL(_hw_pci);
 
-static int pcib_clear;
-TUNABLE_INT("hw.pci.pcib_clear", &pcib_clear);
-SYSCTL_INT(_hw_pci, OID_AUTO, pcib_clear, CTLFLAG_RDTUN, &pcib_clear, 0,
+static int pci_clear_pcib;
+TUNABLE_INT("hw.pci.clear_pcib", &pci_clear_pcib);
+SYSCTL_INT(_hw_pci, OID_AUTO, clear_pcib, CTLFLAG_RDTUN, &pci_clear_pcib, 0,
     "Clear firmware-assigned resources for PCI-PCI bridge I/O windows.");
 
 /*
@@ -426,8 +426,7 @@
 
 	dev = sc->dev;
 
-	/* XXX: Gross hack, disable all windows for testing. */
-	if (pcib_clear) {
+	if (pci_clear_pcib) {
 		pci_write_config(dev, PCIR_IOBASEL_1, 0xff, 1);
 		pci_write_config(dev, PCIR_IOBASEH_1, 0xffff, 2);
 		pci_write_config(dev, PCIR_IOLIMITL_1, 0, 1);