| Message ID | 20130422231242.32621.38158.stgit@bhelgaas-glaptop |
|---|---|
| State | Accepted |
| Headers | show |
On Mon, 2013-04-22 at 17:12 -0600, Bjorn Helgaas wrote: > We now cache the MSI/MSI-X capability offsets in the struct pci_dev, > so no need to find the capabilities again. > > Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> > CC: Alex Williamson <alex.williamson@redhat.com> > --- > drivers/vfio/pci/vfio_pci.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/drivers/vfio/pci/vfio_pci.c b/drivers/vfio/pci/vfio_pci.c > index 10626e8..05afe88 100644 > --- a/drivers/vfio/pci/vfio_pci.c > +++ b/drivers/vfio/pci/vfio_pci.c > @@ -70,7 +70,7 @@ static int vfio_pci_enable(struct vfio_pci_device *vdev) > pci_write_config_word(pdev, PCI_COMMAND, cmd); > } > > - msix_pos = pci_find_capability(pdev, PCI_CAP_ID_MSIX); > + msix_pos = pdev->msix_cap; > if (msix_pos) { > u16 flags; > u32 table; > @@ -183,7 +183,7 @@ static int vfio_pci_get_irq_count(struct vfio_pci_device *vdev, int irq_type) > u8 pos; > u16 flags; > > - pos = pci_find_capability(vdev->pdev, PCI_CAP_ID_MSI); > + pos = vdev->pdev->msi_cap; > if (pos) { > pci_read_config_word(vdev->pdev, > pos + PCI_MSI_FLAGS, &flags); > @@ -194,7 +194,7 @@ static int vfio_pci_get_irq_count(struct vfio_pci_device *vdev, int irq_type) > u8 pos; > u16 flags; > > - pos = pci_find_capability(vdev->pdev, PCI_CAP_ID_MSIX); > + pos = vdev->pdev->msix_cap; > if (pos) { > pci_read_config_word(vdev->pdev, > pos + PCI_MSIX_FLAGS, &flags); > 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 10626e8..05afe88 100644 --- a/drivers/vfio/pci/vfio_pci.c +++ b/drivers/vfio/pci/vfio_pci.c @@ -70,7 +70,7 @@ static int vfio_pci_enable(struct vfio_pci_device *vdev) pci_write_config_word(pdev, PCI_COMMAND, cmd); } - msix_pos = pci_find_capability(pdev, PCI_CAP_ID_MSIX); + msix_pos = pdev->msix_cap; if (msix_pos) { u16 flags; u32 table; @@ -183,7 +183,7 @@ static int vfio_pci_get_irq_count(struct vfio_pci_device *vdev, int irq_type) u8 pos; u16 flags; - pos = pci_find_capability(vdev->pdev, PCI_CAP_ID_MSI); + pos = vdev->pdev->msi_cap; if (pos) { pci_read_config_word(vdev->pdev, pos + PCI_MSI_FLAGS, &flags); @@ -194,7 +194,7 @@ static int vfio_pci_get_irq_count(struct vfio_pci_device *vdev, int irq_type) u8 pos; u16 flags; - pos = pci_find_capability(vdev->pdev, PCI_CAP_ID_MSIX); + pos = vdev->pdev->msix_cap; if (pos) { pci_read_config_word(vdev->pdev, pos + PCI_MSIX_FLAGS, &flags);
We now cache the MSI/MSI-X capability offsets in the struct pci_dev, so no need to find the capabilities again. Signed-off-by: Bjorn Helgaas <bhelgaas@google.com> CC: Alex Williamson <alex.williamson@redhat.com> --- drivers/vfio/pci/vfio_pci.c | 6 +++--- 1 file changed, 3 insertions(+), 3 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