From: Damien Le Moal <dlemoal@kernel.org>
To: linux-pci@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>,
Manivannan Sadhasivami <manivannan.sadhasivam@linaro.org>,
linux-scsi@vger.kernel.org,
"Martin K . Petersen" <martin.petersen@oracle.com>,
Jaroslav Kysela <perex@perex.cz>,
linux-sound@vger.kernel.org,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, linux-serial@vger.kernel.org,
Hans de Goede <hdegoede@redhat.com>,
platform-driver-x86@vger.kernel.org, ntb@lists.linux.dev,
Lee Jones <lee@kernel.org>, David Airlie <airlied@gmail.com>,
amd-gfx@lists.freedesktop.org, Jason Gunthorpe <jgg@ziepe.ca>,
linux-rdma@vger.kernel.org,
"David S . Miller" <davem@davemloft.net>,
Eric Dumazet <edumazet@google.com>,
netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 11/28] infiniband: qib: Use PCI_IRQ_INTX
Date: Mon, 25 Mar 2024 16:09:22 +0900 [thread overview]
Message-ID: <20240325070944.3600338-12-dlemoal@kernel.org> (raw)
In-Reply-To: <20240325070944.3600338-1-dlemoal@kernel.org>
Use the macro PCI_IRQ_INTX instead of the deprecated PCI_IRQ_LEGACY
macro.
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
---
drivers/infiniband/hw/qib/qib_iba7220.c | 2 +-
drivers/infiniband/hw/qib/qib_iba7322.c | 5 ++---
drivers/infiniband/hw/qib/qib_pcie.c | 2 +-
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/infiniband/hw/qib/qib_iba7220.c b/drivers/infiniband/hw/qib/qib_iba7220.c
index 6af57067c32e..78dfe98ebcf7 100644
--- a/drivers/infiniband/hw/qib/qib_iba7220.c
+++ b/drivers/infiniband/hw/qib/qib_iba7220.c
@@ -3281,7 +3281,7 @@ static int qib_7220_intr_fallback(struct qib_devdata *dd)
qib_free_irq(dd);
dd->msi_lo = 0;
- if (pci_alloc_irq_vectors(dd->pcidev, 1, 1, PCI_IRQ_LEGACY) < 0)
+ if (pci_alloc_irq_vectors(dd->pcidev, 1, 1, PCI_IRQ_INTX) < 0)
qib_dev_err(dd, "Failed to enable INTx\n");
qib_setup_7220_interrupt(dd);
return 1;
diff --git a/drivers/infiniband/hw/qib/qib_iba7322.c b/drivers/infiniband/hw/qib/qib_iba7322.c
index f93906d8fc09..9db29916e35a 100644
--- a/drivers/infiniband/hw/qib/qib_iba7322.c
+++ b/drivers/infiniband/hw/qib/qib_iba7322.c
@@ -3471,8 +3471,7 @@ static void qib_setup_7322_interrupt(struct qib_devdata *dd, int clearpend)
pci_irq_vector(dd->pcidev, msixnum),
ret);
qib_7322_free_irq(dd);
- pci_alloc_irq_vectors(dd->pcidev, 1, 1,
- PCI_IRQ_LEGACY);
+ pci_alloc_irq_vectors(dd->pcidev, 1, 1, PCI_IRQ_INTX);
goto try_intx;
}
dd->cspec->msix_entries[msixnum].arg = arg;
@@ -5143,7 +5142,7 @@ static int qib_7322_intr_fallback(struct qib_devdata *dd)
qib_devinfo(dd->pcidev,
"MSIx interrupt not detected, trying INTx interrupts\n");
qib_7322_free_irq(dd);
- if (pci_alloc_irq_vectors(dd->pcidev, 1, 1, PCI_IRQ_LEGACY) < 0)
+ if (pci_alloc_irq_vectors(dd->pcidev, 1, 1, PCI_IRQ_INTX) < 0)
qib_dev_err(dd, "Failed to enable INTx\n");
qib_setup_7322_interrupt(dd, 0);
return 1;
diff --git a/drivers/infiniband/hw/qib/qib_pcie.c b/drivers/infiniband/hw/qib/qib_pcie.c
index 47bf64ace05c..58c1d62d341b 100644
--- a/drivers/infiniband/hw/qib/qib_pcie.c
+++ b/drivers/infiniband/hw/qib/qib_pcie.c
@@ -210,7 +210,7 @@ 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_INTX;
maxvec = (nent && *nent) ? *nent : 1;
nvec = pci_alloc_irq_vectors(dd->pcidev, 1, maxvec, flags);
if (nvec < 0)
--
2.44.0
next prev parent reply other threads:[~2024-03-25 7:10 UTC|newest]
Thread overview: 45+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-03-25 7:09 [PATCH 00/28] Remove PCI_IRQ_LEGACY Damien Le Moal
2024-03-25 7:09 ` [PATCH 01/28] PCI: msi: Use PCI_IRQ_INTX Damien Le Moal
2024-03-25 7:09 ` [PATCH 02/28] PCI: portdrv: " Damien Le Moal
2024-03-25 7:09 ` [PATCH 03/28] PCI: documentation: " Damien Le Moal
2024-03-25 7:09 ` [PATCH 04/28] sound: intel: " Damien Le Moal
2024-03-25 12:34 ` Amadeusz Sławiński
2024-03-25 12:57 ` Amadeusz Sławiński
2024-03-25 7:09 ` [PATCH 05/28] usb: hcd-pci: " Damien Le Moal
2024-03-26 8:28 ` Greg Kroah-Hartman
2024-03-25 7:09 ` [PATCH 06/28] tty: 8250_pci: " Damien Le Moal
2024-03-26 8:28 ` Greg Kroah-Hartman
2024-03-25 7:09 ` [PATCH 07/28] platform: intel_ips: " Damien Le Moal
2024-03-25 11:13 ` Hans de Goede
2024-03-25 7:09 ` [PATCH 08/28] ntb: " Damien Le Moal
2024-03-25 15:52 ` Dave Jiang
2024-03-25 7:09 ` [PATCH 09/28] mfd: intel-lpss-pci: " Damien Le Moal
2024-03-25 19:39 ` Andy Shevchenko
2024-03-25 21:04 ` Bjorn Helgaas
2024-03-26 21:14 ` Bjorn Helgaas
2024-03-25 7:09 ` [PATCH 10/28] drm: amdgpu: " Damien Le Moal
2024-03-25 14:29 ` Deucher, Alexander
2024-03-25 7:09 ` Damien Le Moal [this message]
2024-03-25 13:46 ` [PATCH 11/28] infiniband: qib: " Dennis Dalessandro
2024-03-25 7:09 ` [PATCH 12/28] infiniband: vmw_pvrdma: " Damien Le Moal
2024-03-25 7:09 ` [PATCH 13/28] misc: vmci_guest: Use PCI_IRQ_ALL_TYPES Damien Le Moal
2024-03-26 8:27 ` Greg Kroah-Hartman
2024-03-25 7:09 ` [PATCH 14/28] net: xgbe: Use PCI_IRQ_INTX Damien Le Moal
2024-03-25 7:09 ` [PATCH 15/28] net: aquantia atlantic: " Damien Le Moal
2024-03-25 7:09 ` [PATCH 16/28] net: atheros: alx: " Damien Le Moal
2024-03-25 7:09 ` [PATCH 17/28] net: realtek: r8169: " Damien Le Moal
2024-03-25 21:19 ` Heiner Kallweit
2024-03-25 7:09 ` [PATCH 18/28] net: wangxun: " Damien Le Moal
2024-03-25 7:09 ` [PATCH 19/28] net: wireless: ath10k: Use references to INTX instead of LEGACY Damien Le Moal
2024-03-25 7:09 ` [PATCH 20/28] net wireless; realtec: Use PCI_IRQ_INTX Damien Le Moal
2024-03-25 7:09 ` [PATCH 21/28] scsi: arcmsr: " Damien Le Moal
2024-03-25 7:09 ` [PATCH 22/28] scsi: hpsa: " Damien Le Moal
2024-03-25 7:09 ` [PATCH 23/28] scsi: ipr: " Damien Le Moal
2024-03-25 7:09 ` [PATCH 24/28] scsi: megaraid: " Damien Le Moal
2024-03-25 7:09 ` [PATCH 25/28] scsi: mpt3sas: " Damien Le Moal
2024-03-25 7:09 ` [PATCH 26/28] scsi: pmcraid: " Damien Le Moal
2024-03-25 7:09 ` [PATCH 27/28] scsi: vmw_pvscsi: Do not use PCI_IRQ_LEGACY Damien Le Moal
2024-03-25 7:09 ` [PATCH 28/28] PCI: Remove PCI_IRQ_LEGACY Damien Le Moal
2024-03-25 17:59 ` [PATCH 00/28] " Bjorn Helgaas
2024-03-25 23:06 ` Damien Le Moal
2024-03-25 22:41 ` [External] : " Martin K. Petersen
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=20240325070944.3600338-12-dlemoal@kernel.org \
--to=dlemoal@kernel.org \
--cc=airlied@gmail.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=bhelgaas@google.com \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=gregkh@linuxfoundation.org \
--cc=hdegoede@redhat.com \
--cc=jgg@ziepe.ca \
--cc=lee@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux-rdma@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=linux-serial@vger.kernel.org \
--cc=linux-sound@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=manivannan.sadhasivam@linaro.org \
--cc=martin.petersen@oracle.com \
--cc=netdev@vger.kernel.org \
--cc=ntb@lists.linux.dev \
--cc=perex@perex.cz \
--cc=platform-driver-x86@vger.kernel.org \
/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 read-only IMAP folder(s) and NNTP newsgroup(s).