]> git.proxmox.com Git - mirror_ubuntu-disco-kernel.git/commitdiff
xen/pci: Use PCI_MSIX_TABLE_BIR, not PCI_MSIX_FLAGS_BIRMASK
authorBjorn Helgaas <bhelgaas@google.com>
Mon, 22 Apr 2013 23:12:21 +0000 (17:12 -0600)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Fri, 10 May 2013 13:10:20 +0000 (09:10 -0400)
PCI_MSIX_FLAGS_BIRMASK is mis-named because the BIR mask is in the
Table Offset register, not the flags ("Message Control" per spec)
register.

Acked-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
CC: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
arch/x86/pci/xen.c

index 4a9be6ddf05437e66ab8c94862a9b3e8a30e4373..82c62d689da851157b5fc83c341e498d0a0f53c7 100644 (file)
@@ -299,7 +299,7 @@ static int xen_initdom_setup_msi_irqs(struct pci_dev *dev, int nvec, int type)
 
                        pci_read_config_dword(dev, pos + PCI_MSIX_TABLE,
                                              &table_offset);
-                       bir = (u8)(table_offset & PCI_MSIX_FLAGS_BIRMASK);
+                       bir = (u8)(table_offset & PCI_MSIX_TABLE_BIR);
 
                        map_irq.table_base = pci_resource_start(dev, bir);
                        map_irq.entry_nr = msidesc->msi_attrib.entry_nr;