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

pci: Use conftest to find if probe of pci_epf_driver has ID arg

Browse Source 
Use conftest to determine if the struct pci_epf_driver probe
API has ID argument or not

The additional argument as ID is added in probe() of the
struct pci_epf_driver with commit 081c715dfd5054 ("PCI:
endpoint: Pass EPF device ID to the probe function")
in Linux 6.4.

Bug 4346767

Change-Id: I004d1d3a8df922c0534c5631baa26f82f6992e4d
Signed-off-by: Laxman Dewangan <ldewangan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3030052
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Laxman Dewangan
2023-12-07 08:28:51 +00:00
committed by mobile promotions
parent 3839cecd1c
commit 0ed8b4e22a
5 changed files with 20 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -36,9 +36,6 @@ endif
# Changes done in Linux 6.6 onwards # Changes done in Linux 6.6 onwards
ifeq ($(shell test $(LINUX_VERSION) -ge $(LINUX_VERSION_6_6); echo $$?),0) ifeq ($(shell test $(LINUX_VERSION) -ge $(LINUX_VERSION_6_6); echo $$?),0)
# 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 # Crypto driver has major change in it ops, skip it
export CONFIG_SKIP_CRYPTO=y export CONFIG_SKIP_CRYPTO=y
endif endif

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

@@ -741,7 +741,7 @@ static const struct pci_epc_event_ops nvscic2c_event_ops = {
}; };
static int static int
#if defined(NV_PCIE_EFP_DRIVER_PROBE_HAS_ID_ARG) #if defined(NV_PCI_EPF_DRIVER_STRUCT_PROBE_HAS_ID_ARG) /* Linux 6.4 */
nvscic2c_pcie_epf_probe(struct pci_epf *epf, const struct pci_epf_device_id *id) nvscic2c_pcie_epf_probe(struct pci_epf *epf, const struct pci_epf_device_id *id)
#else #else
nvscic2c_pcie_epf_probe(struct pci_epf *epf) nvscic2c_pcie_epf_probe(struct pci_epf *epf)

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

@@ -272,7 +272,7 @@ static const struct pci_epc_event_ops pci_epf_dma_test_event_ops = {
#endif #endif
}; };
#if defined(NV_PCIE_EFP_DRIVER_PROBE_HAS_ID_ARG) #if defined(NV_PCI_EPF_DRIVER_STRUCT_PROBE_HAS_ID_ARG) /* Linux 6.4 */
static int pcie_dma_epf_probe(struct pci_epf *epf, const struct pci_epf_device_id *id) static int pcie_dma_epf_probe(struct pci_epf *epf, const struct pci_epf_device_id *id)
#else #else
static int pcie_dma_epf_probe(struct pci_epf *epf) static int pcie_dma_epf_probe(struct pci_epf *epf)

1
scripts/conftest/Makefile
View File

@@ -129,6 +129,7 @@ NV_CONFTEST_FUNCTION_COMPILE_TESTS += pwm_ops_struct_has_owner
NV_CONFTEST_FUNCTION_COMPILE_TESTS += pci_epc_event_ops_struct_has_core_deinit NV_CONFTEST_FUNCTION_COMPILE_TESTS += pci_epc_event_ops_struct_has_core_deinit
NV_CONFTEST_FUNCTION_COMPILE_TESTS += pci_disable_pcie_error_reporting NV_CONFTEST_FUNCTION_COMPILE_TESTS += pci_disable_pcie_error_reporting
NV_CONFTEST_FUNCTION_COMPILE_TESTS += pci_enable_pcie_error_reporting NV_CONFTEST_FUNCTION_COMPILE_TESTS += pci_enable_pcie_error_reporting
NV_CONFTEST_FUNCTION_COMPILE_TESTS += pci_epf_driver_struct_probe_has_id_arg
NV_CONFTEST_FUNCTION_COMPILE_TESTS += register_shrinker_has_fmt_arg NV_CONFTEST_FUNCTION_COMPILE_TESTS += register_shrinker_has_fmt_arg
NV_CONFTEST_FUNCTION_COMPILE_TESTS += shrinker_alloc NV_CONFTEST_FUNCTION_COMPILE_TESTS += shrinker_alloc
NV_CONFTEST_FUNCTION_COMPILE_TESTS += snd_soc_card_jack_new_has_no_snd_soc_jack_pins NV_CONFTEST_FUNCTION_COMPILE_TESTS += snd_soc_card_jack_new_has_no_snd_soc_jack_pins

17
scripts/conftest/conftest.sh
View File

@@ -7067,6 +7067,23 @@ compile_test() {
compile_check_conftest "$CODE" "NV_PCI_ENABLE_PCIE_ERROR_REPORTING_PRESENT" "" "functions" compile_check_conftest "$CODE" "NV_PCI_ENABLE_PCIE_ERROR_REPORTING_PRESENT" "" "functions"
;; ;;
pci_epf_driver_struct_probe_has_id_arg)
#
# Determine if the struct pci_epf_driver probe API has ID argument or not.
#
# The additional argument as ID is added in probe() of the struct pci_epf_driver
# with change 081c715dfd5054 ("PCI: endpoint: Pass EPF device ID to the probe function")
# in Linux 6.4.
#
CODE="
#include <linux/pci-epf.h>
void conftest_pci_epf_driver_struct_probe_has_id_arg(struct pci_epf_driver *epfd) {
epfd->probe(NULL);
}"
compile_check_conftest "$CODE" "NV_PCI_EPF_DRIVER_STRUCT_PROBE_HAS_ID_ARG" "" "functions"
;;
register_shrinker_has_fmt_arg) register_shrinker_has_fmt_arg)
# #
# Determine if the 'register_shrinker' function # Determine if the 'register_shrinker' function