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

nvethernet: Enable IVC for kernel 5.10

Browse Source 
Bug 2694285

Change-Id: I80a66c86f9cb4974454b41dfde3707ab36e15c24
Signed-off-by: Nagaraj annaiah <nannaiah@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2495280
Reviewed-by: Rakesh Goyal <rgoyal@nvidia.com>
Reviewed-by: Srinivas Ramachandran <srinivasra@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
GVS: Gerrit_Virtual_Submit
This commit is contained in:
nannaiah
2021-03-08 11:43:13 -08:00
committed by Revanth Kumar Uppala
parent 9f61b817f7
commit e411787070
3 changed files with 3 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
drivers/net/ethernet/nvidia/nvethernet/ether_linux.c
View File

@@ -675,7 +675,6 @@ static void ether_free_irqs(struct ether_priv_data *pdata)
}
}
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(5, 9, 0))
/**
* @brief IVC ISR Routine
*
@@ -802,12 +801,9 @@ static int ether_init_ivc(struct ether_priv_data *pdata)
id, ictxt->ivck->frame_size, ictxt->ivck->irq);
osi_core->osd_ops.ivc_send = osd_ivc_send_cmd;
init_completion(&ictxt->msg_complete);
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(5, 9, 0))
ether_start_ivc(pdata);
#endif
return 0;
}
#endif
/**
* @brief Register IRQs
@@ -1625,9 +1621,7 @@ static int ether_open(struct net_device *dev)
gpio_set_value(pdata->phy_reset, 1);
}
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(5, 9, 0))
ether_start_ivc(pdata);
#endif
ret = ether_enable_clks(pdata);
if (ret < 0) {
@@ -1870,9 +1864,7 @@ static int ether_close(struct net_device *ndev)
/* MAC deinit which inturn stop MAC Tx,Rx */
osi_hw_core_deinit(pdata->osi_core);
#if (LINUX_VERSION_CODE <= KERNEL_VERSION(5, 9, 0))
ether_stop_ivc(pdata);
#endif
/* Assert MAC RST gpio */
if (!pdata->osi_core->pre_si && pdata->mac_rst) {
@@ -3850,7 +3842,7 @@ static int ether_parse_dt(struct ether_priv_data *pdata)
dev_err(dev, "mismatch in numbers of DMA channel and MTL Q\n");
return -EINVAL;
}
#if (KERNEL_VERSION(5, 4, 0) > LINUX_VERSION_CODE)
/* Allow to set non zero DMA channel for virtualization */
if (!ether_init_ivc(pdata)) {
osi_dma->use_virtualization = OSI_ENABLE;
@@ -3864,9 +3856,6 @@ static int ether_parse_dt(struct ether_priv_data *pdata)
ret = -1;
pdata->use_stats = OSI_ENABLE;
}
#else
ret = -1;
#endif
for (i = 0; i < osi_dma->num_dma_chans; i++) {
if (osi_dma->dma_chans[i] != osi_core->mtl_queues[i]) {
@@ -4418,6 +4407,7 @@ err_init_res:
err_parse_dt:
err_core_ops:
err_dma_ops:
ether_stop_ivc(pdata);
free_netdev(ndev);
return ret;
}