| Message ID | 20130422231235.32621.48799.stgit@bhelgaas-glaptop |
|---|---|
| State | Accepted |
| Headers | show |
On Mon, 2013-04-22 at 17:12 -0600, Bjorn Helgaas wrote: > 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> > CC: Alex Williamson <alex.williamson@redhat.com> > --- > drivers/vfio/pci/vfio_pci.c | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c > index 8189cb6..10626e8 100644 > --- a/drivers/vfio/pci/vfio_pci.c > +++ b/drivers/vfio/pci/vfio_pci.c > @@ -78,8 +78,8 @@ static int vfio_pci_enable(struct vfio_pci_device *vdev) > pci_read_config_word(pdev, msix_pos + PCI_MSIX_FLAGS, &flags); > pci_read_config_dword(pdev, msix_pos + PCI_MSIX_TABLE, &table); > > - vdev->msix_bar = table & PCI_MSIX_FLAGS_BIRMASK; > - vdev->msix_offset = table & ~PCI_MSIX_FLAGS_BIRMASK; > + vdev->msix_bar = table & PCI_MSIX_TABLE_BIR; > + vdev->msix_offset = table & PCI_MSIX_TABLE_OFFSET; > vdev->msix_size = ((flags & PCI_MSIX_FLAGS_QSIZE) + 1) * 16; > } else > vdev->msix_bar = 0xFF; > Acked-by: Alex Williamson <alex.williamson@redhat.com> -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c index 8189cb6..10626e8 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -78,8 +78,8 @@ static int vfio_pci_enable(struct vfio_pci_device *vdev) pci_read_config_word(pdev, msix_pos + PCI_MSIX_FLAGS, &flags); pci_read_config_dword(pdev, msix_pos + PCI_MSIX_TABLE, &table); - vdev->msix_bar = table & PCI_MSIX_FLAGS_BIRMASK; - vdev->msix_offset = table & ~PCI_MSIX_FLAGS_BIRMASK; + vdev->msix_bar = table & PCI_MSIX_TABLE_BIR; + vdev->msix_offset = table & PCI_MSIX_TABLE_OFFSET; vdev->msix_size = ((flags & PCI_MSIX_FLAGS_QSIZE) + 1) * 16; } else vdev->msix_bar = 0xFF;
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> CC: Alex Williamson <alex.williamson@redhat.com> --- drivers/vfio/pci/vfio_pci.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html