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 15/28] net: aquantia atlantic: Use PCI_IRQ_INTX
Date: Mon, 25 Mar 2024 16:09:26 +0900 [thread overview]
Message-ID: <20240325070944.3600338-16-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. To be consistent with this change, the macros AQ_HW_IRQ_LEGACY
and AQ_CFG_FORCE_LEGACY_INT are respectively renamed to AQ_HW_IRQ_INTX
and AQ_CFG_FORCE_INTX.
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
---
drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 2 +-
drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 2 +-
drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 +-
drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c | 9 +++------
.../net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 2 +-
.../net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 2 +-
drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c | 2 +-
7 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h b/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
index 7e9c74b141ef..fc2b325f34e7 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
@@ -17,7 +17,7 @@
#define AQ_CFG_IS_POLLING_DEF 0U
-#define AQ_CFG_FORCE_LEGACY_INT 0U
+#define AQ_CFG_FORCE_INTX 0U
#define AQ_CFG_INTERRUPT_MODERATION_OFF 0
#define AQ_CFG_INTERRUPT_MODERATION_ON 1
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
index dbd284660135..f010bda61c96 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_hw.h
@@ -104,7 +104,7 @@ struct aq_stats_s {
};
#define AQ_HW_IRQ_INVALID 0U
-#define AQ_HW_IRQ_LEGACY 1U
+#define AQ_HW_IRQ_INTX 1U
#define AQ_HW_IRQ_MSI 2U
#define AQ_HW_IRQ_MSIX 3U
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
index d6d6d5d37ff3..fe0e3e2a8117 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_nic.c
@@ -127,7 +127,7 @@ void aq_nic_cfg_start(struct aq_nic_s *self)
cfg->irq_type = aq_pci_func_get_irq_type(self);
- if ((cfg->irq_type == AQ_HW_IRQ_LEGACY) ||
+ if ((cfg->irq_type == AQ_HW_IRQ_INTX) ||
(cfg->aq_hw_caps->vecs == 1U) ||
(cfg->vecs == 1U)) {
cfg->is_rss = 0U;
diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
index baa5f8cc31f2..43c71f6b314f 100644
--- a/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
+++ b/drivers/net/ethernet/aquantia/atlantic/aq_pci_func.c
@@ -200,7 +200,7 @@ unsigned int aq_pci_func_get_irq_type(struct aq_nic_s *self)
if (self->pdev->msi_enabled)
return AQ_HW_IRQ_MSI;
- return AQ_HW_IRQ_LEGACY;
+ return AQ_HW_IRQ_INTX;
}
static void aq_pci_free_irq_vectors(struct aq_nic_s *self)
@@ -298,11 +298,8 @@ static int aq_pci_probe(struct pci_dev *pdev,
numvecs += AQ_HW_SERVICE_IRQS;
/*enable interrupts */
-#if !AQ_CFG_FORCE_LEGACY_INT
- err = pci_alloc_irq_vectors(self->pdev, 1, numvecs,
- PCI_IRQ_MSIX | PCI_IRQ_MSI |
- PCI_IRQ_LEGACY);
-
+#if !AQ_CFG_FORCE_INTX
+ err = pci_alloc_irq_vectors(self->pdev, 1, numvecs, PCI_IRQ_ALL_TYPES);
if (err < 0)
goto err_hwinit;
numvecs = err;
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
index 9dfd68f0fda9..8de2cdd09213 100644
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c
@@ -352,7 +352,7 @@ static int hw_atl_a0_hw_init(struct aq_hw_s *self, const u8 *mac_addr)
{
static u32 aq_hw_atl_igcr_table_[4][2] = {
[AQ_HW_IRQ_INVALID] = { 0x20000000U, 0x20000000U },
- [AQ_HW_IRQ_LEGACY] = { 0x20000080U, 0x20000080U },
+ [AQ_HW_IRQ_INTX] = { 0x20000080U, 0x20000080U },
[AQ_HW_IRQ_MSI] = { 0x20000021U, 0x20000025U },
[AQ_HW_IRQ_MSIX] = { 0x20000022U, 0x20000026U },
};
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
index 54e70f07b573..56c46266bb0a 100644
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c
@@ -562,7 +562,7 @@ static int hw_atl_b0_hw_init(struct aq_hw_s *self, const u8 *mac_addr)
{
static u32 aq_hw_atl_igcr_table_[4][2] = {
[AQ_HW_IRQ_INVALID] = { 0x20000000U, 0x20000000U },
- [AQ_HW_IRQ_LEGACY] = { 0x20000080U, 0x20000080U },
+ [AQ_HW_IRQ_INTX] = { 0x20000080U, 0x20000080U },
[AQ_HW_IRQ_MSI] = { 0x20000021U, 0x20000025U },
[AQ_HW_IRQ_MSIX] = { 0x20000022U, 0x20000026U },
};
diff --git a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c
index 220400a633f5..b0ed572e88c6 100644
--- a/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c
+++ b/drivers/net/ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c
@@ -534,7 +534,7 @@ static int hw_atl2_hw_init(struct aq_hw_s *self, const u8 *mac_addr)
{
static u32 aq_hw_atl2_igcr_table_[4][2] = {
[AQ_HW_IRQ_INVALID] = { 0x20000000U, 0x20000000U },
- [AQ_HW_IRQ_LEGACY] = { 0x20000080U, 0x20000080U },
+ [AQ_HW_IRQ_INTX] = { 0x20000080U, 0x20000080U },
[AQ_HW_IRQ_MSI] = { 0x20000021U, 0x20000025U },
[AQ_HW_IRQ_MSIX] = { 0x20000022U, 0x20000026U },
};
--
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 ` [PATCH 11/28] infiniband: qib: " Damien Le Moal
2024-03-25 13:46 ` 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 ` Damien Le Moal [this message]
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-16-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 NNTP newsgroup(s).