net: atlantic: Use PCI_IRQ_INTX instead of PCI_IRQ_LEGACY

Use the macro PCI_IRQ_INTX instead of the deprecated PCI_IRQ_LEGACY macro.

To be consistent with this change, rename AQ_HW_IRQ_LEGACY and
AQ_CFG_FORCE_LEGACY_INT to AQ_HW_IRQ_INTX and AQ_CFG_FORCE_INTX.

Link: https://lore.kernel.org/r/20240325070944.3600338-16-dlemoal@kernel.org
Signed-off-by: Damien Le Moal <dlemoal@kernel.org>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h b/drivers/net/ethernet/aquantia/atlantic/aq_cfg.h
index 7e9c74b141efb134c328ac48637fd5869e1b56a4..fc2b325f34e79fd1a808476b971ce5a73dc271e2 100644 (file)
--- 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 dbd28466013580aca8cab6b99bbc168dd9c40e99..f010bda61c96117df549461558fdf02a37f36b5d 100644 (file)
--- 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 d6d6d5d37ff3e639a0ab11ec43f7ad66f2441595..fe0e3e2a8117188e268e62b182d66f3d936c37a8 100644 (file)
--- 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 baa5f8cc31f219558989407c7b0dee17f6241ae5..43c71f6b314f9da85be103b67b370c63bdf6fb31 100644 (file)
--- 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 9dfd68f0fda955084a40761e6a4b228954aa5aae..8de2cdd09213837d05049bd3b80dcedb658118a9 100644 (file)
--- 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 54e70f07b57341ba3f62e72cd5cbd965edf0e4a7..56c46266bb0ae5188b5908f9233d7344a97565c3 100644 (file)
--- 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 220400a633f5e5a7eb91b8eb808495ae725b35b1..b0ed572e88c67a9eeec2d62d935aec8ec34722de 100644 (file)
--- 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 },
        };