[src/trunk]: src/sys/dev/pci Print MSI Message data in 32bits when the Extend...

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

details:   https://anonhg.NetBSD.org/src/rev/a97dd207e85a
branches:  trunk
changeset: 824248:a97dd207e85a
user:      msaitoh <msaitoh%NetBSD.org@localhost>
date:      Mon May 29 07:09:20 2017 +0000

description:
Print MSI Message data in 32bits when the Extended Message Data Capable bit
is set.

diffstat:

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

diffs (51 lines):

diff -r c1992a409eea -r a97dd207e85a sys/dev/pci/pci_subr.c
--- a/sys/dev/pci/pci_subr.c    Mon May 29 06:54:01 2017 +0000
+++ b/sys/dev/pci/pci_subr.c    Mon May 29 07:09:20 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pci_subr.c,v 1.182 2017/05/24 06:51:27 msaitoh Exp $   */
+/*     $NetBSD: pci_subr.c,v 1.183 2017/05/29 07:09:20 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.182 2017/05/24 06:51:27 msaitoh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pci_subr.c,v 1.183 2017/05/29 07:09:20 msaitoh Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_pci.h"
@@ -1245,7 +1245,11 @@
                printf("    Message Address %sregister: 0x%08x\n",
                    "(upper) ", *regs++);
        }
-       printf("    Message Data register: 0x%04x\n", *regs & 0xffff);
+       printf("    Message Data register: ");
+       if (ctl & PCI_MSI_CTL_EXTMDATA_CAP)
+               printf("0x%08x\n", *regs);
+       else
+               printf("0x%04x\n", *regs & 0xffff);
        regs++;
        if (ctl & PCI_MSI_CTL_PERVEC_MASK) {
                printf("    Vector Mask register: 0x%08x\n", *regs++);
diff -r c1992a409eea -r a97dd207e85a sys/dev/pci/pcireg.h
--- a/sys/dev/pci/pcireg.h      Mon May 29 06:54:01 2017 +0000
+++ b/sys/dev/pci/pcireg.h      Mon May 29 07:09:20 2017 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pcireg.h,v 1.129 2017/05/24 06:51:27 msaitoh Exp $     */
+/*     $NetBSD: pcireg.h,v 1.130 2017/05/29 07:09:20 msaitoh Exp $     */
 
 /*
  * Copyright (c) 1995, 1996, 1999, 2000
@@ -674,8 +674,8 @@
 /*
  * MSI Message Address is at offset 4.
  * MSI Message Upper Address (if 64bit) is at offset 8.
- * MSI Message data is at offset 8 or 12 and is 16 bits.
- * [16 bit reserved field]
+ * MSI Message data is at offset 8 or 12 and is lower 16 bits.
+ * MSI Extended Message data is at offset 8 or 12 and is upper 16 bits.
  * MSI Mask Bits (32 bit field)
  * MSI Pending Bits (32 bit field)
  */