* [PATCH net-next 0/8][pull request] Intel Wired LAN: Remove redundant Device Control Error Reporting Enable
@ 2023-01-30 19:25 Tony Nguyen
2023-01-30 19:25 ` [Intel-wired-lan] " Tony Nguyen
` (9 more replies)
0 siblings, 10 replies; 21+ messages in thread
From: Tony Nguyen @ 2023-01-30 19:25 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet; +Cc: Tony Nguyen, netdev, bhelgaas
Bjorn Helgaas says:
Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"),
the PCI core sets the Device Control bits that enable error reporting for
PCIe devices.
This series removes redundant calls to pci_enable_pcie_error_reporting()
that do the same thing from several NIC drivers.
There are several more drivers where this should be removed; I started with
just the Intel drivers here.
---
TN: Removed mention of AER driver as this was taken through PCI tree [1]
and fixed a typo.
[1] https://lore.kernel.org/all/20230126231527.GA1322015@bhelgaas/
The following are changes since commit 90e8ca0abb05ada6c1e2710eaa21688dafca26f2:
Merge branch 'devlink-next'
and are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 10GbE
Bjorn Helgaas (8):
e1000e: Remove redundant pci_enable_pcie_error_reporting()
fm10k: Remove redundant pci_enable_pcie_error_reporting()
i40e: Remove redundant pci_enable_pcie_error_reporting()
iavf: Remove redundant pci_enable_pcie_error_reporting()
ice: Remove redundant pci_enable_pcie_error_reporting()
igb: Remove redundant pci_enable_pcie_error_reporting()
igc: Remove redundant pci_enable_pcie_error_reporting()
ixgbe: Remove redundant pci_enable_pcie_error_reporting()
drivers/net/ethernet/intel/e1000e/netdev.c | 7 -------
drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 5 -----
drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ----
drivers/net/ethernet/intel/iavf/iavf_main.c | 5 -----
drivers/net/ethernet/intel/ice/ice_main.c | 3 ---
drivers/net/ethernet/intel/igb/igb_main.c | 5 -----
drivers/net/ethernet/intel/igc/igc_main.c | 5 -----
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 -----
8 files changed, 39 deletions(-)
--
2.38.1
^ permalink raw reply [flat|nested] 21+ messages in thread
* [PATCH net-next 1/8] e1000e: Remove redundant pci_enable_pcie_error_reporting()
2023-01-30 19:25 [PATCH net-next 0/8][pull request] Intel Wired LAN: Remove redundant Device Control Error Reporting Enable Tony Nguyen
@ 2023-01-30 19:25 ` Tony Nguyen
2023-01-30 19:25 ` [Intel-wired-lan] " Tony Nguyen
` (8 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Tony Nguyen @ 2023-01-30 19:25 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet
Cc: Bjorn Helgaas, netdev, anthony.l.nguyen, Jesse Brandeburg,
intel-wired-lan
From: Bjorn Helgaas <bhelgaas@google.com>
pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration.
Remove the redundant pci_enable_pcie_error_reporting() call from the
driver. Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.
Note that this doesn't control interrupt generation by the Root Port; that
is controlled by the AER Root Error Command register, which is managed by
the AER service driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/e1000e/netdev.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 04acd1a992fa..e1eb1de88bf9 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -7418,9 +7418,6 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (err)
goto err_pci_reg;
- /* AER (Advanced Error Reporting) hooks */
- pci_enable_pcie_error_reporting(pdev);
-
pci_set_master(pdev);
/* PCI config space info */
err = pci_save_state(pdev);
@@ -7708,7 +7705,6 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err_ioremap:
free_netdev(netdev);
err_alloc_etherdev:
- pci_disable_pcie_error_reporting(pdev);
pci_release_mem_regions(pdev);
err_pci_reg:
err_dma:
@@ -7775,9 +7771,6 @@ static void e1000_remove(struct pci_dev *pdev)
free_netdev(netdev);
- /* AER disable */
- pci_disable_pcie_error_reporting(pdev);
-
pci_disable_device(pdev);
}
--
2.38.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [PATCH net-next 1/8] e1000e: Remove redundant pci_enable_pcie_error_reporting()
@ 2023-01-30 19:25 ` Tony Nguyen
0 siblings, 0 replies; 21+ messages in thread
From: Tony Nguyen @ 2023-01-30 19:25 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet
Cc: Bjorn Helgaas, netdev, intel-wired-lan, anthony.l.nguyen,
Jesse Brandeburg
From: Bjorn Helgaas <bhelgaas@google.com>
pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration.
Remove the redundant pci_enable_pcie_error_reporting() call from the
driver. Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.
Note that this doesn't control interrupt generation by the Root Port; that
is controlled by the AER Root Error Command register, which is managed by
the AER service driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/e1000e/netdev.c | 7 -------
1 file changed, 7 deletions(-)
diff --git a/drivers/net/ethernet/intel/e1000e/netdev.c b/drivers/net/ethernet/intel/e1000e/netdev.c
index 04acd1a992fa..e1eb1de88bf9 100644
--- a/drivers/net/ethernet/intel/e1000e/netdev.c
+++ b/drivers/net/ethernet/intel/e1000e/netdev.c
@@ -7418,9 +7418,6 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (err)
goto err_pci_reg;
- /* AER (Advanced Error Reporting) hooks */
- pci_enable_pcie_error_reporting(pdev);
-
pci_set_master(pdev);
/* PCI config space info */
err = pci_save_state(pdev);
@@ -7708,7 +7705,6 @@ static int e1000_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err_ioremap:
free_netdev(netdev);
err_alloc_etherdev:
- pci_disable_pcie_error_reporting(pdev);
pci_release_mem_regions(pdev);
err_pci_reg:
err_dma:
@@ -7775,9 +7771,6 @@ static void e1000_remove(struct pci_dev *pdev)
free_netdev(netdev);
- /* AER disable */
- pci_disable_pcie_error_reporting(pdev);
-
pci_disable_device(pdev);
}
--
2.38.1
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH net-next 2/8] fm10k: Remove redundant pci_enable_pcie_error_reporting()
2023-01-30 19:25 [PATCH net-next 0/8][pull request] Intel Wired LAN: Remove redundant Device Control Error Reporting Enable Tony Nguyen
@ 2023-01-30 19:25 ` Tony Nguyen
2023-01-30 19:25 ` [Intel-wired-lan] " Tony Nguyen
` (8 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Tony Nguyen @ 2023-01-30 19:25 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet
Cc: Bjorn Helgaas, netdev, anthony.l.nguyen, Jesse Brandeburg,
intel-wired-lan
From: Bjorn Helgaas <bhelgaas@google.com>
pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration.
Remove the redundant pci_enable_pcie_error_reporting() call from the
driver. Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.
Note that this doesn't control interrupt generation by the Root Port; that
is controlled by the AER Root Error Command register, which is managed by
the AER service driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index b473cb7d7c57..027d721feb18 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -2127,8 +2127,6 @@ static int fm10k_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto err_pci_reg;
}
- pci_enable_pcie_error_reporting(pdev);
-
pci_set_master(pdev);
pci_save_state(pdev);
@@ -2227,7 +2225,6 @@ static int fm10k_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err_ioremap:
free_netdev(netdev);
err_alloc_netdev:
- pci_disable_pcie_error_reporting(pdev);
pci_release_mem_regions(pdev);
err_pci_reg:
err_dma:
@@ -2281,8 +2278,6 @@ static void fm10k_remove(struct pci_dev *pdev)
pci_release_mem_regions(pdev);
- pci_disable_pcie_error_reporting(pdev);
-
pci_disable_device(pdev);
}
--
2.38.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [PATCH net-next 2/8] fm10k: Remove redundant pci_enable_pcie_error_reporting()
@ 2023-01-30 19:25 ` Tony Nguyen
0 siblings, 0 replies; 21+ messages in thread
From: Tony Nguyen @ 2023-01-30 19:25 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet
Cc: Bjorn Helgaas, netdev, intel-wired-lan, anthony.l.nguyen,
Jesse Brandeburg
From: Bjorn Helgaas <bhelgaas@google.com>
pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration.
Remove the redundant pci_enable_pcie_error_reporting() call from the
driver. Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.
Note that this doesn't control interrupt generation by the Root Port; that
is controlled by the AER Root Error Command register, which is managed by
the AER service driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
index b473cb7d7c57..027d721feb18 100644
--- a/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
+++ b/drivers/net/ethernet/intel/fm10k/fm10k_pci.c
@@ -2127,8 +2127,6 @@ static int fm10k_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto err_pci_reg;
}
- pci_enable_pcie_error_reporting(pdev);
-
pci_set_master(pdev);
pci_save_state(pdev);
@@ -2227,7 +2225,6 @@ static int fm10k_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err_ioremap:
free_netdev(netdev);
err_alloc_netdev:
- pci_disable_pcie_error_reporting(pdev);
pci_release_mem_regions(pdev);
err_pci_reg:
err_dma:
@@ -2281,8 +2278,6 @@ static void fm10k_remove(struct pci_dev *pdev)
pci_release_mem_regions(pdev);
- pci_disable_pcie_error_reporting(pdev);
-
pci_disable_device(pdev);
}
--
2.38.1
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH net-next 3/8] i40e: Remove redundant pci_enable_pcie_error_reporting()
2023-01-30 19:25 [PATCH net-next 0/8][pull request] Intel Wired LAN: Remove redundant Device Control Error Reporting Enable Tony Nguyen
@ 2023-01-30 19:25 ` Tony Nguyen
2023-01-30 19:25 ` [Intel-wired-lan] " Tony Nguyen
` (8 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Tony Nguyen @ 2023-01-30 19:25 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet
Cc: Bjorn Helgaas, netdev, anthony.l.nguyen, Jesse Brandeburg,
intel-wired-lan, Gurucharan G
From: Bjorn Helgaas <bhelgaas@google.com>
pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration.
Remove the redundant pci_enable_pcie_error_reporting() call from the
driver. Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.
Note that this doesn't control interrupt generation by the Root Port; that
is controlled by the AER Root Error Command register, which is managed by
the AER service driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 53d0083e35da..43693f902c27 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -15589,7 +15589,6 @@ static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw)
timer_shutdown_sync(&pf->service_timer);
i40e_shutdown_adminq(hw);
iounmap(hw->hw_addr);
- pci_disable_pcie_error_reporting(pf->pdev);
pci_release_mem_regions(pf->pdev);
pci_disable_device(pf->pdev);
kfree(pf);
@@ -15660,7 +15659,6 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto err_pci_reg;
}
- pci_enable_pcie_error_reporting(pdev);
pci_set_master(pdev);
/* Now that we have a PCI connection, we need to do the
@@ -16218,7 +16216,6 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err_ioremap:
kfree(pf);
err_pf_alloc:
- pci_disable_pcie_error_reporting(pdev);
pci_release_mem_regions(pdev);
err_pci_reg:
err_dma:
@@ -16366,7 +16363,6 @@ static void i40e_remove(struct pci_dev *pdev)
kfree(pf);
pci_release_mem_regions(pdev);
- pci_disable_pcie_error_reporting(pdev);
pci_disable_device(pdev);
}
--
2.38.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [PATCH net-next 3/8] i40e: Remove redundant pci_enable_pcie_error_reporting()
@ 2023-01-30 19:25 ` Tony Nguyen
0 siblings, 0 replies; 21+ messages in thread
From: Tony Nguyen @ 2023-01-30 19:25 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet
Cc: netdev, Jesse Brandeburg, intel-wired-lan, Bjorn Helgaas,
anthony.l.nguyen
From: Bjorn Helgaas <bhelgaas@google.com>
pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration.
Remove the redundant pci_enable_pcie_error_reporting() call from the
driver. Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.
Note that this doesn't control interrupt generation by the Root Port; that
is controlled by the AER Root Error Command register, which is managed by
the AER service driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ----
1 file changed, 4 deletions(-)
diff --git a/drivers/net/ethernet/intel/i40e/i40e_main.c b/drivers/net/ethernet/intel/i40e/i40e_main.c
index 53d0083e35da..43693f902c27 100644
--- a/drivers/net/ethernet/intel/i40e/i40e_main.c
+++ b/drivers/net/ethernet/intel/i40e/i40e_main.c
@@ -15589,7 +15589,6 @@ static int i40e_init_recovery_mode(struct i40e_pf *pf, struct i40e_hw *hw)
timer_shutdown_sync(&pf->service_timer);
i40e_shutdown_adminq(hw);
iounmap(hw->hw_addr);
- pci_disable_pcie_error_reporting(pf->pdev);
pci_release_mem_regions(pf->pdev);
pci_disable_device(pf->pdev);
kfree(pf);
@@ -15660,7 +15659,6 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto err_pci_reg;
}
- pci_enable_pcie_error_reporting(pdev);
pci_set_master(pdev);
/* Now that we have a PCI connection, we need to do the
@@ -16218,7 +16216,6 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err_ioremap:
kfree(pf);
err_pf_alloc:
- pci_disable_pcie_error_reporting(pdev);
pci_release_mem_regions(pdev);
err_pci_reg:
err_dma:
@@ -16366,7 +16363,6 @@ static void i40e_remove(struct pci_dev *pdev)
kfree(pf);
pci_release_mem_regions(pdev);
- pci_disable_pcie_error_reporting(pdev);
pci_disable_device(pdev);
}
--
2.38.1
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH net-next 4/8] iavf: Remove redundant pci_enable_pcie_error_reporting()
2023-01-30 19:25 [PATCH net-next 0/8][pull request] Intel Wired LAN: Remove redundant Device Control Error Reporting Enable Tony Nguyen
@ 2023-01-30 19:25 ` Tony Nguyen
2023-01-30 19:25 ` [Intel-wired-lan] " Tony Nguyen
` (8 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Tony Nguyen @ 2023-01-30 19:25 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet
Cc: Bjorn Helgaas, netdev, anthony.l.nguyen, Jesse Brandeburg,
intel-wired-lan, Marek Szlosek
From: Bjorn Helgaas <bhelgaas@google.com>
pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration.
Remove the redundant pci_enable_pcie_error_reporting() call from the
driver. Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.
Note that this doesn't control interrupt generation by the Root Port; that
is controlled by the AER Root Error Command register, which is managed by
the AER service driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Tested-by: Marek Szlosek <marek.szlosek@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/iavf/iavf_main.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c
index 2c4480b20db3..3273aeb8fa67 100644
--- a/drivers/net/ethernet/intel/iavf/iavf_main.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
@@ -4868,8 +4868,6 @@ static int iavf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto err_pci_reg;
}
- pci_enable_pcie_error_reporting(pdev);
-
pci_set_master(pdev);
netdev = alloc_etherdev_mq(sizeof(struct iavf_adapter),
@@ -4957,7 +4955,6 @@ static int iavf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err_alloc_wq:
free_netdev(netdev);
err_alloc_etherdev:
- pci_disable_pcie_error_reporting(pdev);
pci_release_regions(pdev);
err_pci_reg:
err_dma:
@@ -5175,8 +5172,6 @@ static void iavf_remove(struct pci_dev *pdev)
free_netdev(netdev);
- pci_disable_pcie_error_reporting(pdev);
-
pci_disable_device(pdev);
}
--
2.38.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [PATCH net-next 4/8] iavf: Remove redundant pci_enable_pcie_error_reporting()
@ 2023-01-30 19:25 ` Tony Nguyen
0 siblings, 0 replies; 21+ messages in thread
From: Tony Nguyen @ 2023-01-30 19:25 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet
Cc: netdev, Jesse Brandeburg, intel-wired-lan, Bjorn Helgaas,
anthony.l.nguyen
From: Bjorn Helgaas <bhelgaas@google.com>
pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration.
Remove the redundant pci_enable_pcie_error_reporting() call from the
driver. Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.
Note that this doesn't control interrupt generation by the Root Port; that
is controlled by the AER Root Error Command register, which is managed by
the AER service driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Tested-by: Marek Szlosek <marek.szlosek@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/iavf/iavf_main.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/iavf/iavf_main.c b/drivers/net/ethernet/intel/iavf/iavf_main.c
index 2c4480b20db3..3273aeb8fa67 100644
--- a/drivers/net/ethernet/intel/iavf/iavf_main.c
+++ b/drivers/net/ethernet/intel/iavf/iavf_main.c
@@ -4868,8 +4868,6 @@ static int iavf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto err_pci_reg;
}
- pci_enable_pcie_error_reporting(pdev);
-
pci_set_master(pdev);
netdev = alloc_etherdev_mq(sizeof(struct iavf_adapter),
@@ -4957,7 +4955,6 @@ static int iavf_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err_alloc_wq:
free_netdev(netdev);
err_alloc_etherdev:
- pci_disable_pcie_error_reporting(pdev);
pci_release_regions(pdev);
err_pci_reg:
err_dma:
@@ -5175,8 +5172,6 @@ static void iavf_remove(struct pci_dev *pdev)
free_netdev(netdev);
- pci_disable_pcie_error_reporting(pdev);
-
pci_disable_device(pdev);
}
--
2.38.1
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH net-next 5/8] ice: Remove redundant pci_enable_pcie_error_reporting()
2023-01-30 19:25 [PATCH net-next 0/8][pull request] Intel Wired LAN: Remove redundant Device Control Error Reporting Enable Tony Nguyen
@ 2023-01-30 19:25 ` Tony Nguyen
2023-01-30 19:25 ` [Intel-wired-lan] " Tony Nguyen
` (8 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Tony Nguyen @ 2023-01-30 19:25 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet
Cc: Bjorn Helgaas, netdev, anthony.l.nguyen, Jesse Brandeburg,
intel-wired-lan, Gurucharan G
From: Bjorn Helgaas <bhelgaas@google.com>
pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration.
Remove the redundant pci_enable_pcie_error_reporting() call from the
driver. Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.
Note that this doesn't control interrupt generation by the Root Port; that
is controlled by the AER Root Error Command register, which is managed by
the AER service driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/ice/ice_main.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index fce86e8ff834..4aa19562fe93 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -4664,7 +4664,6 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
return err;
}
- pci_enable_pcie_error_reporting(pdev);
pci_set_master(pdev);
pf->pdev = pdev;
@@ -4981,7 +4980,6 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
ice_devlink_destroy_regions(pf);
ice_deinit_hw(hw);
err_exit_unroll:
- pci_disable_pcie_error_reporting(pdev);
pci_disable_device(pdev);
return err;
}
@@ -5113,7 +5111,6 @@ static void ice_remove(struct pci_dev *pdev)
ice_reset(hw, ICE_RESET_PFR);
pci_wait_for_pending_transaction(pdev);
ice_clear_interrupt_scheme(pf);
- pci_disable_pcie_error_reporting(pdev);
pci_disable_device(pdev);
}
--
2.38.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [PATCH net-next 5/8] ice: Remove redundant pci_enable_pcie_error_reporting()
@ 2023-01-30 19:25 ` Tony Nguyen
0 siblings, 0 replies; 21+ messages in thread
From: Tony Nguyen @ 2023-01-30 19:25 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet
Cc: netdev, Jesse Brandeburg, intel-wired-lan, Bjorn Helgaas,
anthony.l.nguyen
From: Bjorn Helgaas <bhelgaas@google.com>
pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration.
Remove the redundant pci_enable_pcie_error_reporting() call from the
driver. Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.
Note that this doesn't control interrupt generation by the Root Port; that
is controlled by the AER Root Error Command register, which is managed by
the AER service driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/ice/ice_main.c | 3 ---
1 file changed, 3 deletions(-)
diff --git a/drivers/net/ethernet/intel/ice/ice_main.c b/drivers/net/ethernet/intel/ice/ice_main.c
index fce86e8ff834..4aa19562fe93 100644
--- a/drivers/net/ethernet/intel/ice/ice_main.c
+++ b/drivers/net/ethernet/intel/ice/ice_main.c
@@ -4664,7 +4664,6 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
return err;
}
- pci_enable_pcie_error_reporting(pdev);
pci_set_master(pdev);
pf->pdev = pdev;
@@ -4981,7 +4980,6 @@ ice_probe(struct pci_dev *pdev, const struct pci_device_id __always_unused *ent)
ice_devlink_destroy_regions(pf);
ice_deinit_hw(hw);
err_exit_unroll:
- pci_disable_pcie_error_reporting(pdev);
pci_disable_device(pdev);
return err;
}
@@ -5113,7 +5111,6 @@ static void ice_remove(struct pci_dev *pdev)
ice_reset(hw, ICE_RESET_PFR);
pci_wait_for_pending_transaction(pdev);
ice_clear_interrupt_scheme(pf);
- pci_disable_pcie_error_reporting(pdev);
pci_disable_device(pdev);
}
--
2.38.1
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH net-next 6/8] igb: Remove redundant pci_enable_pcie_error_reporting()
2023-01-30 19:25 [PATCH net-next 0/8][pull request] Intel Wired LAN: Remove redundant Device Control Error Reporting Enable Tony Nguyen
@ 2023-01-30 19:25 ` Tony Nguyen
2023-01-30 19:25 ` [Intel-wired-lan] " Tony Nguyen
` (8 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Tony Nguyen @ 2023-01-30 19:25 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet
Cc: Bjorn Helgaas, netdev, anthony.l.nguyen, Jesse Brandeburg,
intel-wired-lan, Gurucharan G
From: Bjorn Helgaas <bhelgaas@google.com>
pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration.
Remove the redundant pci_enable_pcie_error_reporting() call from the
driver. Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.
Note that this doesn't control interrupt generation by the Root Port; that
is controlled by the AER Root Error Command register, which is managed by
the AER service driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/igb/igb_main.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 3c0c35ecea10..c56b991fa610 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -3194,8 +3194,6 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (err)
goto err_pci_reg;
- pci_enable_pcie_error_reporting(pdev);
-
pci_set_master(pdev);
pci_save_state(pdev);
@@ -3626,7 +3624,6 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err_ioremap:
free_netdev(netdev);
err_alloc_etherdev:
- pci_disable_pcie_error_reporting(pdev);
pci_release_mem_regions(pdev);
err_pci_reg:
err_dma:
@@ -3837,8 +3834,6 @@ static void igb_remove(struct pci_dev *pdev)
kfree(adapter->shadow_vfta);
free_netdev(netdev);
- pci_disable_pcie_error_reporting(pdev);
-
pci_disable_device(pdev);
}
--
2.38.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [PATCH net-next 6/8] igb: Remove redundant pci_enable_pcie_error_reporting()
@ 2023-01-30 19:25 ` Tony Nguyen
0 siblings, 0 replies; 21+ messages in thread
From: Tony Nguyen @ 2023-01-30 19:25 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet
Cc: netdev, Jesse Brandeburg, intel-wired-lan, Bjorn Helgaas,
anthony.l.nguyen
From: Bjorn Helgaas <bhelgaas@google.com>
pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration.
Remove the redundant pci_enable_pcie_error_reporting() call from the
driver. Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.
Note that this doesn't control interrupt generation by the Root Port; that
is controlled by the AER Root Error Command register, which is managed by
the AER service driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/igb/igb_main.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/igb/igb_main.c b/drivers/net/ethernet/intel/igb/igb_main.c
index 3c0c35ecea10..c56b991fa610 100644
--- a/drivers/net/ethernet/intel/igb/igb_main.c
+++ b/drivers/net/ethernet/intel/igb/igb_main.c
@@ -3194,8 +3194,6 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
if (err)
goto err_pci_reg;
- pci_enable_pcie_error_reporting(pdev);
-
pci_set_master(pdev);
pci_save_state(pdev);
@@ -3626,7 +3624,6 @@ static int igb_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
err_ioremap:
free_netdev(netdev);
err_alloc_etherdev:
- pci_disable_pcie_error_reporting(pdev);
pci_release_mem_regions(pdev);
err_pci_reg:
err_dma:
@@ -3837,8 +3834,6 @@ static void igb_remove(struct pci_dev *pdev)
kfree(adapter->shadow_vfta);
free_netdev(netdev);
- pci_disable_pcie_error_reporting(pdev);
-
pci_disable_device(pdev);
}
--
2.38.1
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH net-next 7/8] igc: Remove redundant pci_enable_pcie_error_reporting()
2023-01-30 19:25 [PATCH net-next 0/8][pull request] Intel Wired LAN: Remove redundant Device Control Error Reporting Enable Tony Nguyen
@ 2023-01-30 19:25 ` Tony Nguyen
2023-01-30 19:25 ` [Intel-wired-lan] " Tony Nguyen
` (8 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Tony Nguyen @ 2023-01-30 19:25 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet
Cc: Bjorn Helgaas, netdev, anthony.l.nguyen, Jesse Brandeburg,
intel-wired-lan, Naama Meir
From: Bjorn Helgaas <bhelgaas@google.com>
pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration.
Remove the redundant pci_enable_pcie_error_reporting() call from the
driver. Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.
Note that this doesn't control interrupt generation by the Root Port; that
is controlled by the AER Root Error Command register, which is managed by
the AER service driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Tested-by: Naama Meir <naamax.meir@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/igc/igc_main.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index e86b15efaeb8..6ddcbc8b7b6a 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -6434,8 +6434,6 @@ static int igc_probe(struct pci_dev *pdev,
if (err)
goto err_pci_reg;
- pci_enable_pcie_error_reporting(pdev);
-
err = pci_enable_ptm(pdev, NULL);
if (err < 0)
dev_info(&pdev->dev, "PCIe PTM not supported by PCIe bus/controller\n");
@@ -6640,7 +6638,6 @@ static int igc_probe(struct pci_dev *pdev,
err_ioremap:
free_netdev(netdev);
err_alloc_etherdev:
- pci_disable_pcie_error_reporting(pdev);
pci_release_mem_regions(pdev);
err_pci_reg:
err_dma:
@@ -6688,8 +6685,6 @@ static void igc_remove(struct pci_dev *pdev)
free_netdev(netdev);
- pci_disable_pcie_error_reporting(pdev);
-
pci_disable_device(pdev);
}
--
2.38.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [PATCH net-next 7/8] igc: Remove redundant pci_enable_pcie_error_reporting()
@ 2023-01-30 19:25 ` Tony Nguyen
0 siblings, 0 replies; 21+ messages in thread
From: Tony Nguyen @ 2023-01-30 19:25 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet
Cc: netdev, Jesse Brandeburg, intel-wired-lan, Bjorn Helgaas,
anthony.l.nguyen
From: Bjorn Helgaas <bhelgaas@google.com>
pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration.
Remove the redundant pci_enable_pcie_error_reporting() call from the
driver. Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.
Note that this doesn't control interrupt generation by the Root Port; that
is controlled by the AER Root Error Command register, which is managed by
the AER service driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Tested-by: Naama Meir <naamax.meir@linux.intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/igc/igc_main.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethernet/intel/igc/igc_main.c
index e86b15efaeb8..6ddcbc8b7b6a 100644
--- a/drivers/net/ethernet/intel/igc/igc_main.c
+++ b/drivers/net/ethernet/intel/igc/igc_main.c
@@ -6434,8 +6434,6 @@ static int igc_probe(struct pci_dev *pdev,
if (err)
goto err_pci_reg;
- pci_enable_pcie_error_reporting(pdev);
-
err = pci_enable_ptm(pdev, NULL);
if (err < 0)
dev_info(&pdev->dev, "PCIe PTM not supported by PCIe bus/controller\n");
@@ -6640,7 +6638,6 @@ static int igc_probe(struct pci_dev *pdev,
err_ioremap:
free_netdev(netdev);
err_alloc_etherdev:
- pci_disable_pcie_error_reporting(pdev);
pci_release_mem_regions(pdev);
err_pci_reg:
err_dma:
@@ -6688,8 +6685,6 @@ static void igc_remove(struct pci_dev *pdev)
free_netdev(netdev);
- pci_disable_pcie_error_reporting(pdev);
-
pci_disable_device(pdev);
}
--
2.38.1
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [PATCH net-next 8/8] ixgbe: Remove redundant pci_enable_pcie_error_reporting()
2023-01-30 19:25 [PATCH net-next 0/8][pull request] Intel Wired LAN: Remove redundant Device Control Error Reporting Enable Tony Nguyen
@ 2023-01-30 19:25 ` Tony Nguyen
2023-01-30 19:25 ` [Intel-wired-lan] " Tony Nguyen
` (8 subsequent siblings)
9 siblings, 0 replies; 21+ messages in thread
From: Tony Nguyen @ 2023-01-30 19:25 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet
Cc: Bjorn Helgaas, netdev, anthony.l.nguyen, Jesse Brandeburg,
intel-wired-lan, Gurucharan G
From: Bjorn Helgaas <bhelgaas@google.com>
pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration.
Remove the redundant pci_enable_pcie_error_reporting() call from the
driver. Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.
Note that this doesn't control interrupt generation by the Root Port; that
is controlled by the AER Root Error Command register, which is managed by
the AER service driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 43a44c1e1576..992b7ae75233 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -10809,8 +10809,6 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto err_pci_reg;
}
- pci_enable_pcie_error_reporting(pdev);
-
pci_set_master(pdev);
pci_save_state(pdev);
@@ -11238,7 +11236,6 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
disable_dev = !test_and_set_bit(__IXGBE_DISABLED, &adapter->state);
free_netdev(netdev);
err_alloc_etherdev:
- pci_disable_pcie_error_reporting(pdev);
pci_release_mem_regions(pdev);
err_pci_reg:
err_dma:
@@ -11327,8 +11324,6 @@ static void ixgbe_remove(struct pci_dev *pdev)
disable_dev = !test_and_set_bit(__IXGBE_DISABLED, &adapter->state);
free_netdev(netdev);
- pci_disable_pcie_error_reporting(pdev);
-
if (disable_dev)
pci_disable_device(pdev);
}
--
2.38.1
^ permalink raw reply related [flat|nested] 21+ messages in thread
* [Intel-wired-lan] [PATCH net-next 8/8] ixgbe: Remove redundant pci_enable_pcie_error_reporting()
@ 2023-01-30 19:25 ` Tony Nguyen
0 siblings, 0 replies; 21+ messages in thread
From: Tony Nguyen @ 2023-01-30 19:25 UTC (permalink / raw)
To: davem, kuba, pabeni, edumazet
Cc: netdev, Jesse Brandeburg, intel-wired-lan, Bjorn Helgaas,
anthony.l.nguyen
From: Bjorn Helgaas <bhelgaas@google.com>
pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages. Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is
native"), the PCI core does this for all devices during enumeration.
Remove the redundant pci_enable_pcie_error_reporting() call from the
driver. Also remove the corresponding pci_disable_pcie_error_reporting()
from the driver .remove() path.
Note that this doesn't control interrupt generation by the Root Port; that
is controlled by the AER Root Error Command register, which is managed by
the AER service driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Jesse Brandeburg <jesse.brandeburg@intel.com>
Cc: Tony Nguyen <anthony.l.nguyen@intel.com>
Cc: intel-wired-lan@lists.osuosl.org
Cc: netdev@vger.kernel.org
Tested-by: Gurucharan G <gurucharanx.g@intel.com> (A Contingent worker at Intel)
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
---
drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 -----
1 file changed, 5 deletions(-)
diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
index 43a44c1e1576..992b7ae75233 100644
--- a/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
+++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_main.c
@@ -10809,8 +10809,6 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
goto err_pci_reg;
}
- pci_enable_pcie_error_reporting(pdev);
-
pci_set_master(pdev);
pci_save_state(pdev);
@@ -11238,7 +11236,6 @@ static int ixgbe_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
disable_dev = !test_and_set_bit(__IXGBE_DISABLED, &adapter->state);
free_netdev(netdev);
err_alloc_etherdev:
- pci_disable_pcie_error_reporting(pdev);
pci_release_mem_regions(pdev);
err_pci_reg:
err_dma:
@@ -11327,8 +11324,6 @@ static void ixgbe_remove(struct pci_dev *pdev)
disable_dev = !test_and_set_bit(__IXGBE_DISABLED, &adapter->state);
free_netdev(netdev);
- pci_disable_pcie_error_reporting(pdev);
-
if (disable_dev)
pci_disable_device(pdev);
}
--
2.38.1
_______________________________________________
Intel-wired-lan mailing list
Intel-wired-lan@osuosl.org
https://lists.osuosl.org/mailman/listinfo/intel-wired-lan
^ permalink raw reply related [flat|nested] 21+ messages in thread
* Re: [PATCH net-next 0/8][pull request] Intel Wired LAN: Remove redundant Device Control Error Reporting Enable
2023-01-30 19:25 [PATCH net-next 0/8][pull request] Intel Wired LAN: Remove redundant Device Control Error Reporting Enable Tony Nguyen
` (7 preceding siblings ...)
2023-01-30 19:25 ` [Intel-wired-lan] " Tony Nguyen
@ 2023-01-31 8:26 ` Leon Romanovsky
2023-01-31 18:05 ` Bjorn Helgaas
2023-02-01 5:10 ` patchwork-bot+netdevbpf
9 siblings, 1 reply; 21+ messages in thread
From: Leon Romanovsky @ 2023-01-31 8:26 UTC (permalink / raw)
To: Tony Nguyen; +Cc: davem, kuba, pabeni, edumazet, netdev, bhelgaas
On Mon, Jan 30, 2023 at 11:25:11AM -0800, Tony Nguyen wrote:
> Bjorn Helgaas says:
>
> Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"),
> the PCI core sets the Device Control bits that enable error reporting for
> PCIe devices.
>
> This series removes redundant calls to pci_enable_pcie_error_reporting()
> that do the same thing from several NIC drivers.
>
> There are several more drivers where this should be removed; I started with
> just the Intel drivers here.
> ---
> TN: Removed mention of AER driver as this was taken through PCI tree [1]
> and fixed a typo.
>
> [1] https://lore.kernel.org/all/20230126231527.GA1322015@bhelgaas/
>
> The following are changes since commit 90e8ca0abb05ada6c1e2710eaa21688dafca26f2:
> Merge branch 'devlink-next'
> and are available in the git repository at:
> git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 10GbE
>
> Bjorn Helgaas (8):
> e1000e: Remove redundant pci_enable_pcie_error_reporting()
> fm10k: Remove redundant pci_enable_pcie_error_reporting()
> i40e: Remove redundant pci_enable_pcie_error_reporting()
> iavf: Remove redundant pci_enable_pcie_error_reporting()
> ice: Remove redundant pci_enable_pcie_error_reporting()
> igb: Remove redundant pci_enable_pcie_error_reporting()
> igc: Remove redundant pci_enable_pcie_error_reporting()
> ixgbe: Remove redundant pci_enable_pcie_error_reporting()
>
> drivers/net/ethernet/intel/e1000e/netdev.c | 7 -------
> drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 5 -----
> drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ----
> drivers/net/ethernet/intel/iavf/iavf_main.c | 5 -----
> drivers/net/ethernet/intel/ice/ice_main.c | 3 ---
> drivers/net/ethernet/intel/igb/igb_main.c | 5 -----
> drivers/net/ethernet/intel/igc/igc_main.c | 5 -----
> drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 -----
> 8 files changed, 39 deletions(-)
I see that you didn't touch any other places except drivers/net/ethernet/intel/.
Are you planning to remove other occurrences too?
➜ kernel git:(rdma-next) git grep pci_enable_pcie_error_reporting -- drivers/infiniband/
drivers/infiniband/hw/hfi1/pcie.c: (void)pci_enable_pcie_error_reporting(pdev);
drivers/infiniband/hw/qib/qib_pcie.c: ret = pci_enable_pcie_error_reporting(pdev);
Thanks
>
> --
> 2.38.1
>
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH net-next 0/8][pull request] Intel Wired LAN: Remove redundant Device Control Error Reporting Enable
2023-01-31 8:26 ` [PATCH net-next 0/8][pull request] Intel Wired LAN: Remove redundant Device Control Error Reporting Enable Leon Romanovsky
@ 2023-01-31 18:05 ` Bjorn Helgaas
2023-02-01 8:23 ` Leon Romanovsky
0 siblings, 1 reply; 21+ messages in thread
From: Bjorn Helgaas @ 2023-01-31 18:05 UTC (permalink / raw)
To: Leon Romanovsky; +Cc: Tony Nguyen, davem, kuba, pabeni, edumazet, netdev
On Tue, Jan 31, 2023 at 2:26 AM Leon Romanovsky <leon@kernel.org> wrote:
>
> On Mon, Jan 30, 2023 at 11:25:11AM -0800, Tony Nguyen wrote:
> > Bjorn Helgaas says:
> >
> > Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"),
> > the PCI core sets the Device Control bits that enable error reporting for
> > PCIe devices.
> >
> > This series removes redundant calls to pci_enable_pcie_error_reporting()
> > that do the same thing from several NIC drivers.
> >
> > There are several more drivers where this should be removed; I started with
> > just the Intel drivers here.
> > ---
> > TN: Removed mention of AER driver as this was taken through PCI tree [1]
> > and fixed a typo.
> >
> > [1] https://lore.kernel.org/all/20230126231527.GA1322015@bhelgaas/
> >
> > The following are changes since commit 90e8ca0abb05ada6c1e2710eaa21688dafca26f2:
> > Merge branch 'devlink-next'
> > and are available in the git repository at:
> > git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 10GbE
> >
> > Bjorn Helgaas (8):
> > e1000e: Remove redundant pci_enable_pcie_error_reporting()
> > fm10k: Remove redundant pci_enable_pcie_error_reporting()
> > i40e: Remove redundant pci_enable_pcie_error_reporting()
> > iavf: Remove redundant pci_enable_pcie_error_reporting()
> > ice: Remove redundant pci_enable_pcie_error_reporting()
> > igb: Remove redundant pci_enable_pcie_error_reporting()
> > igc: Remove redundant pci_enable_pcie_error_reporting()
> > ixgbe: Remove redundant pci_enable_pcie_error_reporting()
> >
> > drivers/net/ethernet/intel/e1000e/netdev.c | 7 -------
> > drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 5 -----
> > drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ----
> > drivers/net/ethernet/intel/iavf/iavf_main.c | 5 -----
> > drivers/net/ethernet/intel/ice/ice_main.c | 3 ---
> > drivers/net/ethernet/intel/igb/igb_main.c | 5 -----
> > drivers/net/ethernet/intel/igc/igc_main.c | 5 -----
> > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 -----
> > 8 files changed, 39 deletions(-)
>
> I see that you didn't touch any other places except drivers/net/ethernet/intel/.
> Are you planning to remove other occurrences too?
>
> ➜ kernel git:(rdma-next) git grep pci_enable_pcie_error_reporting -- drivers/infiniband/
> drivers/infiniband/hw/hfi1/pcie.c: (void)pci_enable_pcie_error_reporting(pdev);
> drivers/infiniband/hw/qib/qib_pcie.c: ret = pci_enable_pcie_error_reporting(pdev);
Yes, definitely, I just haven't had a chance yet. Some of the others
are a little more complicated than the simple removals for the Intel
drivers.
Bjorn
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH net-next 0/8][pull request] Intel Wired LAN: Remove redundant Device Control Error Reporting Enable
2023-01-30 19:25 [PATCH net-next 0/8][pull request] Intel Wired LAN: Remove redundant Device Control Error Reporting Enable Tony Nguyen
` (8 preceding siblings ...)
2023-01-31 8:26 ` [PATCH net-next 0/8][pull request] Intel Wired LAN: Remove redundant Device Control Error Reporting Enable Leon Romanovsky
@ 2023-02-01 5:10 ` patchwork-bot+netdevbpf
9 siblings, 0 replies; 21+ messages in thread
From: patchwork-bot+netdevbpf @ 2023-02-01 5:10 UTC (permalink / raw)
To: Tony Nguyen; +Cc: davem, kuba, pabeni, edumazet, netdev, bhelgaas
Hello:
This series was applied to netdev/net-next.git (master)
by Tony Nguyen <anthony.l.nguyen@intel.com>:
On Mon, 30 Jan 2023 11:25:11 -0800 you wrote:
> Bjorn Helgaas says:
>
> Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"),
> the PCI core sets the Device Control bits that enable error reporting for
> PCIe devices.
>
> This series removes redundant calls to pci_enable_pcie_error_reporting()
> that do the same thing from several NIC drivers.
>
> [...]
Here is the summary with links:
- [net-next,1/8] e1000e: Remove redundant pci_enable_pcie_error_reporting()
https://git.kernel.org/netdev/net-next/c/601f46282cd8
- [net-next,2/8] fm10k: Remove redundant pci_enable_pcie_error_reporting()
https://git.kernel.org/netdev/net-next/c/3218487afdc4
- [net-next,3/8] i40e: Remove redundant pci_enable_pcie_error_reporting()
https://git.kernel.org/netdev/net-next/c/d04d9e769993
- [net-next,4/8] iavf: Remove redundant pci_enable_pcie_error_reporting()
https://git.kernel.org/netdev/net-next/c/bc4fddc3b306
- [net-next,5/8] ice: Remove redundant pci_enable_pcie_error_reporting()
https://git.kernel.org/netdev/net-next/c/ba153552c18d
- [net-next,6/8] igb: Remove redundant pci_enable_pcie_error_reporting()
https://git.kernel.org/netdev/net-next/c/8aea4c325296
- [net-next,7/8] igc: Remove redundant pci_enable_pcie_error_reporting()
https://git.kernel.org/netdev/net-next/c/c3c14ecfe04a
- [net-next,8/8] ixgbe: Remove redundant pci_enable_pcie_error_reporting()
https://git.kernel.org/netdev/net-next/c/dec6b8016445
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html
^ permalink raw reply [flat|nested] 21+ messages in thread
* Re: [PATCH net-next 0/8][pull request] Intel Wired LAN: Remove redundant Device Control Error Reporting Enable
2023-01-31 18:05 ` Bjorn Helgaas
@ 2023-02-01 8:23 ` Leon Romanovsky
0 siblings, 0 replies; 21+ messages in thread
From: Leon Romanovsky @ 2023-02-01 8:23 UTC (permalink / raw)
To: Bjorn Helgaas; +Cc: Tony Nguyen, davem, kuba, pabeni, edumazet, netdev
On Tue, Jan 31, 2023 at 12:05:37PM -0600, Bjorn Helgaas wrote:
> On Tue, Jan 31, 2023 at 2:26 AM Leon Romanovsky <leon@kernel.org> wrote:
> >
> > On Mon, Jan 30, 2023 at 11:25:11AM -0800, Tony Nguyen wrote:
> > > Bjorn Helgaas says:
> > >
> > > Since f26e58bf6f54 ("PCI/AER: Enable error reporting when AER is native"),
> > > the PCI core sets the Device Control bits that enable error reporting for
> > > PCIe devices.
> > >
> > > This series removes redundant calls to pci_enable_pcie_error_reporting()
> > > that do the same thing from several NIC drivers.
> > >
> > > There are several more drivers where this should be removed; I started with
> > > just the Intel drivers here.
> > > ---
> > > TN: Removed mention of AER driver as this was taken through PCI tree [1]
> > > and fixed a typo.
> > >
> > > [1] https://lore.kernel.org/all/20230126231527.GA1322015@bhelgaas/
> > >
> > > The following are changes since commit 90e8ca0abb05ada6c1e2710eaa21688dafca26f2:
> > > Merge branch 'devlink-next'
> > > and are available in the git repository at:
> > > git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue 10GbE
> > >
> > > Bjorn Helgaas (8):
> > > e1000e: Remove redundant pci_enable_pcie_error_reporting()
> > > fm10k: Remove redundant pci_enable_pcie_error_reporting()
> > > i40e: Remove redundant pci_enable_pcie_error_reporting()
> > > iavf: Remove redundant pci_enable_pcie_error_reporting()
> > > ice: Remove redundant pci_enable_pcie_error_reporting()
> > > igb: Remove redundant pci_enable_pcie_error_reporting()
> > > igc: Remove redundant pci_enable_pcie_error_reporting()
> > > ixgbe: Remove redundant pci_enable_pcie_error_reporting()
> > >
> > > drivers/net/ethernet/intel/e1000e/netdev.c | 7 -------
> > > drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 5 -----
> > > drivers/net/ethernet/intel/i40e/i40e_main.c | 4 ----
> > > drivers/net/ethernet/intel/iavf/iavf_main.c | 5 -----
> > > drivers/net/ethernet/intel/ice/ice_main.c | 3 ---
> > > drivers/net/ethernet/intel/igb/igb_main.c | 5 -----
> > > drivers/net/ethernet/intel/igc/igc_main.c | 5 -----
> > > drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 5 -----
> > > 8 files changed, 39 deletions(-)
> >
> > I see that you didn't touch any other places except drivers/net/ethernet/intel/.
> > Are you planning to remove other occurrences too?
> >
> > ➜ kernel git:(rdma-next) git grep pci_enable_pcie_error_reporting -- drivers/infiniband/
> > drivers/infiniband/hw/hfi1/pcie.c: (void)pci_enable_pcie_error_reporting(pdev);
> > drivers/infiniband/hw/qib/qib_pcie.c: ret = pci_enable_pcie_error_reporting(pdev);
>
> Yes, definitely, I just haven't had a chance yet. Some of the others
> are a little more complicated than the simple removals for the Intel
> drivers.
Great, I'll wait for your patch :)
Thanks.
>
> Bjorn
^ permalink raw reply [flat|nested] 21+ messages in thread
end of thread, other threads:[~2023-02-01 8:23 UTC | newest]
Thread overview: 21+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-01-30 19:25 [PATCH net-next 0/8][pull request] Intel Wired LAN: Remove redundant Device Control Error Reporting Enable Tony Nguyen
2023-01-30 19:25 ` [PATCH net-next 1/8] e1000e: Remove redundant pci_enable_pcie_error_reporting() Tony Nguyen
2023-01-30 19:25 ` [Intel-wired-lan] " Tony Nguyen
2023-01-30 19:25 ` [PATCH net-next 2/8] fm10k: " Tony Nguyen
2023-01-30 19:25 ` [Intel-wired-lan] " Tony Nguyen
2023-01-30 19:25 ` [PATCH net-next 3/8] i40e: " Tony Nguyen
2023-01-30 19:25 ` [Intel-wired-lan] " Tony Nguyen
2023-01-30 19:25 ` [PATCH net-next 4/8] iavf: " Tony Nguyen
2023-01-30 19:25 ` [Intel-wired-lan] " Tony Nguyen
2023-01-30 19:25 ` [PATCH net-next 5/8] ice: " Tony Nguyen
2023-01-30 19:25 ` [Intel-wired-lan] " Tony Nguyen
2023-01-30 19:25 ` [PATCH net-next 6/8] igb: " Tony Nguyen
2023-01-30 19:25 ` [Intel-wired-lan] " Tony Nguyen
2023-01-30 19:25 ` [PATCH net-next 7/8] igc: " Tony Nguyen
2023-01-30 19:25 ` [Intel-wired-lan] " Tony Nguyen
2023-01-30 19:25 ` [PATCH net-next 8/8] ixgbe: " Tony Nguyen
2023-01-30 19:25 ` [Intel-wired-lan] " Tony Nguyen
2023-01-31 8:26 ` [PATCH net-next 0/8][pull request] Intel Wired LAN: Remove redundant Device Control Error Reporting Enable Leon Romanovsky
2023-01-31 18:05 ` Bjorn Helgaas
2023-02-01 8:23 ` Leon Romanovsky
2023-02-01 5:10 ` patchwork-bot+netdevbpf
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.