[Xen-changelog] [xen-unstable] msi: Mask out multi-function flag from PCI_HEADER_TYPE in read_pci_mem_bar()

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

# HG changeset patch
# User Keir Fraser <keir@xxxxxxx>
# Date 1287560444 -3600
# Node ID 4a2f991dcb71cd1c25ac868f3e4bdc50b027b8a3
# Parent  c0a39dbc624d459900eb907b21432bb53d8d032e
msi: Mask out multi-function flag from PCI_HEADER_TYPE in read_pci_mem_bar()

This leads to an erroneous WARN_ON and possibly other side effects. It
seems to me that even multi-function devices ought to enjoy the
privilege of MSI-X capabilities.

Signed-off-by: Gianni Tedesco <gianni.tedesco@xxxxxxxxxx>
---
 xen/arch/x86/msi.c |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r c0a39dbc624d -r 4a2f991dcb71 xen/arch/x86/msi.c
--- a/xen/arch/x86/msi.c        Mon Oct 18 17:40:08 2010 +0100
+++ b/xen/arch/x86/msi.c        Wed Oct 20 08:40:44 2010 +0100
@@ -527,7 +527,7 @@ static u64 read_pci_mem_bar(u8 bus, u8 s
     u8 limit;
     u32 addr;
 
-    switch ( pci_conf_read8(bus, slot, func, PCI_HEADER_TYPE) )
+    switch ( pci_conf_read8(bus, slot, func, PCI_HEADER_TYPE) & 0x7f )
     {
     case PCI_HEADER_TYPE_NORMAL:
         limit = 6;

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