Unverified Commit 83a458e3 authored by Bjorn Helgaas's avatar Bjorn Helgaas Committed by Xu Yilun
Browse files

fpga: dfl-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>
Acked-by: default avatarXu Yilun <yilun.xu@intel.com>
Link: https://lore.kernel.org/r/20230307201937.880084-1-helgaas@kernel.org


Signed-off-by: default avatarXu Yilun <yilun.xu@intel.com>
parent c3d79fda

drivers/fpga/dfl-pci.c

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

#include <linux/stddef.h>

#include <linux/errno.h>

#include <linux/aer.h>



#include "dfl.h"
@@ -376,10 +375,6 @@ int cci_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *pcidevid) 
		return ret;

	}



	ret = pci_enable_pcie_error_reporting(pcidev);

	if (ret && ret != -EINVAL)

		dev_info(&pcidev->dev, "PCIE AER unavailable %d.\n", ret);



	pci_set_master(pcidev);



	ret = dma_set_mask_and_coherent(&pcidev->dev, DMA_BIT_MASK(64));
@@ -387,26 +382,24 @@ int cci_pci_probe(struct pci_dev *pcidev, const struct pci_device_id *pcidevid) 
		ret = dma_set_mask_and_coherent(&pcidev->dev, DMA_BIT_MASK(32));

	if (ret) {

		dev_err(&pcidev->dev, "No suitable DMA support available.\n");

		goto disable_error_report_exit;

		return ret;

	}



	ret = cci_init_drvdata(pcidev);

	if (ret) {

		dev_err(&pcidev->dev, "Fail to init drvdata %d.\n", ret);

		goto disable_error_report_exit;

		return ret;

	}



	ret = cci_enumerate_feature_devs(pcidev);

	if (!ret)

		return ret;



	if (ret) {

		dev_err(&pcidev->dev, "enumeration failure %d.\n", ret);



disable_error_report_exit:

	pci_disable_pcie_error_reporting(pcidev);

		return ret;

	}



	return 0;

}



static int cci_pci_sriov_configure(struct pci_dev *pcidev, int num_vfs)

{

	struct cci_drvdata *drvdata = pci_get_drvdata(pcidev);
@@ -448,7 +441,6 @@ static void cci_pci_remove(struct pci_dev *pcidev) 
		cci_pci_sriov_configure(pcidev, 0);



	cci_remove_feature_devs(pcidev);

	pci_disable_pcie_error_reporting(pcidev);

}



static struct pci_driver cci_pci_driver = {