* [PATCH 03/15] PCI: use PCI_IRQ_MSI_TYPES where appropriate
@ 2020-06-02 9:20 Piotr Stankiewicz
2020-06-02 15:40 ` Logan Gunthorpe
0 siblings, 1 reply; 2+ messages in thread
From: Piotr Stankiewicz @ 2020-06-02 9:20 UTC (permalink / raw)
To: Bjorn Helgaas, Kurt Schwemmer, Logan Gunthorpe
Cc: linux-pci, linux-kernel, Piotr Stankiewicz
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/pci/pcie/portdrv_core.c | 4 ++--
drivers/pci/switch/switchtec.c | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
index 50a9522ab07d..2a38a918ba12 100644
--- a/drivers/pci/pcie/portdrv_core.c
+++ b/drivers/pci/pcie/portdrv_core.c
@@ -105,7 +105,7 @@ static int pcie_port_enable_irq_vec(struct pci_dev *dev, int *irqs, int mask)
/* Allocate the maximum possible number of MSI/MSI-X vectors */
nr_entries = pci_alloc_irq_vectors(dev, 1, PCIE_PORT_MAX_MSI_ENTRIES,
- PCI_IRQ_MSIX | PCI_IRQ_MSI);
+ PCI_IRQ_MSI_TYPES);
if (nr_entries < 0)
return nr_entries;
@@ -131,7 +131,7 @@ static int pcie_port_enable_irq_vec(struct pci_dev *dev, int *irqs, int mask)
pci_free_irq_vectors(dev);
nr_entries = pci_alloc_irq_vectors(dev, nvec, nvec,
- PCI_IRQ_MSIX | PCI_IRQ_MSI);
+ PCI_IRQ_MSI_TYPES);
if (nr_entries < 0)
return nr_entries;
}
diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c
index e69cac84b605..11fbe9c6b201 100644
--- a/drivers/pci/switch/switchtec.c
+++ b/drivers/pci/switch/switchtec.c
@@ -1442,8 +1442,7 @@ static int switchtec_init_isr(struct switchtec_dev *stdev)
nirqs = 4;
nvecs = pci_alloc_irq_vectors(stdev->pdev, 1, nirqs,
- PCI_IRQ_MSIX | PCI_IRQ_MSI |
- PCI_IRQ_VIRTUAL);
+ PCI_IRQ_MSI_TYPES | PCI_IRQ_VIRTUAL);
if (nvecs < 0)
return nvecs;
--
2.17.2
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 03/15] PCI: use PCI_IRQ_MSI_TYPES where appropriate
2020-06-02 9:20 [PATCH 03/15] PCI: use PCI_IRQ_MSI_TYPES where appropriate Piotr Stankiewicz
@ 2020-06-02 15:40 ` Logan Gunthorpe
0 siblings, 0 replies; 2+ messages in thread
From: Logan Gunthorpe @ 2020-06-02 15:40 UTC (permalink / raw)
To: Piotr Stankiewicz, Bjorn Helgaas, Kurt Schwemmer; +Cc: linux-pci, linux-kernel
On 2020-06-02 3:20 a.m., Piotr Stankiewicz wrote:
> 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>
Seems fine to me, for the switchtec portions:
Reviewed-by: Logan Gunthorpe <logang@deltatee.com>
> ---
> drivers/pci/pcie/portdrv_core.c | 4 ++--
> drivers/pci/switch/switchtec.c | 3 +--
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/pci/pcie/portdrv_core.c b/drivers/pci/pcie/portdrv_core.c
> index 50a9522ab07d..2a38a918ba12 100644
> --- a/drivers/pci/pcie/portdrv_core.c
> +++ b/drivers/pci/pcie/portdrv_core.c
> @@ -105,7 +105,7 @@ static int pcie_port_enable_irq_vec(struct pci_dev *dev, int *irqs, int mask)
>
> /* Allocate the maximum possible number of MSI/MSI-X vectors */
> nr_entries = pci_alloc_irq_vectors(dev, 1, PCIE_PORT_MAX_MSI_ENTRIES,
> - PCI_IRQ_MSIX | PCI_IRQ_MSI);
> + PCI_IRQ_MSI_TYPES);
> if (nr_entries < 0)
> return nr_entries;
>
> @@ -131,7 +131,7 @@ static int pcie_port_enable_irq_vec(struct pci_dev *dev, int *irqs, int mask)
> pci_free_irq_vectors(dev);
>
> nr_entries = pci_alloc_irq_vectors(dev, nvec, nvec,
> - PCI_IRQ_MSIX | PCI_IRQ_MSI);
> + PCI_IRQ_MSI_TYPES);
> if (nr_entries < 0)
> return nr_entries;
> }
> diff --git a/drivers/pci/switch/switchtec.c b/drivers/pci/switch/switchtec.c
> index e69cac84b605..11fbe9c6b201 100644
> --- a/drivers/pci/switch/switchtec.c
> +++ b/drivers/pci/switch/switchtec.c
> @@ -1442,8 +1442,7 @@ static int switchtec_init_isr(struct switchtec_dev *stdev)
> nirqs = 4;
>
> nvecs = pci_alloc_irq_vectors(stdev->pdev, 1, nirqs,
> - PCI_IRQ_MSIX | PCI_IRQ_MSI |
> - PCI_IRQ_VIRTUAL);
> + PCI_IRQ_MSI_TYPES | PCI_IRQ_VIRTUAL);
> if (nvecs < 0)
> return nvecs;
>
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-06-02 16:18 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-06-02 9:20 [PATCH 03/15] PCI: use PCI_IRQ_MSI_TYPES where appropriate Piotr Stankiewicz
2020-06-02 15:40 ` Logan Gunthorpe
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).