| Message ID | 20200609091823.1346-1-piotr.stankiewicz@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v3,01/15] PCI/MSI: Forward MSI-X vector enable error code in pci_alloc_irq_vectors_affinity() | expand |
>-----Original Message----- >From: linux-rdma-owner@vger.kernel.org <linux-rdma- >owner@vger.kernel.org> On Behalf Of Piotr Stankiewicz >Sent: Tuesday, June 9, 2020 5:18 AM >To: Bjorn Helgaas <bhelgaas@google.com>; linux-pci@vger.kernel.org >Cc: Stankiewicz, Piotr <piotr.stankiewicz@intel.com>; Dalessandro, Dennis ><dennis.dalessandro@intel.com>; Marciniszyn, Mike ><mike.marciniszyn@intel.com>; Doug Ledford <dledford@redhat.com>; >Jason Gunthorpe <jgg@ziepe.ca>; Arnd Bergmann <arnd@arndb.de>; >Shevchenko, Andriy <andriy.shevchenko@intel.com>; linux- >rdma@vger.kernel.org; linux-kernel@vger.kernel.org >Subject: [PATCH v3 08/15] IB/qib: Use PCI_IRQ_MSI_TYPES where appropriate > >Seeing as there is shorthand available to use when asking for any type >of interrupt, or any type of message signalled interrupt, leverage it. > >Signed-off-by: Piotr Stankiewicz <piotr.stankiewicz@intel.com> >Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com> >--- > drivers/infiniband/hw/qib/qib_pcie.c | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > >diff --git a/drivers/infiniband/hw/qib/qib_pcie.c >b/drivers/infiniband/hw/qib/qib_pcie.c >index 3dc6ce033319..caff44d2c12c 100644 >--- a/drivers/infiniband/hw/qib/qib_pcie.c >+++ b/drivers/infiniband/hw/qib/qib_pcie.c >@@ -213,7 +213,7 @@ int qib_pcie_params(struct qib_devdata *dd, u32 >minw, u32 *nent) > u16 linkstat, speed; > int nvec; > int maxvec; >- unsigned int flags = PCI_IRQ_MSIX | PCI_IRQ_MSI; >+ unsigned int flags; > > if (!pci_is_pcie(dd->pcidev)) { > qib_dev_err(dd, "Can't find PCI Express capability!\n"); >@@ -225,7 +225,9 @@ int qib_pcie_params(struct qib_devdata *dd, u32 >minw, u32 *nent) > } > > if (dd->flags & QIB_HAS_INTX) >- flags |= PCI_IRQ_LEGACY; >+ flags = PCI_IRQ_ALL_TYPES; >+ else >+ flags = PCI_IRQ_MSI_TYPES; Thinking about lines of code, this patch could probably just be: - unsigned int flags = PCI_IRQ_MSIX | PCI_IRQ_MSI; + unsigned int flags = PCI_IRQ_MSI_TYPES; Or maybe even: - unsigned int flags = PCI_IRQ_MSIX | PCI_IRQ_MSI; + unsigned int flags = PCI_IRQ_ALL_TYPES; - if (dd->flags & QIB_HAS_INTX) - flags |= PCI_IRQ_LEGACY; ? M > maxvec = (nent && *nent) ? *nent : 1; > nvec = pci_alloc_irq_vectors(dd->pcidev, 1, maxvec, flags); > if (nvec < 0) >-- >2.17.2
diff --git a/drivers/infiniband/hw/qib/qib_pcie.c b/drivers/infiniband/hw/qib/qib_pcie.c index 3dc6ce033319..caff44d2c12c 100644 --- a/drivers/infiniband/hw/qib/qib_pcie.c +++ b/drivers/infiniband/hw/qib/qib_pcie.c @@ -213,7 +213,7 @@ int qib_pcie_params(struct qib_devdata *dd, u32 minw, u32 *nent) u16 linkstat, speed; int nvec; int maxvec; - unsigned int flags = PCI_IRQ_MSIX | PCI_IRQ_MSI; + unsigned int flags; if (!pci_is_pcie(dd->pcidev)) { qib_dev_err(dd, "Can't find PCI Express capability!\n"); @@ -225,7 +225,9 @@ int qib_pcie_params(struct qib_devdata *dd, u32 minw, u32 *nent) } if (dd->flags & QIB_HAS_INTX) - flags |= PCI_IRQ_LEGACY; + flags = PCI_IRQ_ALL_TYPES; + else + flags = PCI_IRQ_MSI_TYPES; maxvec = (nent && *nent) ? *nent : 1; nvec = pci_alloc_irq_vectors(dd->pcidev, 1, maxvec, flags); if (nvec < 0)