From: Piotr Stankiewicz <piotr.stankiewicz@intel.com>
To: Bjorn Helgaas <bhelgaas@google.com>, linux-pci@vger.kernel.org
Cc: Piotr Stankiewicz <piotr.stankiewicz@intel.com>,
Kurt Schwemmer <kurt.schwemmer@microsemi.com>,
Logan Gunthorpe <logang@deltatee.com>,
Mika Westerberg <mika.westerberg@linux.intel.com>,
"Rafael J. Wysocki" <rafael.j.wysocki@intel.com>,
Andy Shevchenko <andriy.shevchenko@intel.com>,
Olof Johansson <olof@lixom.net>,
Kuppuswamy Sathyanarayanan
<sathyanarayanan.kuppuswamy@linux.intel.com>,
Kelvin Cao <kelvin.cao@microchip.com>,
Wesley Sheng <wesley.sheng@microchip.com>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>,
Krzysztof Wilczynski <kw@linux.com>,
Sebastian Andrzej Siewior <bigeasy@linutronix.de>,
linux-kernel@vger.kernel.org
Subject: [PATCH v3 03/15] PCI: Use PCI_IRQ_MSI_TYPES where appropriate
Date: Tue, 9 Jun 2020 11:16:46 +0200 [thread overview]
Message-ID: <20200609091650.801-1-piotr.stankiewicz@intel.com> (raw)
In-Reply-To: <20200609091148.32749-1-piotr.stankiewicz@intel.com>
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>
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 850cfeb74608..0ab17a71fe63 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
next prev parent reply other threads:[~2020-06-09 9:17 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20200603114212.12525-1-piotr.stankiewicz@intel.com>
2020-06-03 11:44 ` [PATCH v2 01/15] PCI/MSI: Forward MSI-X vector enable error code in pci_alloc_irq_vectors_affinity() Piotr Stankiewicz
2020-06-03 15:48 ` Logan Gunthorpe
2020-06-03 16:04 ` Stankiewicz, Piotr
2020-06-03 16:22 ` Logan Gunthorpe
2020-06-09 9:27 ` Stankiewicz, Piotr
2020-06-03 11:46 ` [PATCH v2 03/15] PCI: Use PCI_IRQ_MSI_TYPES where appropriate Piotr Stankiewicz
2020-06-03 11:47 ` [PATCH v2 04/15] ahci: " Piotr Stankiewicz
2020-06-03 11:47 ` [PATCH v2 05/15] crypto: inside-secure - " Piotr Stankiewicz
2020-06-03 13:30 ` kernel test robot
2020-06-03 11:47 ` [PATCH v2 06/15] dmaengine: dw-edma: " Piotr Stankiewicz
2020-06-03 11:54 ` Gustavo Pimentel
2020-06-03 11:47 ` [PATCH v2 07/15] drm/amdgpu: " Piotr Stankiewicz
2020-06-03 13:43 ` Alex Deucher
2020-06-03 11:48 ` [PATCH v2 08/15] IB/qib: " Piotr Stankiewicz
2020-06-03 11:48 ` [PATCH v2 09/15] media: ddbridge: " Piotr Stankiewicz
2020-06-03 11:48 ` [PATCH v2 10/15] vmw_vmci: Use PCI_IRQ_ALL_TYPES " Piotr Stankiewicz
2020-06-03 11:49 ` [PATCH v2 11/15] mmc: sdhci: Use PCI_IRQ_MSI_TYPES " Piotr Stankiewicz
2020-06-03 11:49 ` [PATCH v2 12/15] amd-xgbe: " Piotr Stankiewicz
2020-06-03 11:49 ` [PATCH v2 13/15] aquantia: atlantic: Use PCI_IRQ_ALL_TYPES " Piotr Stankiewicz
2020-06-03 11:49 ` [PATCH v2 14/15] net: hns3: Use PCI_IRQ_MSI_TYPES " Piotr Stankiewicz
2020-06-03 11:50 ` [PATCH v2 15/15] scsi: Use PCI_IRQ_MSI_TYPES and PCI_IRQ_ALL_TYPES " Piotr Stankiewicz
2020-06-09 9:11 ` [PATCH v3 00/15] Forward MSI-X vector enable error code in pci_alloc_irq_vectors_affinity() Piotr Stankiewicz
2020-06-09 9:14 ` [PATCH v3 01/15] PCI/MSI: " Piotr Stankiewicz
2020-06-09 15:49 ` Logan Gunthorpe
2020-06-09 15:49 ` Christoph Hellwig
2020-06-09 9:16 ` Piotr Stankiewicz [this message]
2020-06-09 15:51 ` [PATCH v3 03/15] PCI: Use PCI_IRQ_MSI_TYPES where appropriate Christoph Hellwig
2020-06-09 16:31 ` Stankiewicz, Piotr
2020-06-09 16:35 ` Logan Gunthorpe
2020-06-09 9:17 ` [PATCH v3 04/15] ahci: " Piotr Stankiewicz
2020-06-09 9:17 ` [PATCH v3 05/15] crypto: inside-secure - " Piotr Stankiewicz
2020-06-09 9:17 ` [PATCH v3 06/15] dmaengine: dw-edma: " Piotr Stankiewicz
2020-06-09 10:01 ` Andy Shevchenko
2020-06-09 9:18 ` [PATCH v3 07/15] drm/amdgpu: " Piotr Stankiewicz
2020-06-09 20:23 ` Alex Deucher
2020-06-16 7:49 ` Stankiewicz, Piotr
2020-06-16 8:42 ` [PATCH] drm/amdgpu: Simplify IRQ vector request logic Piotr Stankiewicz
2020-06-09 9:18 ` [PATCH v3 08/15] IB/qib: Use PCI_IRQ_MSI_TYPES where appropriate Piotr Stankiewicz
2020-06-11 13:17 ` Ruhl, Michael J
2020-06-09 9:18 ` [PATCH v3 09/15] media: ddbridge: " Piotr Stankiewicz
2020-06-09 9:19 ` [PATCH v3 10/15] vmw_vmci: Use PCI_IRQ_ALL_TYPES " Piotr Stankiewicz
2020-06-09 9:19 ` [PATCH v3 11/15] mmc: sdhci: Use PCI_IRQ_MSI_TYPES " Piotr Stankiewicz
2020-06-09 9:19 ` [PATCH v3 12/15] amd-xgbe: " Piotr Stankiewicz
2020-06-09 9:19 ` [PATCH v3 13/15] aquantia: atlantic: Use PCI_IRQ_ALL_TYPES " Piotr Stankiewicz
2020-06-09 9:20 ` [PATCH v3 14/15] net: hns3: Use PCI_IRQ_MSI_TYPES " Piotr Stankiewicz
2020-06-09 9:20 ` [PATCH v3 15/15] scsi: Use PCI_IRQ_MSI_TYPES and PCI_IRQ_ALL_TYPES " Piotr Stankiewicz
2020-06-09 16:22 ` [PATCH v3 02/15] PCI: Add macro for message signalled interrupt types Piotr Stankiewicz
2020-06-10 7:08 ` Christoph Hellwig
2020-06-16 7:39 ` Stankiewicz, Piotr
2020-06-16 7:33 ` [PATCH v4] PCI/MSI: Forward MSI-X vector enable error code in pci_alloc_irq_vectors_affinity() Piotr Stankiewicz
2020-06-30 22:04 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200609091650.801-1-piotr.stankiewicz@intel.com \
--to=piotr.stankiewicz@intel.com \
--cc=andriy.shevchenko@intel.com \
--cc=bhelgaas@google.com \
--cc=bigeasy@linutronix.de \
--cc=kelvin.cao@microchip.com \
--cc=kurt.schwemmer@microsemi.com \
--cc=kw@linux.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=logang@deltatee.com \
--cc=mika.westerberg@linux.intel.com \
--cc=olof@lixom.net \
--cc=peterz@infradead.org \
--cc=rafael.j.wysocki@intel.com \
--cc=sathyanarayanan.kuppuswamy@linux.intel.com \
--cc=wesley.sheng@microchip.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).