PERFORCE change 1190661 for review

[John Baldwin]

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

Change 1190661 by jhb at 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);