From 850f2ad8ada4f4c2c753644f387d75e6d75ac28b Mon Sep 17 00:00:00 2001 From: absalam Date: Thu, 20 Sep 2018 12:21:33 +0530 Subject: gpu: nvgpu:Add sysfs node for GV100 clocks Creates sysfs nodes to read clk freq on GV100 Following sysfs nodes are created: gpcclk,xbarclk,sysclk Uses default clock source and counters for measurement Bug 200446261 Change-Id: I6903ba77fbe34e3f486f4b663e70eab4e7c5d662 Signed-off-by: absalam Reviewed-on: https://git-master.nvidia.com/r/1828030 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gv100/clk_gv100.c | 193 ++++++++++++++++++++++++++++++++++++ drivers/gpu/nvgpu/gv100/clk_gv100.h | 63 ++++++++++++ drivers/gpu/nvgpu/gv100/hal_gv100.c | 13 ++- 3 files changed, 262 insertions(+), 7 deletions(-) create mode 100644 drivers/gpu/nvgpu/gv100/clk_gv100.c create mode 100644 drivers/gpu/nvgpu/gv100/clk_gv100.h (limited to 'drivers/gpu/nvgpu/gv100') diff --git a/drivers/gpu/nvgpu/gv100/clk_gv100.c b/drivers/gpu/nvgpu/gv100/clk_gv100.c new file mode 100644 index 00000000..7855aa41 --- /dev/null +++ b/drivers/gpu/nvgpu/gv100/clk_gv100.c @@ -0,0 +1,193 @@ +/* + * GV100 Clocks + * + * Copyright (c) 2016-2018, 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"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ + +#ifdef CONFIG_DEBUG_FS +#include +#include "os/linux/os_linux.h" +#endif + +#include +#include +#include +#include +#include + +#include "gk20a/gk20a.h" + +#include "clk_gv100.h" + +#include + + +u32 gv100_crystal_clk_hz(struct gk20a *g) +{ + return (XTAL4X_KHZ * 1000); +} + +unsigned long gv100_clk_measure_freq(struct gk20a *g, u32 api_domain) +{ + struct clk_gk20a *clk = &g->clk; + u32 freq_khz; + u32 i; + struct namemap_cfg *c = NULL; + + for (i = 0; i < clk->namemap_num; i++) { + if (api_domain == clk->namemap_xlat_table[i]) { + c = &clk->clk_namemap[i]; + break; + } + } + + if (c == NULL) { + return 0; + } + if (c->is_counter != 0U) { + freq_khz = c->scale * gv100_get_rate_cntr(g, c); + } else { + freq_khz = 0U; + /* TODO: PLL read */ + } + + /* Convert to HZ */ + return freq_khz * 1000UL; +} + +int gv100_init_clk_support(struct gk20a *g) +{ + struct clk_gk20a *clk = &g->clk; + int err = 0; + + nvgpu_log_fn(g, " "); + + err = nvgpu_mutex_init(&clk->clk_mutex); + if (err != 0) { + return err; + } + + clk->clk_namemap = (struct namemap_cfg *) + nvgpu_kzalloc(g, sizeof(struct namemap_cfg) * NUM_NAMEMAPS); + + if (clk->clk_namemap == NULL) { + nvgpu_mutex_destroy(&clk->clk_mutex); + return -ENOMEM; + } + + clk->namemap_xlat_table = nvgpu_kcalloc(g, NUM_NAMEMAPS, sizeof(u32)); + + if (clk->namemap_xlat_table == NULL) { + nvgpu_kfree(g, clk->clk_namemap); + nvgpu_mutex_destroy(&clk->clk_mutex); + return -ENOMEM; + } + + clk->clk_namemap[0] = (struct namemap_cfg) { + .namemap = CLK_NAMEMAP_INDEX_GPCCLK, + .is_enable = 1, + .is_counter = 1, + .g = g, + .cntr = { + .reg_ctrl_addr = trim_gpc_bcast_fr_clk_cntr_ncgpcclk_cfg_r(), + .reg_ctrl_idx = trim_gpc_bcast_fr_clk_cntr_ncgpcclk_cfg_source_gpcclk_f(), + .reg_cntr_addr[0] = trim_gpc_bcast_fr_clk_cntr_ncgpcclk_cnt0_r(), + .reg_cntr_addr[1] = trim_gpc_bcast_fr_clk_cntr_ncgpcclk_cnt1_r() + }, + .name = "gpcclk", + .scale = 1 + }; + clk->namemap_xlat_table[0] = CTRL_CLK_DOMAIN_GPCCLK; + + clk->clk_namemap[1] = (struct namemap_cfg) { + .namemap = CLK_NAMEMAP_INDEX_SYSCLK, + .is_enable = 1, + .is_counter = 1, + .g = g, + .cntr = { + .reg_ctrl_addr = trim_sys_fr_clk_cntr_sysclk_cfg_r(), + .reg_ctrl_idx = trim_sys_fr_clk_cntr_sysclk_cfg_source_sysclk_f(), + .reg_cntr_addr[0] = trim_sys_fr_clk_cntr_sysclk_cntr0_r(), + .reg_cntr_addr[1] = trim_sys_fr_clk_cntr_sysclk_cntr1_r() + }, + .name = "sysclk", + .scale = 1 + }; + clk->namemap_xlat_table[1] = CTRL_CLK_DOMAIN_SYSCLK; + + clk->clk_namemap[2] = (struct namemap_cfg) { + .namemap = CLK_NAMEMAP_INDEX_XBARCLK, + .is_enable = 1, + .is_counter = 1, + .g = g, + .cntr = { + .reg_ctrl_addr = trim_sys_nafll_fr_clk_cntr_xbarclk_cfg_r(), + .reg_ctrl_idx = trim_sys_nafll_fr_clk_cntr_xbarclk_cfg_source_xbarclk_f(), + .reg_cntr_addr[0] = trim_sys_nafll_fr_clk_cntr_xbarclk_cntr0_r(), + .reg_cntr_addr[1] = trim_sys_nafll_fr_clk_cntr_xbarclk_cntr1_r() + }, + .name = "xbarclk", + .scale = 1 + }; + clk->namemap_xlat_table[2] = CTRL_CLK_DOMAIN_XBARCLK; + + clk->namemap_num = NUM_NAMEMAPS; + + clk->g = g; + + return err; +} + +u32 gv100_get_rate_cntr(struct gk20a *g, struct namemap_cfg *c) { + u32 cntr = 0; + u64 cntr_start = 0; + u64 cntr_stop = 0; + + struct clk_gk20a *clk = &g->clk; + + if ((c == NULL) || (c->cntr.reg_ctrl_addr == 0U) || + (c->cntr.reg_cntr_addr[0] == 0U) || + (c->cntr.reg_cntr_addr[1]) == 0U) { + return 0; + } + + nvgpu_mutex_acquire(&clk->clk_mutex); + + /* Read the counter values */ + /* Counter is 36bits , 32 bits on addr[0] and 4 lsb on addr[1] others zero*/ + cntr_start = (u64)gk20a_readl(g, c->cntr.reg_cntr_addr[0]); + cntr_start += ((u64)gk20a_readl(g, c->cntr.reg_cntr_addr[1]) << 32); + nvgpu_udelay(XTAL_CNTR_DELAY); + cntr_stop = (u64) gk20a_readl(g, c->cntr.reg_cntr_addr[0]); + cntr_stop += ((u64)gk20a_readl(g, c->cntr.reg_cntr_addr[1]) << 32); + /*Calculate the difference and convert to KHz*/ + cntr = (u32)((cntr_stop - cntr_start) / 10ULL); + nvgpu_mutex_release(&clk->clk_mutex); + + return cntr; + +} + +int gv100_suspend_clk_support(struct gk20a *g) +{ + nvgpu_mutex_destroy(&g->clk.clk_mutex); + return 0; +} diff --git a/drivers/gpu/nvgpu/gv100/clk_gv100.h b/drivers/gpu/nvgpu/gv100/clk_gv100.h new file mode 100644 index 00000000..d3356a7f --- /dev/null +++ b/drivers/gpu/nvgpu/gv100/clk_gv100.h @@ -0,0 +1,63 @@ +/* + * Copyright (c) 2016-2018, 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"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + */ +#ifndef CLK_GV100_H +#define CLK_GV100_H + +#include +#include "gk20a/gk20a.h" + +#define CLK_NAMEMAP_INDEX_GPCCLK 0x00 +#define CLK_NAMEMAP_INDEX_XBARCLK 0x02 +#define CLK_NAMEMAP_INDEX_SYSCLK 0x07 /* SYSPLL */ +#define CLK_NAMEMAP_INDEX_DRAMCLK 0x20 /* DRAMPLL */ + +#define CLK_DEFAULT_CNTRL_SETTLE_RETRIES 10 +#define CLK_DEFAULT_CNTRL_SETTLE_USECS 5 +#define CLK_MAX_CNTRL_REGISTERS 2 + +#define XTAL_CNTR_CLKS 27000 /* 1000usec at 27KHz XTAL */ +#define XTAL_CNTR_DELAY 10000 /* we need acuracy up to the 10ms */ +#define XTAL_SCALE_TO_KHZ 1 +#define NUM_NAMEMAPS (3U) +#define XTAL4X_KHZ 108000 + +u32 gv100_get_rate_cntr(struct gk20a *g, struct namemap_cfg *c); +struct namemap_cfg { + u32 namemap; + u32 is_enable; /* Namemap enabled */ + u32 is_counter; /* Using cntr */ + struct gk20a *g; + struct { + u32 reg_ctrl_addr; + u32 reg_ctrl_idx; + u32 reg_cntr_addr[CLK_MAX_CNTRL_REGISTERS]; + } cntr; + u32 scale; + char name[24]; +}; + +int gv100_init_clk_support(struct gk20a *g); +u32 gv100_crystal_clk_hz(struct gk20a *g); +unsigned long gv100_clk_measure_freq(struct gk20a *g, u32 api_domain); +int gv100_suspend_clk_support(struct gk20a *g); + +#endif /* CLK_GV100_H */ diff --git a/drivers/gpu/nvgpu/gv100/hal_gv100.c b/drivers/gpu/nvgpu/gv100/hal_gv100.c index 041422e0..7cd466c3 100644 --- a/drivers/gpu/nvgpu/gv100/hal_gv100.c +++ b/drivers/gpu/nvgpu/gv100/hal_gv100.c @@ -66,13 +66,11 @@ #include "gm20b/pmu_gm20b.h" #include "gm20b/acr_gm20b.h" -#include "gp106/clk_gp106.h" #include "gp106/clk_arb_gp106.h" #include "gp106/pmu_gp106.h" #include "gp106/acr_gp106.h" #include "gp106/sec2_gp106.h" #include "gp106/bios_gp106.h" -#include "gp106/clk_gp106.h" #include "gp106/flcn_gp106.h" #include "gp10b/gr_gp10b.h" @@ -107,6 +105,7 @@ #include "gv100/nvlink_gv100.h" #include "gv100/regops_gv100.h" #include "gv100/perf_gv100.h" +#include "gv100/clk_gv100.h" #include #include @@ -768,11 +767,11 @@ static const struct gpu_ops gv100_ops = { .secured_pmu_start = gm20b_secured_pmu_start, }, .clk = { - .init_clk_support = gp106_init_clk_support, - .get_crystal_clk_hz = gp106_crystal_clk_hz, - .get_rate_cntr = gp106_get_rate_cntr, - .measure_freq = gp106_clk_measure_freq, - .suspend_clk_support = gp106_suspend_clk_support, + .init_clk_support = gv100_init_clk_support, + .get_crystal_clk_hz = gv100_crystal_clk_hz, + .get_rate_cntr = gv100_get_rate_cntr, + .measure_freq = gv100_clk_measure_freq, + .suspend_clk_support = gv100_suspend_clk_support, .perf_pmu_vfe_load = gv100_perf_pmu_vfe_load, }, .clk_arb = { -- cgit v1.2.2