linux-pci.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Bjorn Helgaas <helgaas@kernel.org>
To: linux-pci@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, Bjorn Helgaas <bhelgaas@google.com>,
	Jesse Brandeburg <jesse.brandeburg@intel.com>,
	Tony Nguyen <anthony.l.nguyen@intel.com>,
	intel-wired-lan@lists.osuosl.org, netdev@vger.kernel.org
Subject: [PATCH 2/9] e1000e: Remove redundant pci_enable_pcie_error_reporting()
Date: Wed, 18 Jan 2023 17:46:05 -0600	[thread overview]
Message-ID: <20230118234612.272916-3-helgaas@kernel.org> (raw)
In-Reply-To: <20230118234612.272916-1-helgaas@kernel.org>

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
---
 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.25.1


  parent reply	other threads:[~2023-01-18 23:46 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-18 23:46 [PATCH 0/9] PCI/AER: Remove redundant Device Control Error Reporting Enable Bjorn Helgaas
2023-01-18 23:46 ` [PATCH 1/9] " Bjorn Helgaas
2023-01-19  3:49   ` Sathyanarayanan Kuppuswamy
2023-01-24  7:22   ` Stefan Roese
2023-01-18 23:46 ` Bjorn Helgaas [this message]
2023-01-19 18:28   ` [PATCH 2/9] e1000e: Remove redundant pci_enable_pcie_error_reporting() Tony Nguyen
2023-01-19 18:40     ` [Intel-wired-lan] " Bjorn Helgaas
2023-01-19 21:31       ` Tony Nguyen
2023-01-20  5:35         ` Jakub Kicinski
2023-01-20  3:17   ` Jakub Kicinski
2023-01-20 13:14     ` [Intel-wired-lan] " Bjorn Helgaas
2023-01-18 23:46 ` [PATCH 3/9] fm10k: " Bjorn Helgaas
2023-01-19 18:28   ` Tony Nguyen
2023-01-18 23:46 ` [PATCH 4/9] i40e: " Bjorn Helgaas
2023-01-19 18:28   ` Tony Nguyen
2023-01-25 10:34   ` [Intel-wired-lan] " G, GurucharanX
2023-01-18 23:46 ` [PATCH 5/9] iavf: " Bjorn Helgaas
2023-01-19 18:28   ` Tony Nguyen
2023-01-18 23:46 ` [PATCH 6/9] ice: " Bjorn Helgaas
2023-01-19 18:28   ` Tony Nguyen
2023-01-25  9:08   ` [Intel-wired-lan] " G, GurucharanX
2023-01-18 23:46 ` [PATCH 7/9] igb: " Bjorn Helgaas
2023-01-19 18:28   ` Tony Nguyen
2023-01-25  9:09   ` [Intel-wired-lan] " G, GurucharanX
2023-01-18 23:46 ` [PATCH 8/9] igc: " Bjorn Helgaas
2023-01-19 18:28   ` Tony Nguyen
2023-01-24 11:33   ` [Intel-wired-lan] " naamax.meir
2023-01-18 23:46 ` [PATCH 9/9] ixgbe: " Bjorn Helgaas
2023-01-19 18:28   ` Tony Nguyen
2023-01-25  9:09   ` [Intel-wired-lan] " G, GurucharanX
2023-01-19  3:55 ` [PATCH 0/9] PCI/AER: Remove redundant Device Control Error Reporting Enable Sathyanarayanan Kuppuswamy
2023-01-19  4:26   ` Bjorn Helgaas
2023-01-26 23:15 ` 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=20230118234612.272916-3-helgaas@kernel.org \
    --to=helgaas@kernel.org \
    --cc=anthony.l.nguyen@intel.com \
    --cc=bhelgaas@google.com \
    --cc=intel-wired-lan@lists.osuosl.org \
    --cc=jesse.brandeburg@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pci@vger.kernel.org \
    --cc=netdev@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).