Module Name: src
Committed By: martin
Date: Wed Nov 22 14:38:47 UTC 2017
Modified Files:
src/sys/dev/pci [netbsd-8]: pci_subr.c
Log Message:
Pull up following revision(s) (requested by msaitoh in ticket #371):
sys/dev/pci/pci_subr.c: revision 1.195
sys/dev/pci/pci_subr.c: revision 1.196
Print Error Source Identification register correctly.
Whitespace fix.
To generate a diff of this commit:
cvs rdiff -u -r1.183.2.2 -r1.183.2.3 src/sys/dev/pci/pci_subr.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.2 src/sys/dev/pci/pci_subr.c:1.183.2.3
--- src/sys/dev/pci/pci_subr.c:1.183.2.2 Tue Nov 21 14:16:38 2017
+++ src/sys/dev/pci/pci_subr.c Wed Nov 22 14:38:47 2017
@@ -1,4 +1,4 @@
-/* $NetBSD: pci_subr.c,v 1.183.2.2 2017/11/21 14:16:38 martin Exp $ */
+/* $NetBSD: pci_subr.c,v 1.183.2.3 2017/11/22 14:38:47 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.2 2017/11/21 14:16:38 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.183.2.3 2017/11/22 14:38:47 martin Exp $");
#ifdef _KERNEL_OPT
#include "opt_pci.h"
@@ -2692,7 +2692,8 @@ pci_conf_print_aer_cap(const pcireg_t *r
pci_conf_print_aer_cap_rooterr_status(reg);
reg = regs[o2i(extcapoff + PCI_AER_ERRSRC_ID)];
- printf(" Error Source Identification: 0x%04x\n", reg);
+ printf(" Error Source Identification register: 0x%08x\n",
+ reg);
pci_conf_print_aer_cap_errsrc_id(reg);
break;
}
@@ -4348,9 +4349,9 @@ pci_conf_print_type1(
}
if (base < limit) {
if (use_upper == 1)
- printf(" range: 0x%08x-0x%08x\n", base, limit);
+ printf(" range: 0x%08x-0x%08x\n", base, limit);
else
- printf(" range: 0x%04x-0x%04x\n", base, limit);
+ printf(" range: 0x%04x-0x%04x\n", base, limit);
} else
printf(" range: not set\n");
@@ -4366,9 +4367,9 @@ pci_conf_print_type1(
limit = (((rval >> PCI_BRIDGE_MEMORY_LIMIT_SHIFT)
& PCI_BRIDGE_MEMORY_LIMIT_MASK) << 20) | 0x000fffff;
if (base < limit)
- printf(" range: 0x%08x-0x%08x\n", base, limit);
+ printf(" range: 0x%08x-0x%08x\n", base, limit);
else
- printf(" range: not set\n");
+ printf(" range: not set\n");
/* Prefetchable memory region */
rval = regs[o2i(PCI_BRIDGE_PREFETCHMEM_REG)];
@@ -4398,13 +4399,13 @@ pci_conf_print_type1(
}
if (pbase < plimit) {
if (use_upper == 1)
- printf(" range: 0x%016" PRIx64 "-0x%016" PRIx64
+ printf(" range: 0x%016" PRIx64 "-0x%016" PRIx64
"\n", pbase, plimit);
else
- printf(" range: 0x%08x-0x%08x\n",
+ printf(" range: 0x%08x-0x%08x\n",
(uint32_t)pbase, (uint32_t)plimit);
} else
- printf(" range: not set\n");
+ printf(" range: not set\n");
if (regs[o2i(PCI_COMMAND_STATUS_REG)] & PCI_STATUS_CAPLIST_SUPPORT)
printf(" Capability list pointer: 0x%02x\n",
