From 0f7f6190a11fc2a927ca21fdc8855e39965e3116 Mon Sep 17 00:00:00 2001
From: Bharat Nihalani <bnihalani@nvidia.com>
Date: Thu, 10 Aug 2023 17:14:58 +0000
Subject: [PATCH] nv-virtio-poc: Include correct header

This driver was including <linux/tegra-ivc.h> that uses deprecated
CONFIG_TEGRA_HV_MANAGER. This caused all tegra_hv functions to be
stubbed.

With K5.15, a new header <soc/tegra/virt/hv-ivc.h> should be
used instead that makes use of CONFIG_TEGRA_VIRTUALIZATION which
is enabled as part of the kernel build flow. With this header
included, all tegra_hv functions are correctly linked.

Also, there is no need to include tegra_hv.h as this driver
does not use the functions declared in that header.

Bug 4206871

Change-Id: I6ef6e2cf5f2c88dab015c2f10913ede4fdfd5583
Signed-off-by: Bharat Nihalani <bnihalani@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/c/linux-nv-oot/+/2954916
Reviewed-by: Nitin Kumbhar <nkumbhar@nvidia.com>
GVS: Gerrit_Virtual_Submit <buildbot_gerritrpt@nvidia.com>
---
 drivers/nv-virtio/nv-virtio-console-poc.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/drivers/nv-virtio/nv-virtio-console-poc.c b/drivers/nv-virtio/nv-virtio-console-poc.c
index 08ec512e..8e7382f7 100644
--- a/drivers/nv-virtio/nv-virtio-console-poc.c
+++ b/drivers/nv-virtio/nv-virtio-console-poc.c
@@ -17,8 +17,7 @@
 #include <linux/fs.h>
 #include <linux/poll.h>
 #include <linux/uaccess.h>
-
-#include <linux/tegra-ivc.h>
+#include <soc/tegra/virt/hv-ivc.h>
 
 #include <uapi/linux/virtio_mmio.h>
 #include <uapi/linux/virtio_ring.h>
@@ -27,8 +26,6 @@
 
 #include <asm/io.h>
 
-#include "tegra_hv.h"
-
 /* flag to enable read-write loopback in this driver */
 static bool nvvc_enable_driver_loopback = false;
 /* flag to enable mempool and ivc */