From 715c34434fdb3dcab80278f89997ae62fa6fdfe9 Mon Sep 17 00:00:00 2001 From: Laxman Dewangan Date: Sun, 12 Nov 2023 18:39:28 +0000 Subject: [PATCH] nvscic2c-pcie: epc: Drop calling of error reporting for Linux 6.6 The API pci_disable_pcie_error_reporting() is dropped from Linux 6.6. Remove the calling of this APIs for Linux 6.6 and later. Bug 4374520 Change-Id: Iabb66dda70e6fe3a70be5ff14199b32b9c0ca3fa Signed-off-by: Laxman Dewangan Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3014988 (cherry picked from commit a1cc281c175ae9947a309e0eccce3616a8832538) Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3032097 Reviewed-by: Jonathan Hunter GVS: Gerrit_Virtual_Submit Tested-by: Jonathan Hunter --- Makefile | 3 +++ drivers/misc/nvscic2c-pcie/epc/module.c | 2 ++ 2 files changed, 5 insertions(+) diff --git a/Makefile b/Makefile index ee1bcabb..a899e6bb 100644 --- a/Makefile +++ b/Makefile @@ -50,6 +50,9 @@ 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 +# Drop the API for pcie_disable_pcie_error_reporting +subdir-ccflags-y += -DNV_PCIE_DIABLE_PCIE_ERROR_REPORTING_DROP + # Crypto driver has major change in it ops, skip it export CONFIG_SKIP_CRYPTO=y endif diff --git a/drivers/misc/nvscic2c-pcie/epc/module.c b/drivers/misc/nvscic2c-pcie/epc/module.c index a6ebe630..bd273f25 100644 --- a/drivers/misc/nvscic2c-pcie/epc/module.c +++ b/drivers/misc/nvscic2c-pcie/epc/module.c @@ -290,7 +290,9 @@ deinit: pci_release_region(pdev, 0); pci_clear_master(pdev); +#if !defined(NV_PCIE_DIABLE_PCIE_ERROR_REPORTING_DROP) pci_disable_pcie_error_reporting(pdev); +#endif pci_disable_device(pdev); dt_release(&drv_ctx->drv_param);