From c99f13e8426a6640f09b1aca211507dc1f2bbc45 Mon Sep 17 00:00:00 2001
From: Seema Khowala <seemaj@nvidia.com>
Date: Tue, 9 Apr 2019 11:32:23 -0700
Subject: [PATCH] gpu: nvgpu: move nvgpu_report_host_error

Move nvgpu_report_host_error from gk20a/fifo_gk20a.c to
common/fifo/fifo.c

JIRA NVGPU-2011

Change-Id: Ia42c901edafa7bc11a8da4152b92293a5d131d10
Signed-off-by: Seema Khowala <seemaj@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2093119
Reviewed-by: Thomas Fleury <tfleury@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Alex Waterman <alexw@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
---
 drivers/gpu/nvgpu/common/fifo/fifo.c | 18 ++++++++++++++++++
 drivers/gpu/nvgpu/gk20a/fifo_gk20a.c | 17 -----------------
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/drivers/gpu/nvgpu/common/fifo/fifo.c b/drivers/gpu/nvgpu/common/fifo/fifo.c
index 76eb7c4b6..40592d1b2 100644
--- a/drivers/gpu/nvgpu/common/fifo/fifo.c
+++ b/drivers/gpu/nvgpu/common/fifo/fifo.c
@@ -31,6 +31,7 @@
 #include <nvgpu/channel.h>
 #include <nvgpu/tsg.h>
 #include <nvgpu/vm_area.h>
+#include <nvgpu/nvgpu_err.h>
 
 #include <gk20a/fifo_gk20a.h>
 
@@ -258,3 +259,20 @@ clean_up:
 
 	return err;
 }
+
+void nvgpu_report_host_error(struct gk20a *g, u32 inst,
+		u32 err_id, u32 intr_info)
+{
+	int ret;
+
+	if (g->ops.fifo.err_ops.report_host_err == NULL) {
+		return;
+	}
+	ret = g->ops.fifo.err_ops.report_host_err(g,
+			NVGPU_ERR_MODULE_HOST, inst, err_id, intr_info);
+	if (ret != 0) {
+		nvgpu_err(g, "Failed to report HOST error: \
+				inst=%u, err_id=%u, intr_info=%u, ret=%d",
+				inst, err_id, intr_info, ret);
+	}
+}
diff --git a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
index b64c7dab8..3d8a4e4d1 100644
--- a/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/fifo_gk20a.c
@@ -67,23 +67,6 @@
 
 #define FECS_METHOD_WFI_RESTORE 0x80000U
 
-void nvgpu_report_host_error(struct gk20a *g, u32 inst,
-		u32 err_id, u32 intr_info)
-{
-	int ret;
-
-	if (g->ops.fifo.err_ops.report_host_err == NULL) {
-		return;
-	}
-	ret = g->ops.fifo.err_ops.report_host_err(g,
-			NVGPU_ERR_MODULE_HOST, inst, err_id, intr_info);
-	if (ret != 0) {
-		nvgpu_err(g, "Failed to report HOST error: \
-				inst=%u, err_id=%u, intr_info=%u, ret=%d",
-				inst, err_id, intr_info, ret);
-	}
-}
-
 int gk20a_init_fifo_reset_enable_hw(struct gk20a *g)
 {
 	u32 timeout;