Module Name: src
Committed By: msaitoh
Date: Fri Apr 21 09:01:53 UTC 2017
Modified Files:
src/sys/dev/pci: pci_subr.c pcireg.h
Log Message:
Add Flattening Portal Bridge capability ID and Hierarchy ID extended
capability ID.
To generate a diff of this commit:
cvs rdiff -u -r1.176 -r1.177 src/sys/dev/pci/pci_subr.c
cvs rdiff -u -r1.127 -r1.128 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.176 src/sys/dev/pci/pci_subr.c:1.177
--- src/sys/dev/pci/pci_subr.c:1.176 Thu Apr 20 08:45:25 2017
+++ src/sys/dev/pci/pci_subr.c Fri Apr 21 09:01:52 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.176 2017/04/20 08:45:25 msaitoh Exp $ */
+/* $NetBSD: pci_subr.c,v 1.177 2017/04/21 09:01:52 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.176 2017/04/20 08:45:25 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.177 2017/04/21 09:01:52 msaitoh Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -2281,6 +2281,9 @@ pci_conf_print_pciaf_cap(const pcireg_t
onoff("Transaction Pending", reg, PCI_AFSR_TP);
}
+/* XXX pci_conf_print_ea_cap */
+/* XXX pci_conf_print_fpb_cap */
+
static struct {
pcireg_t cap;
const char *name;
@@ -2309,6 +2312,7 @@ static struct {
{ PCI_CAP_SATA, "SATA", pci_conf_print_sata_cap },
{ PCI_CAP_PCIAF, "Advanced Features", pci_conf_print_pciaf_cap},
{ PCI_CAP_EA, "Enhanced Allocation", NULL }
+ { PCI_CAP_FPB, "Flattening Portal Bridge", NULL }
};
static int
@@ -3783,6 +3787,7 @@ pci_conf_print_ptm_cap(const pcireg_t *r
/* XXX pci_conf_print_rtr_cap */
/* XXX pci_conf_print_desigvndsp_cap */
/* XXX pci_conf_print_vf_resizbar_cap */
+/* XXX pci_conf_print_hierarchyid_cap */
#undef MS
#undef SM
@@ -3867,6 +3872,8 @@ static struct {
NULL },
{ PCI_EXTCAP_VF_RESIZBAR, "VF Resizable BARs",
NULL },
+ { PCI_EXTCAP_HIERARCHYID, "Hierarchy ID",
+ NULL },
};
static int
Index: src/sys/dev/pci/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.127 src/sys/dev/pci/pcireg.h:1.128
--- src/sys/dev/pci/pcireg.h:1.127 Thu Apr 20 08:45:25 2017
+++ src/sys/dev/pci/pcireg.h Fri Apr 21 09:01:52 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pcireg.h,v 1.127 2017/04/20 08:45:25 msaitoh Exp $ */
+/* $NetBSD: pcireg.h,v 1.128 2017/04/21 09:01:52 msaitoh Exp $ */
/*
* Copyright (c) 1995, 1996, 1999, 2000
@@ -543,6 +543,7 @@ typedef u_int8_t pci_revision_t;
#define PCI_CAP_SATA 0x12
#define PCI_CAP_PCIAF 0x13
#define PCI_CAP_EA 0x14 /* Enhanced Allocation (EA) */
+#define PCI_CAP_FPB 0x15 /* Flattening Portal Bridge (FPB) */
/*
* Capability ID: 0x01
@@ -1441,6 +1442,7 @@ struct pci_rom {
#define PCI_EXTCAP_RTR 0x0022 /* Readiness Time Reporting */
#define PCI_EXTCAP_DESIGVNDSP 0x0023 /* Designated Vendor-Specific */
#define PCI_EXTCAP_VF_RESIZBAR 0x0024 /* VF Resizable BAR */
+#define PCI_EXTCAP_HIERARCHYID 0x0028 /* Hierarchy ID */
/*
* Extended capability ID: 0x0001
