nv-tegra-mirror/linux-nv-oot
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nv-oot.git synced 2025-12-22 09:11:26 +03:00
Code Issues Packages Projects Releases Wiki Activity

pcie: Enable core_deinit only when core has implemented it

Browse Source 
The core_deinit callback is the Nvidia internal feature
which is not upstreamed yet. Enable the call back from
OOT modules only when core have implemented this callback.

Bug 4374520

Change-Id: Iee2b92b7d70326ea3ce99ce6f6600d27f1e2896b
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3014989
(cherry picked from commit dc69c0b58a)
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3128429
Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
Reviewed-by: Brad Griffis <bgriffis@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
Tested-by: Brad Griffis <bgriffis@nvidia.com>
This commit is contained in:
Laxman Dewangan
2023-11-12 19:17:24 +00:00
committed by mobile promotions
parent 4e35e4b067
commit cbac517483
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -7,6 +7,9 @@ LINUXINCLUDE += -I$(srctree.nvidia-oot)/include
subdir-ccflags-y += -Werror subdir-ccflags-y += -Werror
subdir-ccflags-y += -Wmissing-prototypes subdir-ccflags-y += -Wmissing-prototypes
# PCIE DMA EPF core deinit not implemented in core kernel
subdir-ccflags-y += -DNV_PCIE_DMA_EPF_CORE_DEINIT_NOT_AVAILABLE
ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y) ifeq ($(CONFIG_TEGRA_VIRTUALIZATION),y)
subdir-ccflags-y += -DCONFIG_TEGRA_VIRTUALIZATION subdir-ccflags-y += -DCONFIG_TEGRA_VIRTUALIZATION
endif endif

8
drivers/misc/nvscic2c-pcie/epf/module.c
View File

@@ -1,5 +1,5 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
// Copyright (c) 2022-2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. // SPDX-FileCopyrightText: Copyright (c) 2022-2024 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
#define pr_fmt(fmt) "nvscic2c-pcie: epf: " fmt #define pr_fmt(fmt) "nvscic2c-pcie: epf: " fmt
@@ -169,6 +169,7 @@ allocate_outbound_area(struct pci_epf *epf, size_t win_size,
return ret; return ret;
} }
#if !defined(NV_PCIE_DMA_EPF_CORE_DEINIT_NOT_AVAILABLE)
static void static void
clear_inbound_translation(struct pci_epf *epf) clear_inbound_translation(struct pci_epf *epf)
{ {
@@ -178,6 +179,7 @@ clear_inbound_translation(struct pci_epf *epf)
/* no api to clear epf header.*/ /* no api to clear epf header.*/
} }
#endif
static int static int
set_inbound_translation(struct pci_epf *epf) set_inbound_translation(struct pci_epf *epf)
@@ -490,6 +492,7 @@ deinit_work(struct work_struct *work)
* @DRV_MODE_EPC would have already gone then by the time * @DRV_MODE_EPC would have already gone then by the time
* struct pci_epc_event_ops.core_deinit is called. * struct pci_epc_event_ops.core_deinit is called.
*/ */
#if !defined(NV_PCIE_DMA_EPF_CORE_DEINIT_NOT_AVAILABLE)
static int static int
nvscic2c_pcie_epf_core_deinit(struct pci_epf *epf) nvscic2c_pcie_epf_core_deinit(struct pci_epf *epf)
{ {
@@ -517,6 +520,7 @@ nvscic2c_pcie_epf_core_deinit(struct pci_epf *epf)
return 0; return 0;
} }
#endif
/* Handle link message from @DRV_MODE_EPC. */ /* Handle link message from @DRV_MODE_EPC. */
static void static void
@@ -729,7 +733,9 @@ get_driverdata(const struct pci_epf_device_id *id,
static const struct pci_epc_event_ops nvscic2c_event_ops = { static const struct pci_epc_event_ops nvscic2c_event_ops = {
.core_init = nvscic2c_pcie_epf_core_init, .core_init = nvscic2c_pcie_epf_core_init,
#if !defined(NV_PCIE_DMA_EPF_CORE_DEINIT_NOT_AVAILABLE)
.core_deinit = nvscic2c_pcie_epf_core_deinit, .core_deinit = nvscic2c_pcie_epf_core_deinit,
#endif
}; };
static int static int

4
drivers/pci/endpoint/functions/pci-epf-dma-test.c
View File

@@ -168,6 +168,7 @@ static int pcie_dma_epf_core_init(struct pci_epf *epf)
return 0; return 0;
} }
#if !defined(NV_PCIE_DMA_EPF_CORE_DEINIT_NOT_AVAILABLE)
static int pcie_dma_epf_core_deinit(struct pci_epf *epf) static int pcie_dma_epf_core_deinit(struct pci_epf *epf)
{ {
struct pcie_epf_dma *epfnv = epf_get_drvdata(epf); struct pcie_epf_dma *epfnv = epf_get_drvdata(epf);
@@ -183,6 +184,7 @@ static int pcie_dma_epf_core_deinit(struct pci_epf *epf)
return 0; return 0;
} }
#endif
static void pcie_dma_epf_unbind(struct pci_epf *epf) static void pcie_dma_epf_unbind(struct pci_epf *epf)
{ {
@@ -267,7 +269,9 @@ static const struct pci_epf_device_id pcie_dma_epf_ids[] = {
static const struct pci_epc_event_ops pci_epf_dma_test_event_ops = { static const struct pci_epc_event_ops pci_epf_dma_test_event_ops = {
.core_init = pcie_dma_epf_core_init, .core_init = pcie_dma_epf_core_init,
#if !defined(NV_PCIE_DMA_EPF_CORE_DEINIT_NOT_AVAILABLE)
.core_deinit = pcie_dma_epf_core_deinit, .core_deinit = pcie_dma_epf_core_deinit,
#endif
}; };
#if defined(NV_PCI_EPF_DRIVER_STRUCT_PROBE_HAS_ID_ARG) /* Linux 6.4 */ #if defined(NV_PCI_EPF_DRIVER_STRUCT_PROBE_HAS_ID_ARG) /* Linux 6.4 */