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 17:25:35 +03:00
Code Issues Packages Projects Releases Wiki Activity

pci: endpoint: use conftest for pci-epf-tegra-vnet.c

Browse Source 
There are several build issues observed in pci-epf-tegra-vnet.c
when building against mainline.

These errors pertain to the following previous commits:

* Use conftest to find if pci_epc_event_ops struct has core_deinit.
* pci: Use conftest to find if probe of pci_epf_driver has ID arg
* misc: nvscic2c-pcie: Drop usage of enum pci_epc_irq_type from Linux 6.8

The pci-epf-tegra-vnet.c is recently added and needs to use those
same new conftest capabilities.

Bug 4346767

Change-Id: I4ea66524513cdc4d62607a061c3f253e2a3cee2b
Signed-off-by: Brad Griffis <bgriffis@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/3128608
Reviewed-by: Jon Hunter <jonathanh@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
This commit is contained in:
Brad Griffis
2024-04-30 02:15:40 +00:00
committed by mobile promotions
parent 28f1253514
commit b0e75c8874
1 changed files with 33 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
drivers/pci/endpoint/functions/pci-epf-tegra-vnet.c
View File

@@ -173,8 +173,13 @@ static void tvnet_ep_raise_irq_work_function(struct work_struct *work)
#endif #endif
#if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 15, 0)) #if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 15, 0))
#if defined(PCI_EPC_IRQ_TYPE_ENUM_PRESENT) /* Dropped from Linux 6.8 */
lpci_epc_raise_irq(epc, epf->func_no, PCI_EPC_IRQ_MSIX, 0); lpci_epc_raise_irq(epc, epf->func_no, PCI_EPC_IRQ_MSIX, 0);
lpci_epc_raise_irq(epc, epf->func_no, PCI_EPC_IRQ_MSIX, 1); lpci_epc_raise_irq(epc, epf->func_no, PCI_EPC_IRQ_MSIX, 1);
#else
lpci_epc_raise_irq(epc, epf->func_no, PCI_IRQ_MSIX, 0);
lpci_epc_raise_irq(epc, epf->func_no, PCI_IRQ_MSIX, 1);
#endif
#else #else
pci_epc_raise_irq(epc, PCI_EPC_IRQ_MSIX, 0); pci_epc_raise_irq(epc, PCI_EPC_IRQ_MSIX, 0);
pci_epc_raise_irq(epc, PCI_EPC_IRQ_MSIX, 1); pci_epc_raise_irq(epc, PCI_EPC_IRQ_MSIX, 1);
@@ -214,7 +219,11 @@ static int tvnet_ep_write_ctrl_msg(struct pci_epf_tvnet *tvnet,
if (tvnet_ivc_full(&tvnet->ep2h_ctrl)) { if (tvnet_ivc_full(&tvnet->ep2h_ctrl)) {
/* Raise an interrupt to let host process EP2H ring */ /* Raise an interrupt to let host process EP2H ring */
#if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 15, 0)) #if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 15, 0))
#if defined(PCI_EPC_IRQ_TYPE_ENUM_PRESENT) /* Dropped from Linux 6.8 */
lpci_epc_raise_irq(epc, epf->func_no, PCI_EPC_IRQ_MSIX, 0); lpci_epc_raise_irq(epc, epf->func_no, PCI_EPC_IRQ_MSIX, 0);
#else
lpci_epc_raise_irq(epc, epf->func_no, PCI_IRQ_MSIX, 0);
#endif
#else #else
pci_epc_raise_irq(epc, PCI_EPC_IRQ_MSIX, 0); pci_epc_raise_irq(epc, PCI_EPC_IRQ_MSIX, 0);
#endif #endif
@@ -226,7 +235,11 @@ static int tvnet_ep_write_ctrl_msg(struct pci_epf_tvnet *tvnet,
memcpy(&ctrl_msg[idx], msg, sizeof(*msg)); memcpy(&ctrl_msg[idx], msg, sizeof(*msg));
tvnet_ivc_advance_wr(&tvnet->ep2h_ctrl); tvnet_ivc_advance_wr(&tvnet->ep2h_ctrl);
#if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 15, 0)) #if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 15, 0))
#if defined(PCI_EPC_IRQ_TYPE_ENUM_PRESENT) /* Dropped from Linux 6.8 */
lpci_epc_raise_irq(epc, epf->func_no, PCI_EPC_IRQ_MSIX, 0); lpci_epc_raise_irq(epc, epf->func_no, PCI_EPC_IRQ_MSIX, 0);
#else
lpci_epc_raise_irq(epc, epf->func_no, PCI_IRQ_MSIX, 0);
#endif
#else #else
pci_epc_raise_irq(epc, PCI_EPC_IRQ_MSIX, 0); pci_epc_raise_irq(epc, PCI_EPC_IRQ_MSIX, 0);
#endif #endif
@@ -377,7 +390,11 @@ static void tvnet_ep_alloc_empty_buffers(struct pci_epf_tvnet *tvnet)
tvnet_ivc_advance_wr(&tvnet->h2ep_empty); tvnet_ivc_advance_wr(&tvnet->h2ep_empty);
#if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 15, 0)) #if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 15, 0))
#if defined(PCI_EPC_IRQ_TYPE_ENUM_PRESENT) /* Dropped from Linux 6.8 */
lpci_epc_raise_irq(epc, epf->func_no, PCI_EPC_IRQ_MSIX, 0); lpci_epc_raise_irq(epc, epf->func_no, PCI_EPC_IRQ_MSIX, 0);
#else
lpci_epc_raise_irq(epc, epf->func_no, PCI_IRQ_MSIX, 0);
#endif
#else #else
pci_epc_raise_irq(epc, PCI_EPC_IRQ_MSIX, 0); pci_epc_raise_irq(epc, PCI_EPC_IRQ_MSIX, 0);
#endif #endif
@@ -626,7 +643,11 @@ static netdev_tx_t tvnet_ep_start_xmit(struct sk_buff *skb,
/* Check if EP2H_EMPTY_BUF available to read */ /* Check if EP2H_EMPTY_BUF available to read */
if (!tvnet_ivc_rd_available(&tvnet->ep2h_empty)) { if (!tvnet_ivc_rd_available(&tvnet->ep2h_empty)) {
#if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 15, 0)) #if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 15, 0))
#if defined(PCI_EPC_IRQ_TYPE_ENUM_PRESENT) /* Dropped from Linux 6.8 */
lpci_epc_raise_irq(epc, epf->func_no, PCI_EPC_IRQ_MSIX, 0); lpci_epc_raise_irq(epc, epf->func_no, PCI_EPC_IRQ_MSIX, 0);
#else
lpci_epc_raise_irq(epc, epf->func_no, PCI_IRQ_MSIX, 0);
#endif
#else #else
pci_epc_raise_irq(epc, PCI_EPC_IRQ_MSIX, 0); pci_epc_raise_irq(epc, PCI_EPC_IRQ_MSIX, 0);
#endif #endif
@@ -638,7 +659,11 @@ static netdev_tx_t tvnet_ep_start_xmit(struct sk_buff *skb,
/* Check if EP2H_FULL_BUF available to write */ /* Check if EP2H_FULL_BUF available to write */
if (tvnet_ivc_full(&tvnet->ep2h_full)) { if (tvnet_ivc_full(&tvnet->ep2h_full)) {
#if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 15, 0)) #if (LINUX_VERSION_CODE > KERNEL_VERSION(4, 15, 0))
#if defined(PCI_EPC_IRQ_TYPE_ENUM_PRESENT) /* Dropped from Linux 6.8 */
lpci_epc_raise_irq(epc, epf->func_no, PCI_EPC_IRQ_MSIX, 1); lpci_epc_raise_irq(epc, epf->func_no, PCI_EPC_IRQ_MSIX, 1);
#else
lpci_epc_raise_irq(epc, epf->func_no, PCI_IRQ_MSIX, 1);
#endif
#else #else
pci_epc_raise_irq(epc, PCI_EPC_IRQ_MSIX, 1); pci_epc_raise_irq(epc, PCI_EPC_IRQ_MSIX, 1);
#endif #endif
@@ -1605,6 +1630,7 @@ static void tvnet_ep_pci_epf_linkup(struct pci_epf *epf)
#endif #endif
#if (LINUX_VERSION_CODE > KERNEL_VERSION(5, 14, 0)) #if (LINUX_VERSION_CODE > KERNEL_VERSION(5, 14, 0))
#if defined(NV_PCI_EPC_EVENT_OPS_STRUCT_HAS_CORE_DEINIT)
static int tvnet_ep_pci_epf_core_deinit(struct pci_epf *epf) static int tvnet_ep_pci_epf_core_deinit(struct pci_epf *epf)
{ {
struct pci_epf_bar *epf_bar = &epf->bar[BAR_0]; struct pci_epf_bar *epf_bar = &epf->bar[BAR_0];
@@ -1620,10 +1646,13 @@ static int tvnet_ep_pci_epf_core_deinit(struct pci_epf *epf)
return 0; return 0;
} }
#endif
static const struct pci_epc_event_ops tvnet_event_ops = { static const struct pci_epc_event_ops tvnet_event_ops = {
.core_init = tvnet_ep_pci_epf_core_init, .core_init = tvnet_ep_pci_epf_core_init,
#if defined(NV_PCI_EPC_EVENT_OPS_STRUCT_HAS_CORE_DEINIT)
.core_deinit = tvnet_ep_pci_epf_core_deinit, .core_deinit = tvnet_ep_pci_epf_core_deinit,
#endif
.link_up = tvnet_ep_pci_epf_linkup, .link_up = tvnet_ep_pci_epf_linkup,
}; };
@@ -2090,7 +2119,11 @@ static const struct pci_epf_device_id tvnet_ep_epf_tvnet_ids[] = {
}; };
#endif #endif
#if defined(NV_PCI_EPF_DRIVER_STRUCT_PROBE_HAS_ID_ARG) /* Linux 6.4 */
static int tvnet_ep_epf_tvnet_probe(struct pci_epf *epf, const struct pci_epf_device_id *id)
#else
static int tvnet_ep_epf_tvnet_probe(struct pci_epf *epf) static int tvnet_ep_epf_tvnet_probe(struct pci_epf *epf)
#endif
{ {
struct device *fdev = &epf->dev; struct device *fdev = &epf->dev;
struct pci_epf_tvnet *tvnet; struct pci_epf_tvnet *tvnet;