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

scsi: bfa: 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-5-helgaas@kernel.org


Cc: Anil Gurumurthy <anil.gurumurthy@qlogic.com>
Cc: Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6574fb25

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);

drivers/scsi/bfa/bfad_drv.h

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

#include <linux/workqueue.h>

#include <linux/bitops.h>

#include <linux/aer.h>

#include <scsi/scsi.h>

#include <scsi/scsi_host.h>

#include <scsi/scsi_tcq.h>