From ecf1a5a7a3daf34604712926d7cad72788039fc6 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Wed, 1 Nov 2023 06:51:08 +0000 Subject: [PATCH] misc: Drop PCIE error reporting for Linux 6.6 Drop pcie error reporting call as it is not exported on Linux 6.6. --- commit 7ec4b34be4234599cf1241ef807cdb7c3636f6fe Author: Bjorn Helgaas Date: Mon Jul 10 18:21:36 2023 -0500 PCI/AER: Unexport pci_enable_pcie_error_reporting() --- Bug 4346767 Change-Id: I0b8f924df1ac74c5f2b4973fb4a4d7f157d2c2cc Signed-off-by: Laxman Dewangan Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3008089 GVS: Gerrit_Virtual_Submit --- Makefile | 3 +++ drivers/misc/nvscic2c-pcie/epc/module.c | 2 ++ drivers/misc/tegra-pcie-dma-test.c | 2 ++ drivers/net/ethernet/nvidia/pcie/tegra_vnet.c | 2 ++ 4 files changed, 9 insertions(+) diff --git a/Makefile b/Makefile index d1732e11..d1eff329 100644 --- a/Makefile +++ b/Makefile @@ -46,6 +46,9 @@ subdir-ccflags-y += -DNV_V4L2_ASYNC_MATCH_FWNODE_RENAME # Rename async_nf_init and v4l2_async_subdev_nf_register subdir-ccflags-y += -DNV_V4L2_ASYNC_NF_SUBDEVICE_INIT_RENAME + +# Deprecate PCIED Error reporting pci_enable_pcie_error_reporting +subdir-ccflags-y += -DNV_DROP_PCIE_ERROR_REPORTING endif ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y) diff --git a/drivers/misc/nvscic2c-pcie/epc/module.c b/drivers/misc/nvscic2c-pcie/epc/module.c index e969b525..a6ebe630 100644 --- a/drivers/misc/nvscic2c-pcie/epc/module.c +++ b/drivers/misc/nvscic2c-pcie/epc/module.c @@ -350,7 +350,9 @@ nvscic2c_pcie_epc_probe(struct pci_dev *pdev, ret = pcim_enable_device(pdev); if (ret) goto err_enable_device; +#if !defined(NV_DROP_PCIE_ERROR_REPORTING) pci_enable_pcie_error_reporting(pdev); +#endif pci_set_master(pdev); ret = pci_request_region(pdev, 0, MODULE_NAME); if (ret) diff --git a/drivers/misc/tegra-pcie-dma-test.c b/drivers/misc/tegra-pcie-dma-test.c index e22d2a39..b6d693bc 100644 --- a/drivers/misc/tegra-pcie-dma-test.c +++ b/drivers/misc/tegra-pcie-dma-test.c @@ -170,7 +170,9 @@ static int ep_test_dma_probe(struct pci_dev *pdev, return ret; } +#if !defined(NV_DROP_PCIE_ERROR_REPORTING) pci_enable_pcie_error_reporting(pdev); +#endif pci_set_master(pdev); diff --git a/drivers/net/ethernet/nvidia/pcie/tegra_vnet.c b/drivers/net/ethernet/nvidia/pcie/tegra_vnet.c index 99642075..6b5d9b53 100644 --- a/drivers/net/ethernet/nvidia/pcie/tegra_vnet.c +++ b/drivers/net/ethernet/nvidia/pcie/tegra_vnet.c @@ -749,7 +749,9 @@ static int tvnet_host_probe(struct pci_dev *pdev, goto free_netdev; } +#if !defined(NV_DROP_PCIE_ERROR_REPORTING) pci_enable_pcie_error_reporting(pdev); +#endif /* * In CPU memory write case, skb->data buffer is copied to dst in BAR.