From e28ef73ec9baea7df631606298f8c210dc8f31a8 Mon Sep 17 00:00:00 2001
From: Vijayakumar <vsubbu@nvidia.com>
Date: Tue, 30 Aug 2016 16:48:38 +0530
Subject: gpu: nvgpu: add support to cache VF table from PMU

JIRA DNVGPU-118

Change-Id: I5c6a919d18e6de077e03180ba70441cfc9791350
Signed-off-by: Vijayakumar <vsubbu@nvidia.com>
Reviewed-on: http://git-master/r/1209849
(cherry picked from commit 469f35e3f65964a3402f7e0c49862bd44b68936a)
Reviewed-on: http://git-master/r/1233040
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
---
 drivers/gpu/nvgpu/clk/clk_vf_point.c | 79 +++++++++++++++++++++++++++++++++++-
 drivers/gpu/nvgpu/clk/clk_vf_point.h |  1 +
 2 files changed, 78 insertions(+), 2 deletions(-)

(limited to 'drivers/gpu')

diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.c b/drivers/gpu/nvgpu/clk/clk_vf_point.c
index a8cc6403..4fde7226 100644
--- a/drivers/gpu/nvgpu/clk/clk_vf_point.c
+++ b/drivers/gpu/nvgpu/clk/clk_vf_point.c
@@ -243,7 +243,7 @@ static u32 clk_vf_point_construct_volt(struct gk20a *g,
 	if (BOARDOBJ_GET_TYPE(pargs) != CTRL_CLK_CLK_VF_POINT_TYPE_VOLT)
 		return -EINVAL;
 
-	ptmpobj->type_mask |= BIT(CTRL_CLK_CLK_VF_POINT_TYPE_VOLT);
+	ptmpobj->type_mask = BIT(CTRL_CLK_CLK_VF_POINT_TYPE_VOLT);
 	status = clk_vf_point_construct_super(g, ppboardobj, size, pargs);
 	if (status)
 		return -EINVAL;
@@ -271,7 +271,7 @@ static u32 clk_vf_point_construct_freq(struct gk20a *g,
 	if (BOARDOBJ_GET_TYPE(pargs) != CTRL_CLK_CLK_VF_POINT_TYPE_FREQ)
 		return -EINVAL;
 
-	ptmpobj->type_mask |= BIT(CTRL_CLK_CLK_VF_POINT_TYPE_FREQ);
+	ptmpobj->type_mask = BIT(CTRL_CLK_CLK_VF_POINT_TYPE_FREQ);
 	status = clk_vf_point_construct_super(g, ppboardobj, size, pargs);
 	if (status)
 		return -EINVAL;
@@ -341,3 +341,78 @@ static u32 _clk_vf_point_pmudatainit_super(struct gk20a *g,
 	pset->volt_rail_idx = pclk_vf_point->volt_rail_idx;
 	return status;
 }
+
+
+static u32 clk_vf_point_update(struct gk20a *g,
+				struct boardobj *board_obj_ptr,
+				struct nv_pmu_boardobj *ppmudata)
+{
+	struct clk_vf_point *pclk_vf_point;
+	struct nv_pmu_clk_clk_vf_point_boardobj_get_status *pstatus;
+
+	gk20a_dbg_info("");
+
+
+	pclk_vf_point =
+		(struct clk_vf_point *)board_obj_ptr;
+
+	pstatus = (struct nv_pmu_clk_clk_vf_point_boardobj_get_status *)
+		ppmudata;
+
+	if (pstatus->super.type != pclk_vf_point->super.type) {
+		gk20a_err(dev_from_gk20a(g),
+			"pmu data and boardobj type not matching");
+		return -EINVAL;
+	}
+	/* now copy VF pair */
+	memcpy(&pclk_vf_point->pair, &pstatus->pair,
+		sizeof(struct ctrl_clk_vf_pair));
+	return 0;
+}
+
+/*get latest vf point data from PMU */
+u32 clk_vf_point_cache(struct gk20a *g)
+{
+
+	struct clk_vf_points *pclk_vf_points;
+	struct boardobjgrp *pboardobjgrp;
+	struct boardobjgrpmask *pboardobjgrpmask;
+	struct nv_pmu_boardobjgrp_super *pboardobjgrppmu;
+	struct boardobj *pboardobj = NULL;
+	struct nv_pmu_boardobj_query *pboardobjpmustatus = NULL;
+	u32 status;
+	u8 index;
+
+	gk20a_dbg_info("");
+	pclk_vf_points = &g->clk_pmu.clk_vf_pointobjs;
+	pboardobjgrp = &pclk_vf_points->super.super;
+	pboardobjgrpmask = &pclk_vf_points->super.mask.super;
+
+	status = pboardobjgrp->pmugetstatus(g, pboardobjgrp, pboardobjgrpmask);
+	if (status) {
+		gk20a_err(dev_from_gk20a(g), "err getting boardobjs from pmu");
+		return status;
+	}
+	pboardobjgrppmu = pboardobjgrp->pmu.getstatus.buf;
+
+	BOARDOBJGRP_FOR_EACH(pboardobjgrp, struct boardobj*, pboardobj, index) {
+		status = pboardobjgrp->pmustatusinstget(g,
+				(struct nv_pmu_boardobjgrp *)pboardobjgrppmu,
+				&pboardobjpmustatus, index);
+		if (status) {
+			gk20a_err(dev_from_gk20a(g),
+				"could not get status object instance");
+			return status;
+		}
+
+		status = clk_vf_point_update(g, pboardobj,
+			(struct nv_pmu_boardobj *)pboardobjpmustatus);
+		if (status) {
+			gk20a_err(dev_from_gk20a(g),
+				"invalid data from pmu at %d", index);
+			return status;
+		}
+	}
+
+	return 0;
+}
diff --git a/drivers/gpu/nvgpu/clk/clk_vf_point.h b/drivers/gpu/nvgpu/clk/clk_vf_point.h
index b05ab818..306bec41 100644
--- a/drivers/gpu/nvgpu/clk/clk_vf_point.h
+++ b/drivers/gpu/nvgpu/clk/clk_vf_point.h
@@ -21,6 +21,7 @@
 
 u32 clk_vf_point_sw_setup(struct gk20a *g);
 u32 clk_vf_point_pmu_setup(struct gk20a *g);
+u32 clk_vf_point_cache(struct gk20a *g);
 
 struct clk_vf_points {
 	struct boardobjgrp_e255 super;
-- 
cgit v1.2.2