Module Name: src
Committed By: msaitoh
Date: Wed Nov 28 08:26:07 UTC 2018
Modified Files:
src/sys/dev/pci: pcireg.h
Log Message:
The register offset of the mask and pending register is depend on the 64bit
address capable bit, so fix the definition of PCI MSI vector mask and pending
register. This problem was not a real bug because PCI_MSI{MASK,PENDING} were
not used from anywhere.
To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 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/pcireg.h
diff -u src/sys/dev/pci/pcireg.h:1.143 src/sys/dev/pci/pcireg.h:1.144
--- src/sys/dev/pci/pcireg.h:1.143 Mon Nov 5 03:51:31 2018
+++ src/sys/dev/pci/pcireg.h Wed Nov 28 08:26:07 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: pcireg.h,v 1.143 2018/11/05 03:51:31 msaitoh Exp $ */
+/* $NetBSD: pcireg.h,v 1.144 2018/11/28 08:26:07 msaitoh Exp $ */
/*
* Copyright (c) 1995, 1996, 1999, 2000
@@ -671,8 +671,12 @@ typedef u_int8_t pci_revision_t;
#define PCI_MSI_MDATA64 0xc /* 64-bit Message Data Register
* offset
*/
-#define PCI_MSI_MASK 0x10 /* Vector Mask register */
-#define PCI_MSI_PENDING 0x14 /* Vector Pending register */
+
+#define PCI_MSI_MASK 0x0c /* Vector Mask register */
+#define PCI_MSI_MASK64 0x10 /* 64-bit Vector Mask register */
+
+#define PCI_MSI_PENDING 0x10 /* Vector Pending register */
+#define PCI_MSI_PENDING64 0x14 /* 64-bit Vector Pending register */
#define PCI_MSI_CTL_MASK __BITS(31, 16)
#define PCI_MSI_CTL_EXTMDATA_EN __SHIFTIN(__BIT(10), PCI_MSI_CTL_MASK)
