Module Name: src
Committed By: martin
Date: Sun Dec 14 16:49:35 UTC 2014
Modified Files:
src/sys/dev/pci [netbsd-7]: pci_subr.c pcireg.h
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.124.2.1 -r1.124.2.2 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.95.2.2 -r1.95.2.3 src/sys/dev/pci/pcireg.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/pci/pci_subr.c
diff -u src/sys/dev/pci/pci_subr.c:1.124.2.1 src/sys/dev/pci/pci_subr.c:1.124.2.2
--- src/sys/dev/pci/pci_subr.c:1.124.2.1 Fri Dec 12 19:03:17 2014
+++ src/sys/dev/pci/pci_subr.c Sun Dec 14 16:49:35 2014
@@ -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 @@ pci_conf_print_pcie_cap(const pcireg_t *
/* 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)];
Index: src/sys/dev/pci/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.95.2.2 src/sys/dev/pci/pcireg.h:1.95.2.3
--- src/sys/dev/pci/pcireg.h:1.95.2.2 Fri Dec 12 19:03:17 2014
+++ src/sys/dev/pci/pcireg.h Sun Dec 14 16:49:35 2014
@@ -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 @@ typedef u_int8_t pci_revision_t;
#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 */
