Commit 6574fb25 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Martin K. Petersen
Browse files

scsi: be2iscsi: Drop redundant pci_enable_pcie_error_reporting() 



pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages.  Since commit f26e58bf ("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: default avatarBjorn Helgaas <bhelgaas@google.com>
Link: https://lore.kernel.org/r/20230307182842.870378-4-helgaas@kernel.org


Cc: Ketan Mukadam <ketan.mukadam@broadcom.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 915b071a

drivers/scsi/be2iscsi/be_main.c

+0 −9
Original line number Diff line number Diff line
@@ -5545,13 +5545,6 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev, 
		goto disable_pci;

	}



	/* Enable EEH reporting */

	ret = pci_enable_pcie_error_reporting(pcidev);

	if (ret)

		beiscsi_log(phba, KERN_WARNING, BEISCSI_LOG_INIT,

			    "BM_%d : PCIe Error Reporting "

			    "Enabling Failed\n");



	pci_save_state(pcidev);



	/* Initialize Driver configuration Paramters */
@@ -5736,7 +5729,6 @@ static int beiscsi_dev_probe(struct pci_dev *pcidev, 
	pci_disable_msix(phba->pcidev);

	pci_dev_put(phba->pcidev);

	iscsi_host_free(phba->shost);

	pci_disable_pcie_error_reporting(pcidev);

	pci_set_drvdata(pcidev, NULL);

disable_pci:

	pci_release_regions(pcidev);
@@ -5779,7 +5771,6 @@ static void beiscsi_remove(struct pci_dev *pcidev) 


	pci_dev_put(phba->pcidev);

	iscsi_host_free(phba->shost);

	pci_disable_pcie_error_reporting(pcidev);

	pci_set_drvdata(pcidev, NULL);

	pci_release_regions(pcidev);

	pci_disable_device(pcidev);

drivers/scsi/be2iscsi/be_main.h

+0 −1
Original line number Diff line number Diff line
@@ -16,7 +16,6 @@ 
#include <linux/in.h>

#include <linux/ctype.h>

#include <linux/module.h>

#include <linux/aer.h>

#include <scsi/scsi.h>

#include <scsi/scsi_cmnd.h>

#include <scsi/scsi_device.h>