mirror of
git://nv-tegra.nvidia.com/linux-nv-oot.git
synced 2025-12-22 09:11:26 +03:00
pci-epf: probe has additional APIs for Linux 6.6
The probe callback of driver "pci_epf_driver" has additonal
APIs as pci_epf_device_id for Linux 6.6 and above.
Add this new argument for Linux 6.6 and above.
Bug 4374520
Change-Id: Ie744a98947b895fce83f1a9df598ddbee2c3d138
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3014991
(cherry picked from commit 64b442b57d)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3032098
Reviewed-by: Jonathan Hunter <jonathanh@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
Tested-by: Jonathan Hunter <jonathanh@nvidia.com>
This commit is contained in:
committed by
mobile promotions
parent
715c34434f
commit
9c77439e40
3
Makefile
3
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
|
||||
|
||||
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
Reference in New Issue
Block a user