Module Name: src Committed By: martin Date: Wed Jul 17 15:55:31 UTC 2019
Modified Files: src/sys/dev/pci [netbsd-8]: pci_subr.c ppb.c Log Message: Pull up following revision(s) (requested by msaitoh in ticket #1295): sys/dev/pci/pci_subr.c: revision 1.213 sys/dev/pci/ppb.c: revision 1.69 Identify 16GT/s. To generate a diff of this commit: cvs rdiff -u -r1.183.2.10 -r1.183.2.11 src/sys/dev/pci/pci_subr.c cvs rdiff -u -r1.63.2.1 -r1.63.2.2 src/sys/dev/pci/ppb.c 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.183.2.10 src/sys/dev/pci/pci_subr.c:1.183.2.11 --- src/sys/dev/pci/pci_subr.c:1.183.2.10 Wed Jul 17 15:34:31 2019 +++ src/sys/dev/pci/pci_subr.c Wed Jul 17 15:55:31 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: pci_subr.c,v 1.183.2.10 2019/07/17 15:34:31 martin Exp $ */ +/* $NetBSD: pci_subr.c,v 1.183.2.11 2019/07/17 15:55:31 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.183.2.10 2019/07/17 15:34:31 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.183.2.11 2019/07/17 15:55:31 martin Exp $"); #ifdef _KERNEL_OPT #include "opt_pci.h" @@ -1688,7 +1688,7 @@ pci_print_pcie_compl_timeout(uint32_t va } } -static const char * const pcie_linkspeeds[] = {"2.5", "5.0", "8.0"}; +static const char * const pcie_linkspeeds[] = {"2.5", "5.0", "8.0", "16.0"}; /* * Print link speed. This function is used for the following register bits: Index: src/sys/dev/pci/ppb.c diff -u src/sys/dev/pci/ppb.c:1.63.2.1 src/sys/dev/pci/ppb.c:1.63.2.2 --- src/sys/dev/pci/ppb.c:1.63.2.1 Fri Feb 1 11:25:13 2019 +++ src/sys/dev/pci/ppb.c Wed Jul 17 15:55:31 2019 @@ -1,4 +1,4 @@ -/* $NetBSD: ppb.c,v 1.63.2.1 2019/02/01 11:25:13 martin Exp $ */ +/* $NetBSD: ppb.c,v 1.63.2.2 2019/07/17 15:55:31 martin Exp $ */ /* * Copyright (c) 1996, 1998 Christopher G. Demetriou. All rights reserved. @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.63.2.1 2019/02/01 11:25:13 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.63.2.2 2019/07/17 15:55:31 martin Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -54,8 +54,8 @@ __KERNEL_RCSID(0, "$NetBSD: ppb.c,v 1.63 (PCIE_SLCSR_ABP | PCIE_SLCSR_PFD | PCIE_SLCSR_MSC | \ PCIE_SLCSR_PDC | PCIE_SLCSR_CC | PCIE_SLCSR_LACS) -static const char pcie_linkspeed_strings[4][5] = { - "1.25", "2.5", "5.0", "8.0", +static const char pcie_linkspeed_strings[5][5] = { + "1.25", "2.5", "5.0", "8.0", "16.0" }; int ppb_printevent = 0; /* Print event type if the value is not 0 */