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 02:01:36 +03:00
Code Issues Packages Projects Releases Wiki Activity

nvethernet: disable IVC support for Ethernet in K5.4

Browse Source 
tegra-ivc driver is not enabled on kernel-5.4 hence
file "linux/tegra-ivc.h" is missing.This driver is
used by virtualization code.

Putting all the virtualization code within kernel
version check and disable it for kernel-5.4

Bug 200591808

Change-Id: I797062db172256e1ec14d22d00d73164513a9685
Signed-off-by: Bibhay Ranjan <bibhayr@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvidia/+/2337400
Reviewed-by: automaticguardword <automaticguardword@nvidia.com>
Reviewed-by: Bitan Biswas <bbiswas@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Bibhay Ranjan
2020-04-30 16:18:30 +05:30
committed by Revanth Kumar Uppala
parent c4a75f03ac
commit e42f49ee42
2 changed files with 29 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/net/ethernet/nvidia/nvethernet/ether_linux.h
View File

@@ -40,9 +40,11 @@
#include <linux/of.h>
#include <linux/ktime.h>
#include <linux/hrtimer.h>
#include <linux/version.h>
#if (KERNEL_VERSION(5, 4, 0) > LINUX_VERSION_CODE)
#include <linux/tegra-ivc.h>
#endif
#include <soc/tegra/chip-id.h>
#include <osi_core.h>
#include <osi_dma.h>
#include <mmc.h>
@@ -123,11 +125,12 @@
*/
#define ETHER_TX_MAX_FRAME_SIZE GSO_MAX_SIZE
#if (KERNEL_VERSION(5, 4, 0) > LINUX_VERSION_CODE)
/**
* @brief Ethernet Maximum IVC BUF
*/
#define ETHER_MAX_IVC_BUF 128
#endif
/**
* @brief Check if Tx data buffer length is within bounds.
@@ -357,6 +360,7 @@ struct ether_priv_data {
unsigned int tx_lpi_enabled;
/** Time (usec) MAC waits to enter LPI after Tx complete */
unsigned int tx_lpi_timer;
#if (KERNEL_VERSION(5, 4, 0) > LINUX_VERSION_CODE)
/** ivc cookie */
struct tegra_hv_ivc_cookie *ivck;
/** Buffer to receive pad ivc message */
@@ -365,6 +369,7 @@ struct ether_priv_data {
struct work_struct ivc_work;
/** Flag which decides stats is enabled(1) or disabled(0) */
unsigned int use_stats;
#endif
/** VM channel info data associated with VM IRQ */
struct ether_vm_irq_data *vm_irq_data;
};