From: Bjorn Helgaas <helgaas@kernel.org>
To: "James E . J . Bottomley" <jejb@linux.ibm.com>,
"Martin K . Petersen" <martin.petersen@oracle.com>
Cc: linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org,
Bjorn Helgaas <bhelgaas@google.com>,
Sathya Prakash <sathya.prakash@broadcom.com>,
Sreekanth Reddy <sreekanth.reddy@broadcom.com>,
Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>,
MPT-FusionLinux.pdl@broadcom.com
Subject: [PATCH 08/10] scsi: mpt3sas: Drop redundant pci_enable_pcie_error_reporting()
Date: Tue, 7 Mar 2023 12:28:40 -0600 [thread overview]
Message-ID: <20230307182842.870378-9-helgaas@kernel.org> (raw)
In-Reply-To: <20230307182842.870378-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, so the
driver doesn't need to do it itself.
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 only controls ERR_* Messages from the device. An ERR_*
Message may cause the Root Port to generate an interrupt, depending on the
AER Root Error Command register managed by the AER service driver.
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
Cc: Sathya Prakash <sathya.prakash@broadcom.com>
Cc: Sreekanth Reddy <sreekanth.reddy@broadcom.com>
Cc: Suganath Prabu Subramani <suganath-prabu.subramani@broadcom.com>
Cc: MPT-FusionLinux.pdl@broadcom.com
---
drivers/scsi/mpt3sas/mpt3sas_base.c | 5 -----
drivers/scsi/mpt3sas/mpt3sas_scsih.c | 1 -
2 files changed, 6 deletions(-)
diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.c b/drivers/scsi/mpt3sas/mpt3sas_base.c
index 2ee9ea57554d..a8b260f46796 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -60,7 +60,6 @@
#include <linux/ktime.h>
#include <linux/kthread.h>
#include <asm/page.h> /* To get host page size per arch */
-#include <linux/aer.h>
#include "mpt3sas_base.h"
@@ -3535,7 +3534,6 @@ mpt3sas_base_unmap_resources(struct MPT3SAS_ADAPTER *ioc)
if (pci_is_enabled(pdev)) {
pci_release_selected_regions(ioc->pdev, ioc->bars);
- pci_disable_pcie_error_reporting(pdev);
pci_disable_device(pdev);
}
}
@@ -3615,9 +3613,6 @@ mpt3sas_base_map_resources(struct MPT3SAS_ADAPTER *ioc)
goto out_fail;
}
-/* AER (Advanced Error Reporting) hooks */
- pci_enable_pcie_error_reporting(pdev);
-
pci_set_master(pdev);
diff --git a/drivers/scsi/mpt3sas/mpt3sas_scsih.c b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
index 8e24ebcebfe5..e2f09833659f 100644
--- a/drivers/scsi/mpt3sas/mpt3sas_scsih.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_scsih.c
@@ -52,7 +52,6 @@
#include <linux/delay.h>
#include <linux/pci.h>
#include <linux/interrupt.h>
-#include <linux/aer.h>
#include <linux/raid_class.h>
#include <linux/blk-mq-pci.h>
#include <asm/unaligned.h>
--
2.25.1
next prev parent reply other threads:[~2023-03-07 18:55 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-07 18:28 [PATCH 00/10] PCI/AER: Remove redundant Device Control Error Reporting Enable Bjorn Helgaas
2023-03-07 18:28 ` [PATCH 01/10] scsi: aacraid: Drop redundant pci_enable_pcie_error_reporting() Bjorn Helgaas
2023-03-07 18:28 ` [PATCH 02/10] scsi: arcmsr: Remove unnecessary aer.h include Bjorn Helgaas
2023-03-07 18:28 ` [PATCH 03/10] scsi: be2iscsi: Drop redundant pci_enable_pcie_error_reporting() Bjorn Helgaas
2023-03-07 18:28 ` [PATCH 04/10] scsi: bfa: " Bjorn Helgaas
2023-03-07 18:28 ` [PATCH 05/10] scsi: csiostor: Remove unnecessary aer.h include Bjorn Helgaas
2023-03-07 18:28 ` [PATCH 06/10] scsi: hpsa: Remove unnecessary pci_disable_pcie_error_reporting() comment Bjorn Helgaas
2023-03-07 18:28 ` [PATCH 07/10] scsi: lpfc: Drop redundant pci_enable_pcie_error_reporting() Bjorn Helgaas
2023-03-07 18:28 ` Bjorn Helgaas [this message]
2023-03-07 18:28 ` [PATCH 09/10] scsi: qla2xxx: " Bjorn Helgaas
2023-03-07 18:28 ` [PATCH 10/10] scsi: qla4xxx: " Bjorn Helgaas
2023-03-10 3:03 ` [PATCH 00/10] PCI/AER: Remove redundant Device Control Error Reporting Enable Martin K. Petersen
2023-03-17 4:04 ` 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=20230307182842.870378-9-helgaas@kernel.org \
--to=helgaas@kernel.org \
--cc=MPT-FusionLinux.pdl@broadcom.com \
--cc=bhelgaas@google.com \
--cc=jejb@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=sathya.prakash@broadcom.com \
--cc=sreekanth.reddy@broadcom.com \
--cc=suganath-prabu.subramani@broadcom.com \
/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).