gpu: nvgpu: Selectively disable/enable CFC

clk_pmu_freq_controller_load used the default mask and affected
all the clock frequency controllers (CFC) which had their bits
set in the mask. We wish to enable/disable the CFCs in isolation
through debugfs. So we add a parameter(bit_idx) to the function
which will help affect only one CFC at a time

JIRA DNVGPU-207

DEPENDS ON: <http://git-master/r/1563302>

Change-Id: I233f52158b4a987bcc058a425380983dbe53fac8
Signed-off-by: Tejal Kudav <tkudav@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1563303
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

4 files changed, 42 insertions, 9 deletions

diff --git a/drivers/gpu/nvgpu/clk/clk.c b/drivers/gpu/nvgpu/clk/clk.c
index 99b5b17c..3906be48 100644
--- a/drivers/gpu/nvgpu/clk/clk.c
+++ b/drivers/gpu/nvgpu/clk/clk.c
@@ -55,7 +55,7 @@ static void clkrpc_pmucmdhandler(struct gk20a *g, struct pmu_msg *msg,
                 phandlerparams->success = 1;
 }
 
-int clk_pmu_freq_controller_load(struct gk20a *g, bool bload)
+int clk_pmu_freq_controller_load(struct gk20a *g, bool bload, u8 bit_idx)
 {
         struct pmu_cmd cmd;
         struct pmu_msg msg;
@@ -67,6 +67,7 @@ int clk_pmu_freq_controller_load(struct gk20a *g, bool bload)
         struct nv_pmu_clk_load *clkload;
         struct clk_freq_controllers *pclk_freq_controllers;
         struct ctrl_boardobjgrp_mask_e32 *load_mask;
+        struct boardobjgrpmask_e32 isolate_cfc_mask;
 
         memset(&payload, 0, sizeof(struct pmu_payload));
         memset(&rpccall, 0, sizeof(struct nv_pmu_clk_rpc));
@@ -82,10 +83,39 @@ int clk_pmu_freq_controller_load(struct gk20a *g, bool bload)
 
         load_mask = &rpccall.params.clk_load.payload.freq_controllers.load_mask;
 
-        status = boardobjgrpmask_export(
-                &pclk_freq_controllers->freq_ctrl_load_mask.super,
-                pclk_freq_controllers->freq_ctrl_load_mask.super.bitcount,
-                &load_mask->super);
+        status = boardobjgrpmask_e32_init(&isolate_cfc_mask, NULL);
+
+        if (bit_idx == CTRL_CLK_CLK_FREQ_CONTROLLER_ID_ALL) {
+                status = boardobjgrpmask_export(
+                                &pclk_freq_controllers->
+                                        freq_ctrl_load_mask.super,
+                                pclk_freq_controllers->
+                                        freq_ctrl_load_mask.super.bitcount,
+                                &load_mask->super);
+
+
+        } else {
+                status = boardobjgrpmask_bitset(&isolate_cfc_mask.super,
+                                                bit_idx);
+                status = boardobjgrpmask_export(&isolate_cfc_mask.super,
+                                        isolate_cfc_mask.super.bitcount,
+                                        &load_mask->super);
+                if (bload)
+                        status = boardobjgrpmask_bitset(
+                                        &pclk_freq_controllers->
+                                                freq_ctrl_load_mask.super,
+                                        bit_idx);
+                else
+                        status = boardobjgrpmask_bitclr(
+                                        &pclk_freq_controllers->
+                                                freq_ctrl_load_mask.super,
+                                        bit_idx);
+        }
+
+        if (status) {
+                nvgpu_err(g, "Error in generating mask used to select CFC");
+                goto done;
+        }
 
         cmd.hdr.unit_id = PMU_UNIT_CLK;
         cmd.hdr.size =  (u32)sizeof(struct nv_pmu_clk_cmd) +
diff --git a/drivers/gpu/nvgpu/clk/clk.h b/drivers/gpu/nvgpu/clk/clk.h
index d2f615bc..a19e2e77 100644
--- a/drivers/gpu/nvgpu/clk/clk.h
+++ b/drivers/gpu/nvgpu/clk/clk.h
@@ -126,5 +126,5 @@ u32 clk_domain_get_f_points(
 );
 int clk_get_fll_clks(struct gk20a *g, struct set_fll_clk *fllclk);
 int clk_set_fll_clks(struct gk20a *g, struct set_fll_clk *fllclk);
-int clk_pmu_freq_controller_load(struct gk20a *g, bool bload);
+int clk_pmu_freq_controller_load(struct gk20a *g, bool bload, u8 bit_idx);
 #endif
diff --git a/drivers/gpu/nvgpu/clk/clk_arb.c b/drivers/gpu/nvgpu/clk/clk_arb.c
index ac37d03f..8c27b613 100644
--- a/drivers/gpu/nvgpu/clk/clk_arb.c
+++ b/drivers/gpu/nvgpu/clk/clk_arb.c
@@ -1178,7 +1178,8 @@ static void nvgpu_clk_arb_run_arbiter_cb(struct work_struct *work)
         nvgpu_mutex_acquire(&arb->pstate_lock);
         status = nvgpu_lpwr_disable_pg(g, false);
 
-        status = clk_pmu_freq_controller_load(g, false);
+        status = clk_pmu_freq_controller_load(g, false,
+                                        CTRL_CLK_CLK_FREQ_CONTROLLER_ID_ALL);
         if (status < 0) {
                 arb->status = status;
                 nvgpu_mutex_release(&arb->pstate_lock);
@@ -1209,7 +1210,8 @@ static void nvgpu_clk_arb_run_arbiter_cb(struct work_struct *work)
                 goto exit_arb;
         }
 
-        status = clk_pmu_freq_controller_load(g, true);
+        status = clk_pmu_freq_controller_load(g, true,
+                                         CTRL_CLK_CLK_FREQ_CONTROLLER_ID_ALL);
         if (status < 0) {
                 arb->status = status;
                 nvgpu_mutex_release(&arb->pstate_lock);
diff --git a/drivers/gpu/nvgpu/clk/clk_freq_controller.h b/drivers/gpu/nvgpu/clk/clk_freq_controller.h
index 55ad44ba..1b8a24c9 100644
--- a/drivers/gpu/nvgpu/clk/clk_freq_controller.h
+++ b/drivers/gpu/nvgpu/clk/clk_freq_controller.h
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+* Copyright (c) 2016-2017, NVIDIA CORPORATION.  All rights reserved.
 *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -23,6 +23,7 @@
 #ifndef _CLK_FREQ_CONTROLLER_H_
 #define _CLK_FREQ_CONTROLLER_H_
 
+#define CTRL_CLK_CLK_FREQ_CONTROLLER_ID_ALL  0xFF
 #define CTRL_CLK_CLK_FREQ_CONTROLLER_ID_SYS  0x00
 #define CTRL_CLK_CLK_FREQ_CONTROLLER_ID_LTC  0x01
 #define CTRL_CLK_CLK_FREQ_CONTROLLER_ID_XBAR 0x02