diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-17 20:10:07 -0400 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2013-04-23 11:50:30 -0400 |
| commit | 4d18760c67af2688a6f9d3f0131dc505e0b9f2c9 (patch) | |
| tree | c606439f6332b4051ae9fb43addfaee9db327773 /drivers/pci | |
| parent | 78b5a310ce0ff22889e1a1af932e5c17b26962ba (diff) | |
PCI: Use PCI_MSIX_TABLE_BIR, not PCI_MSIX_FLAGS_BIRMASK
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.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/msi.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/msi.c b/drivers/pci/msi.c index afdc388b9553..f8a1f39e4f68 100644 --- a/drivers/pci/msi.c +++ b/drivers/pci/msi.c | |||
| @@ -605,8 +605,8 @@ static void __iomem *msix_map_region(struct pci_dev *dev, unsigned nr_entries) | |||
| 605 | 605 | ||
| 606 | pci_read_config_dword(dev, dev->msix_cap + PCI_MSIX_TABLE, | 606 | pci_read_config_dword(dev, dev->msix_cap + PCI_MSIX_TABLE, |
| 607 | &table_offset); | 607 | &table_offset); |
| 608 | bir = (u8)(table_offset & PCI_MSIX_FLAGS_BIRMASK); | 608 | bir = (u8)(table_offset & PCI_MSIX_TABLE_BIR); |
| 609 | table_offset &= ~PCI_MSIX_FLAGS_BIRMASK; | 609 | table_offset &= PCI_MSIX_TABLE_OFFSET; |
| 610 | phys_addr = pci_resource_start(dev, bir) + table_offset; | 610 | phys_addr = pci_resource_start(dev, bir) + table_offset; |
| 611 | 611 | ||
| 612 | return ioremap_nocache(phys_addr, nr_entries * PCI_MSIX_ENTRY_SIZE); | 612 | return ioremap_nocache(phys_addr, nr_entries * PCI_MSIX_ENTRY_SIZE); |