 @@ -1,14 +1,14 @@
-/*	$NetBSD: pci_subr.c,v 1.76 2008/11/17 23:33:41 matt Exp $	*/
+/*	$NetBSD: pci_subr.c,v 1.77 2009/01/20 13:54:43 jmcneill Exp $	*/
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
  * Copyright (c) 1995, 1996, 1998, 2000
  *	Christopher G. Demetriou.  All rights reserved.
  * Copyright (c) 1994 Charles M. Hannum.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -30,27 +30,27 @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 /*
  * PCI autoconfiguration support functions.
+ *
  * Note: This file is also built into a userland library (libpci).
  * Pay attention to this when you make modifications.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.76 2008/11/17 23:33:41 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.77 2009/01/20 13:54:43 jmcneill Exp $");
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
 #endif
 #include <sys/param.h>
 #ifdef _KERNEL
 #include <sys/systm.h>
 #include <sys/intr.h>
 #else
 #include <pci.h>
 #include <stdbool.h>
 @@ -887,55 +887,114 @@ pci_conf_print_pcie_cap(const pcireg_t *
 			break;
 		case 0x3:
 			printf("off\n");
 			break;
+		}
 		printf("      Power Controller Control: ");
 		if ((regs[o2i(capoff + 0x18)] & 0x0400) != 0)
 			printf("off\n");
 		else
 			printf("on\n");
+	}
+}
 static const char *
 pci_conf_print_pcipm_cap_aux(uint16_t caps)
+{
 	switch ((caps >> 6) & 7) {
 	case 0:	return "self-powered";
 	case 1: return "55 mA";
 	case 2: return "100 mA";
 	case 3: return "160 mA";
 	case 4: return "220 mA";
 	case 5: return "270 mA";
 	case 6: return "320 mA";
 	case 7:
 	default: return "375 mA";
+	}
+}
 static const char *
 pci_conf_print_pcipm_cap_pmrev(uint8_t val)
+{
 	static const char unk[] = "unknown";
 	static const char *pmrev[8] = {
 		unk, "1.0", "1.1", "1.2", unk, unk, unk, unk
 	};
 	if (val > 7)
 		return unk;
 	return pmrev[val];
+}
 static void
 pci_conf_print_pcipm_cap(const pcireg_t *regs, int capoff)
+{
 	uint16_t caps, pmcsr;
 	caps = regs[o2i(capoff)] >> 16;
 	pmcsr = regs[o2i(capoff + 0x04)] & 0xffff;
 	printf("\n  PCI Power Management Capabilities Register\n");
 	printf("    Capabilities register: 0x%04x\n", caps);
 	printf("      Version: %s\n",
 	    pci_conf_print_pcipm_cap_pmrev(caps & 0x3));
 	printf("      PME# clock: %s\n", caps & 0x4 ? "on" : "off");
 	printf("      Device specific initialization: %s\n",
 	    caps & 0x20 ? "on" : "off");
 	printf("      3.3V auxiliary current: %s\n",
 	    pci_conf_print_pcipm_cap_aux(caps));
 	printf("      D1 power management state support: %s\n",
 	    (caps >> 9) & 1 ? "on" : "off");
 	printf("      D2 power management state support: %s\n",
 	    (caps >> 10) & 1 ? "on" : "off");
 	printf("      PME# support: 0x%02x\n", caps >> 11);
 	printf("    Control/status register: 0x%04x\n", pmcsr);
 	printf("      Power state: D%d\n", pmcsr & 3);
 	printf("      PCI Express reserved: %s\n",
 	    (pmcsr >> 2) & 1 ? "on" : "off");
 	printf("      No soft reset: %s\n", (pmcsr >> 3) & 1 ? "on" : "off");
 	printf("      PME# assertion %sabled\n",
 	    (pmcsr >> 8) & 1 ? "en" : "dis");
 	printf("      PME# status: %s\n", (pmcsr >> 15) ? "on" : "off");
+}
 static void
 pci_conf_print_caplist(
 #ifdef _KERNEL
     pci_chipset_tag_t pc, pcitag_t tag,
 #endif
     const pcireg_t *regs, int capoff)
+{
 	static const char unk[] = "unknown";
 	static const char *pmrev[8] = {
 		unk, "1.0", "1.1", "1.2", unk, unk, unk, unk
 	};
 	int off;
 	pcireg_t rval;
-	int pcie_off = -1;
+	int pcie_off = -1, pcipm_off = -1;
 	for (off = PCI_CAPLIST_PTR(regs[o2i(capoff)]);
 	     off != 0;
 	     off = PCI_CAPLIST_NEXT(regs[o2i(off)])) {
 		rval = regs[o2i(off)];
 		printf("  Capability register at 0x%02x\n", off);
 		printf("    type: 0x%02x (", PCI_CAPLIST_CAP(rval));
 		switch (PCI_CAPLIST_CAP(rval)) {
 		case PCI_CAP_RESERVED0:
 			printf("reserved");
 			break;
 		case PCI_CAP_PWRMGMT:
 			printf("Power Management, rev. %s",
-			       pmrev[(rval >> 0) & 0x07]);
+			    pci_conf_print_pcipm_cap_pmrev((rval >> 0) & 0x07));
 			pcipm_off = off;
 			break;
 		case PCI_CAP_AGP:
 			printf("AGP, rev. %d.%d",
 				PCI_CAP_AGP_MAJOR(rval),
 				PCI_CAP_AGP_MINOR(rval));
 			break;
 		case PCI_CAP_VPD:
 			printf("VPD");
 			break;
 		case PCI_CAP_SLOTID:
 			printf("SlotID");
 			break;
 		case PCI_CAP_MSI:
 @@ -970,26 +1029,28 @@ pci_conf_print_caplist(
 			break;
 		case PCI_CAP_PCIEXPRESS:
 			printf("PCI Express");
 			pcie_off = off;
 			break;
 		case PCI_CAP_MSIX:
 			printf("MSI-X");
 			break;
 		default:
 			printf("unknown");
+		}
 		printf(")\n");
+	}
 	if (pcipm_off != -1)
 		pci_conf_print_pcipm_cap(regs, pcipm_off);
 	if (pcie_off != -1)
 		pci_conf_print_pcie_cap(regs, pcie_off);
+}
 static void
 pci_conf_print_type1(
 #ifdef _KERNEL
     pci_chipset_tag_t pc, pcitag_t tag,
 #endif
     const pcireg_t *regs
 #ifdef _KERNEL
     , int sizebars
 #endif