gpu: nvgpu: Add GPU voltage debug access

- Added GPU voltage debug print to the initial locking of GPCPLL under
  bypass (available only when GPCPLL is in NA mode).
- Added /sys/kernel/debug/gpu.0/voltage debugfs node to read voltage
  through GPCPLL (available only when GPCPLL is in NA mode).

Change-Id: I6643ad4d1b228ec4cbc4ff5e8716cce3ef9dccfc
Signed-off-by: Alex Frid <afrid@nvidia.com>
Reviewed-on: http://git-master/r/731572
Reviewed-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Tested-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-by: Yu-Huan Hsu <yhsu@nvidia.com>

diff --git a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c
index 9f1068eebbcdbd213fe85a40fb7a0ad3ab89fa3c..d0a39bc6042a95ac8f2e397c5209d5d61aa1a6b1 100644 (file)
--- a/drivers/gpu/nvgpu/gm20b/clk_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/clk_gm20b.c
@@ -36,6 +36,7 @@
 
 #define DFS_DET_RANGE  6       /* -2^6 ... 2^6-1 */
 #define SDM_DIN_RANGE  12      /* -2^12 ... 2^12-1 */
+#define DFS_TESTOUT_DET        BIT(0)
 #define DFS_EXT_CAL_EN BIT(9)
 #define DFS_EXT_STROBE BIT(16)
 
@@ -377,7 +378,8 @@ static void clk_set_dfs_ext_cal(struct gk20a *g, u32 dfs_det_cal)
        udelay(1);
        if (~trim_sys_gpcpll_dvfs1_dfs_ctrl_v(data) & DFS_EXT_CAL_EN) {
                data = set_field(data, trim_sys_gpcpll_dvfs1_dfs_ctrl_m(),
-                       trim_sys_gpcpll_dvfs1_dfs_ctrl_f(DFS_EXT_CAL_EN));
+                                trim_sys_gpcpll_dvfs1_dfs_ctrl_f(
+                                        DFS_EXT_CAL_EN | DFS_TESTOUT_DET));
                gk20a_writel(g, trim_sys_gpcpll_dvfs1_r(), data);
        }
 }
@@ -709,6 +711,12 @@ static int clk_lock_gpc_pll_under_bypass(struct gk20a *g, struct pll *gpll)
        if (gpll->mode == GPC_PLL_MODE_DVFS) {
                gk20a_readl(g, trim_sys_gpcpll_cfg_r());
                udelay(g->clk.na_pll_delay);
+               gk20a_dbg_clk("NA config_pll under bypass: %u (%u) kHz %d mV",
+                             gpll->freq, gpll->freq / 2,
+                             (trim_sys_gpcpll_cfg3_dfs_testout_v(
+                                     gk20a_readl(g, trim_sys_gpcpll_cfg3_r()))
+                              * gpc_pll_params.uvdet_slope
+                              + gpc_pll_params.uvdet_offs) / 1000);
                goto pll_locked;
        }
 
@@ -1598,6 +1606,34 @@ static int monitor_get(void *data, u64 *val)
 }
 DEFINE_SIMPLE_ATTRIBUTE(monitor_fops, monitor_get, NULL, "%llu\n");
 
+static int voltage_get(void *data, u64 *val)
+{
+       struct gk20a *g = (struct gk20a *)data;
+       struct clk_gk20a *clk = &g->clk;
+       u32 det_out;
+       int err;
+
+       if (clk->gpc_pll.mode != GPC_PLL_MODE_DVFS)
+               return -ENOSYS;
+
+       err = gk20a_busy(g->dev);
+       if (err)
+               return err;
+
+       mutex_lock(&g->clk.clk_mutex);
+
+       det_out = gk20a_readl(g, trim_sys_gpcpll_cfg3_r());
+       det_out = trim_sys_gpcpll_cfg3_dfs_testout_v(det_out);
+       *val = (det_out * gpc_pll_params.uvdet_slope +
+               gpc_pll_params.uvdet_offs) / 1000;
+
+       mutex_unlock(&g->clk.clk_mutex);
+
+       gk20a_idle(g->dev);
+       return 0;
+}
+DEFINE_SIMPLE_ATTRIBUTE(voltage_fops, voltage_get, NULL, "%llu\n");
+
 static int pll_param_show(struct seq_file *s, void *data)
 {
        seq_printf(s, "ADC offs = %d uV, ADC slope = %d uV, VCO ctrl = 0x%x\n",
@@ -1643,6 +1679,11 @@ static int clk_gm20b_debugfs_init(struct gk20a *g)
        if (!d)
                goto err_out;
 
+       d = debugfs_create_file(
+               "voltage", S_IRUGO, platform->debugfs, g, &voltage_fops);
+       if (!d)
+               goto err_out;
+
        d = debugfs_create_file(
                "pll_param", S_IRUGO, platform->debugfs, g, &pll_param_fops);
        if (!d)