[src/trunk]: src/sys/dev/pci The Power Controller Control bit (PCIE_SLCSR_PCC...

[msaitoh <msaitoh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/44dd34c3185a
branches:  trunk
changeset: 820064:44dd34c3185a
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Wed Dec 28 06:57:27 2016 +0000

description:
The Power Controller Control bit (PCIE_SLCSR_PCC) in the Slot Control & Status
Register is 0 on power on. Print "Power <on|off>" instead of "<on|off>".

diffstat:

 sys/dev/pci/pci_subr.c |  7 ++++---
 sys/dev/pci/pcireg.h   |  9 ++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diffs (58 lines):

diff -r 92a4e7770ccf -r 44dd34c3185a sys/dev/pci/pci_subr.c
--- a/sys/dev/pci/pci_subr.c    Wed Dec 28 06:25:40 2016 +0000
+++ b/sys/dev/pci/pci_subr.c    Wed Dec 28 06:57:27 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_subr.c,v 1.155 2016/11/02 00:39:56 pgoyette Exp $  */
+/*     $NetBSD: pci_subr.c,v 1.156 2016/12/28 06:57:27 msaitoh Exp $   */
 
 /*
  * Copyright (c) 1997 Zubin D. Dittia.  All rights reserved.
@@ -40,7 +40,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.155 2016/11/02 00:39:56 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.156 2016/12/28 06:57:27 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
@@ -1798,7 +1798,8 @@
                        printf("off\n");
                        break;
                }
-               onoff("Power Controller Control", reg, PCIE_SLCSR_PCC);
+               printf("      Power Controller Control: Power %s\n",
+                   reg & PCIE_SLCSR_PCC ? "off" : "on");
                onoff("Electromechanical Interlock Control",
                    reg, PCIE_SLCSR_EIC);
                onoff("Data Link Layer State Changed Enable", reg,
diff -r 92a4e7770ccf -r 44dd34c3185a sys/dev/pci/pcireg.h
--- a/sys/dev/pci/pcireg.h      Wed Dec 28 06:25:40 2016 +0000
+++ b/sys/dev/pci/pcireg.h      Wed Dec 28 06:57:27 2016 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcireg.h,v 1.118 2016/12/27 03:51:55 msaitoh Exp $     */
+/*     $NetBSD: pcireg.h,v 1.119 2016/12/28 06:57:27 msaitoh Exp $     */
 
 /*
  * Copyright (c) 1995, 1996, 1999, 2000
@@ -978,7 +978,10 @@
 #define PCIE_SLCSR_HPE         __BIT(5)       /* Hot Plug Interrupt Enable */
 #define PCIE_SLCSR_AIC         __BITS(7, 6)   /* Attention Indicator Control*/
 #define PCIE_SLCSR_PIC         __BITS(9, 8)   /* Power Indicator Control */
-#define PCIE_SLCSR_PCC         __BIT(10)      /* Power Controller Control */
+#define PCIE_SLCSR_PCC         __BIT(10)      /*
+                                               * Power Controller Control:
+                                               * 0: Power on, 1: Power off.
+                                               */
 #define PCIE_SLCSR_EIC         __BIT(11)      /* Electromechanical Interlock*/
 #define PCIE_SLCSR_DLLSCE      __BIT(12)      /* DataLinkLayer State Changed*/
 #define PCIE_SLCSR_AUTOSPLDIS  __BIT(13)      /* Auto Slot Power Limit Dis. */
@@ -1779,7 +1782,7 @@
 
 /*
  * Extended capability ID: 0x0014
- * (Reserved for AMD)
+ * Enhanced Allocation
  */
 
 /*