Commit 1ad11eaf authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Christoph Hellwig
Browse files

nvme-pci: drop redundant pci_enable_pcie_error_reporting() 



pci_enable_pcie_error_reporting() enables the device to send ERR_*
Messages.  Since 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>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
parent d8898ee5

drivers/nvme/host/pci.c

+1 −5
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
 */



#include <linux/acpi.h>

#include <linux/aer.h>

#include <linux/async.h>

#include <linux/blkdev.h>

#include <linux/blk-mq.h>
@@ -2535,7 +2534,6 @@ static int nvme_pci_enable(struct nvme_dev *dev) 


	nvme_map_cmb(dev);



	pci_enable_pcie_error_reporting(pdev);

	pci_save_state(pdev);



	result = nvme_pci_configure_admin_queue(dev);
@@ -2600,10 +2598,8 @@ static void nvme_dev_disable(struct nvme_dev *dev, bool shutdown) 
	nvme_suspend_io_queues(dev);

	nvme_suspend_queue(dev, 0);

	pci_free_irq_vectors(pdev);

	if (pci_is_enabled(pdev)) {

		pci_disable_pcie_error_reporting(pdev);

	if (pci_is_enabled(pdev))

		pci_disable_device(pdev);

	}

	nvme_reap_pending_cqes(dev);



	nvme_cancel_tagset(&dev->ctrl);