[Xen-changelog] [xen-unstable] x86: allow the MSI-X table to reside beyond 4G even on 32-bit systems

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1278927837 -3600
# Node ID 08b2222ff505319a5cabebef4155808cb89f06b3
# Parent  421f6c63b220ecd4d56addc940327e37d45b7c55
x86: allow the MSI-X table to reside beyond 4G even on 32-bit systems

Underlying interfaces allow this, and unduly (and silently) truncating
addresses doesn't seem nice.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
 xen/arch/x86/msi.c |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff -r 421f6c63b220 -r 08b2222ff505 xen/arch/x86/msi.c
--- a/xen/arch/x86/msi.c        Mon Jul 12 10:43:34 2010 +0100
+++ b/xen/arch/x86/msi.c        Mon Jul 12 10:43:57 2010 +0100
@@ -57,10 +57,11 @@ static void msix_fixmap_free(int idx)
     spin_unlock(&msix_fixmap_lock);
 }
 
-static int msix_get_fixmap(struct pci_dev *dev, unsigned long table_paddr,
-                           unsigned long entry_paddr)
-{
-    int nr_page, idx;
+static int msix_get_fixmap(struct pci_dev *dev, u64 table_paddr,
+                           u64 entry_paddr)
+{
+    long nr_page;
+    int idx;
 
     nr_page = (entry_paddr >> PAGE_SHIFT) - (table_paddr >> PAGE_SHIFT);
 
@@ -536,7 +537,7 @@ static int msix_capability_init(struct p
     struct msi_desc *entry;
     int pos;
     u16 control;
-    unsigned long table_paddr, entry_paddr;
+    u64 table_paddr, entry_paddr;
     u32 table_offset, entry_offset;
     u8 bir;
     void __iomem *base;
@@ -571,7 +572,8 @@ static int msix_capability_init(struct p
         xfree(entry);
         return idx;
     }
-    base = (void *)(fix_to_virt(idx) + (entry_paddr & ((1UL << PAGE_SHIFT) - 
1)));
+    base = (void *)(fix_to_virt(idx) +
+        ((unsigned long)entry_paddr & ((1UL << PAGE_SHIFT) - 1)));
 
     entry->msi_attrib.type = PCI_CAP_ID_MSIX;
     entry->msi_attrib.is_64 = 1;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog