[src/netbsd-7]: src/sys/dev/pci Pull up following revision(s) (requested by m...

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

details:   https://anonhg.NetBSD.org/src/rev/6450b479d55c
branches:  netbsd-7
changeset: 798711:6450b479d55c
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Dec 14 16:49:35 2014 +0000

description:
Pull up following revision(s) (requested by msaitoh in ticket #325):
        sys/dev/pci/pcireg.h: revision 1.100
        sys/dev/pci/pci_subr.c: revision 1.133
Add PCIe CRS Software Visibility bit.

diffstat:

 sys/dev/pci/pci_subr.c |  5 +++--
 sys/dev/pci/pcireg.h   |  3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (43 lines):

diff -r 0c95bdf4c8d9 -r 6450b479d55c sys/dev/pci/pci_subr.c
--- a/sys/dev/pci/pci_subr.c    Sun Dec 14 16:44:04 2014 +0000
+++ b/sys/dev/pci/pci_subr.c    Sun Dec 14 16:49:35 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_subr.c,v 1.124.2.1 2014/12/12 19:03:17 martin Exp $        */
+/*     $NetBSD: pci_subr.c,v 1.124.2.2 2014/12/14 16:49:35 martin 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.124.2.1 2014/12/12 19:03:17 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.124.2.2 2014/12/14 16:49:35 martin Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
@@ -1697,6 +1697,7 @@
                /* Root Capability Register */
                printf("    Root Capability Register: %04x\n",
                    reg >> 16);
+               onoff("CRS Software Visibility", reg, PCIE_RCR_CRS_SV);
 
                /* Root Status Register */
                reg = regs[o2i(capoff + PCIE_RSR)];
diff -r 0c95bdf4c8d9 -r 6450b479d55c sys/dev/pci/pcireg.h
--- a/sys/dev/pci/pcireg.h      Sun Dec 14 16:44:04 2014 +0000
+++ b/sys/dev/pci/pcireg.h      Sun Dec 14 16:49:35 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcireg.h,v 1.95.2.2 2014/12/12 19:03:17 martin Exp $   */
+/*     $NetBSD: pcireg.h,v 1.95.2.3 2014/12/14 16:49:35 martin Exp $   */
 
 /*
  * Copyright (c) 1995, 1996, 1999, 2000
@@ -976,6 +976,7 @@
 #define PCIE_RCR_SERR_FER      __BIT(2)       /* SERR on Fatal Error Enable */
 #define PCIE_RCR_PME_IE                __BIT(3)       /* PME Interrupt Enable */
 #define PCIE_RCR_CRS_SVE       __BIT(4)       /* CRS Software Visibility En */
+#define PCIE_RCR_CRS_SV                __BIT(16)      /* CRS Software Visibility */
 #define PCIE_RSR       0x20    /* Root Status Register */
 #define PCIE_RSR_PME_REQESTER  __BITS(15, 0)  /* PME Requester ID */
 #define PCIE_RSR_PME_STAT      __BIT(16)      /* PME Status */