Commit 0b31b77f authored by Martin K. Petersen's avatar Martin K. Petersen
Browse files

Merge patch series "PCI/AER: Remove redundant Device Control Error Reporting Enable" 



Bjorn Helgaas <helgaas@kernel.org> says:

Since f26e58bf ("PCI/AER: Enable error reporting when AER is native"),
which appeared in v6.0, the PCI core has enabled PCIe error reporting for
all devices during enumeration.

Remove driver code to do this and remove unnecessary includes of
<linux/aer.h> from several other drivers.

Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parents 99e0cd4d d7ba1064

drivers/scsi/aacraid/linit.c

+0 −3
Original line number Diff line number Diff line
@@ -26,7 +26,6 @@ 
#include <linux/module.h>

#include <linux/moduleparam.h>

#include <linux/pci.h>

#include <linux/aer.h>

#include <linux/slab.h>

#include <linux/mutex.h>

#include <linux/spinlock.h>
@@ -1783,7 +1782,6 @@ static int aac_probe_one(struct pci_dev *pdev, const struct pci_device_id *id) 


	aac_scan_host(aac);



	pci_enable_pcie_error_reporting(pdev);

	pci_save_state(pdev);



	return 0;
@@ -1949,7 +1947,6 @@ static pci_ers_result_t aac_pci_error_detected(struct pci_dev *pdev, 
		scsi_host_complete_all_commands(shost, DID_NO_CONNECT);

		aac_release_resources(aac);



		pci_disable_pcie_error_reporting(pdev);

		aac_adapter_ioremap(aac, 0);



		return PCI_ERS_RESULT_NEED_RESET;

drivers/scsi/arcmsr/arcmsr_hba.c

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

#include <linux/slab.h>

#include <linux/pci.h>

#include <linux/aer.h>

#include <linux/circ_buf.h>

#include <asm/dma.h>

#include <asm/io.h>

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>

drivers/scsi/bfa/bfad.c

+0 −6
Original line number Diff line number Diff line
@@ -738,9 +738,6 @@ bfad_pci_init(struct pci_dev *pdev, struct bfad_s *bfad) 
		goto out_release_region;

	}



	/* Enable PCIE Advanced Error Recovery (AER) if kernel supports */

	pci_enable_pcie_error_reporting(pdev);



	bfad->pci_bar0_kva = pci_iomap(pdev, 0, pci_resource_len(pdev, 0));

	bfad->pci_bar2_kva = pci_iomap(pdev, 2, pci_resource_len(pdev, 2));
@@ -801,8 +798,6 @@ bfad_pci_uninit(struct pci_dev *pdev, struct bfad_s *bfad) 
	pci_iounmap(pdev, bfad->pci_bar0_kva);

	pci_iounmap(pdev, bfad->pci_bar2_kva);

	pci_release_regions(pdev);

	/* Disable PCIE Advanced Error Recovery (AER) */

	pci_disable_pcie_error_reporting(pdev);

	pci_disable_device(pdev);

}
@@ -1562,7 +1557,6 @@ bfad_pci_slot_reset(struct pci_dev *pdev) 
	if (restart_bfa(bfad) == -1)

		goto out_disable_device;



	pci_enable_pcie_error_reporting(pdev);

	dev_printk(KERN_WARNING, &pdev->dev,

		   "slot_reset completed  flags: 0x%x!\n", bfad->bfad_flags);