From: "Jan Beulich" <JBeulich@novell.com>
To: "xen-devel@lists.xensource.com" <xen-devel@lists.xensource.com>
Subject: [PATCH 2/3] x86: allow the MSI-X table to reside beyond 4G even on 32-bit systems
Date: Mon, 12 Jul 2010 10:37:31 +0100 [thread overview]
Message-ID: <4C3AFE7B020000780000AB53@vpn.id2.novell.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 1486 bytes --]
Underlying interfaces allow this, and unduly (and silently) truncating
addresses doesn't seem nice.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
--- 2010-06-15.orig/xen/arch/x86/msi.c 2010-07-09 14:49:25.000000000 +0200
+++ 2010-06-15/xen/arch/x86/msi.c 2010-07-09 15:14:43.000000000 +0200
@@ -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)
+static int msix_get_fixmap(struct pci_dev *dev, u64 table_paddr,
+ u64 entry_paddr)
{
- int nr_page, idx;
+ 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;
[-- Attachment #2: x86-msix-table-64bit.patch --]
[-- Type: text/plain, Size: 1480 bytes --]
Underlying interfaces allow this, and unduly (and silently) truncating
addresses doesn't seem nice.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
--- 2010-06-15.orig/xen/arch/x86/msi.c 2010-07-09 14:49:25.000000000 +0200
+++ 2010-06-15/xen/arch/x86/msi.c 2010-07-09 15:14:43.000000000 +0200
@@ -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)
+static int msix_get_fixmap(struct pci_dev *dev, u64 table_paddr,
+ u64 entry_paddr)
{
- int nr_page, idx;
+ 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;
[-- Attachment #3: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
reply other threads:[~2010-07-12 9:37 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4C3AFE7B020000780000AB53@vpn.id2.novell.com \
--to=jbeulich@novell.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).