diff --git a/Makefile b/Makefile index a899e6bb..fe2101f9 100644 --- a/Makefile +++ b/Makefile @@ -53,6 +53,9 @@ 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 +# PCIE EPF driver probe has additional argument as ID +subdir-ccflags-y += -DNV_PCIE_EFP_DRIVER_PROBE_HAS_ID_ARG + # Crypto driver has major change in it ops, skip it export CONFIG_SKIP_CRYPTO=y endif diff --git a/drivers/misc/nvscic2c-pcie/epf/module.c b/drivers/misc/nvscic2c-pcie/epf/module.c index 86e1c2cc..b4b09db3 100644 --- a/drivers/misc/nvscic2c-pcie/epf/module.c +++ b/drivers/misc/nvscic2c-pcie/epf/module.c @@ -733,7 +733,11 @@ static const struct pci_epc_event_ops nvscic2c_event_ops = { }; static int +#if defined(NV_PCIE_EFP_DRIVER_PROBE_HAS_ID_ARG) +nvscic2c_pcie_epf_probe(struct pci_epf *epf, const struct pci_epf_device_id *id) +#else nvscic2c_pcie_epf_probe(struct pci_epf *epf) +#endif { int ret = 0; char *name = NULL; diff --git a/drivers/pci/endpoint/functions/pci-epf-dma-test.c b/drivers/pci/endpoint/functions/pci-epf-dma-test.c index 22058782..ad874084 100644 --- a/drivers/pci/endpoint/functions/pci-epf-dma-test.c +++ b/drivers/pci/endpoint/functions/pci-epf-dma-test.c @@ -266,7 +266,11 @@ static const struct pci_epc_event_ops pci_epf_dma_test_event_ops = { .core_deinit = pcie_dma_epf_core_deinit, }; +#if defined(NV_PCIE_EFP_DRIVER_PROBE_HAS_ID_ARG) +static int pcie_dma_epf_probe(struct pci_epf *epf, const struct pci_epf_device_id *id) +#else static int pcie_dma_epf_probe(struct pci_epf *epf) +#endif { struct device *dev = &epf->dev; struct pcie_epf_dma *epfnv;