Revert "x86/MSI-X: use qword MMIO access for address writes"

This reverts commit 73cb5d43a8f48930e4594ef7b15b974487651ffe,
which appears to break with certain Tigon3 NICs.

diff --git a/xen/arch/x86/msi.c b/xen/arch/x86/msi.c
index 3527518e0c92bb8fa552cb3830c2827369e82072..e89f326cf9dd40604573d30624ba7975ef0f1a59 100644 (file)
--- a/xen/arch/x86/msi.c
+++ b/xen/arch/x86/msi.c
@@ -198,7 +198,8 @@ static void read_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
         void __iomem *base;
         base = entry->mask_base;
 
-        msg->address = readq(base + PCI_MSIX_ENTRY_ADDRESS_OFFSET);
+        msg->address_lo = readl(base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);
+        msg->address_hi = readl(base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET);
         msg->data = readl(base + PCI_MSIX_ENTRY_DATA_OFFSET);
         break;
     }
@@ -259,7 +260,10 @@ static int write_msi_msg(struct msi_desc *entry, struct msi_msg *msg)
         void __iomem *base;
         base = entry->mask_base;
 
-        writeq(msg->address, base + PCI_MSIX_ENTRY_ADDRESS_OFFSET);
+        writel(msg->address_lo,
+               base + PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET);
+        writel(msg->address_hi,
+               base + PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET);
         writel(msg->data, base + PCI_MSIX_ENTRY_DATA_OFFSET);
         break;
     }

diff --git a/xen/include/asm-x86/msi.h b/xen/include/asm-x86/msi.h
index abbecf81056d1995401b89235edfa5af9227af30..4c62a3a9fdcfc60b1600b2fc1a6297ab7401ec4a 100644 (file)
--- a/xen/include/asm-x86/msi.h
+++ b/xen/include/asm-x86/msi.h
@@ -65,13 +65,8 @@ struct msi_info {
 };
 
 struct msi_msg {
-       union {
-               u64     address; /* message address */
-               struct {
-                       u32     address_lo; /* message address low 32 bits */
-                       u32     address_hi; /* message address high 32 bits */
-               };
-       };
+       u32     address_lo;     /* low 32 bits of msi message address */
+       u32     address_hi;     /* high 32 bits of msi message address */
        u32     data;           /* 16 bits of msi message data */
        u32     dest32;         /* used when Interrupt Remapping with EIM is enabled */
 };

diff --git a/xen/include/xen/pci_regs.h b/xen/include/xen/pci_regs.h
index 2de7847a8028b7da87c8b0b780ec91773b314104..ecd6124d91072543768b14c40a8c3d3702e3111e 100644 (file)
--- a/xen/include/xen/pci_regs.h
+++ b/xen/include/xen/pci_regs.h
@@ -307,7 +307,6 @@
 #define  PCI_MSIX_BIRMASK      (7 << 0)
 
 #define PCI_MSIX_ENTRY_SIZE                    16
-#define  PCI_MSIX_ENTRY_ADDRESS_OFFSET         0
 #define  PCI_MSIX_ENTRY_LOWER_ADDR_OFFSET      0
 #define  PCI_MSIX_ENTRY_UPPER_ADDR_OFFSET      4
 #define  PCI_MSIX_ENTRY_DATA_OFFSET            8