nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 09:57:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: fix MISRA 10.6 in hal ltc driver

Browse Source 
Fixes issues related to MISRA 10.6 in hal ltc driver.

JIRA NVGPU-3422

Change-Id: Ic2ebd879d35619a92d7354490cff605ea22c43b0
Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2119972
GVS: Gerrit_Virtual_Submit
Reviewed-by: Philip Elcan <pelcan@nvidia.com>
Reviewed-by: Vinod Gopalakrishnakurup <vinodg@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Seshendra Gadagottu
2019-05-15 20:53:17 -07:00
committed by mobile promotions
parent 71ec37ac46
commit 80adcd99e8
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/gpu/nvgpu/hal/ltc/ltc_gm20b.c
View File

@@ -42,6 +42,7 @@
void gm20b_ltc_init_fs_state(struct gk20a *g) void gm20b_ltc_init_fs_state(struct gk20a *g)
{ {
u32 reg; u32 reg;
u32 line_size = 512U;
nvgpu_log_info(g, "initialize gm20b l2"); nvgpu_log_info(g, "initialize gm20b l2");
@@ -53,7 +54,7 @@ void gm20b_ltc_init_fs_state(struct gk20a *g)
reg = gk20a_readl(g, ltc_ltcs_ltss_cbc_param_r()); reg = gk20a_readl(g, ltc_ltcs_ltss_cbc_param_r());
g->ltc->slices_per_ltc = ltc_ltcs_ltss_cbc_param_slices_per_ltc_v(reg); g->ltc->slices_per_ltc = ltc_ltcs_ltss_cbc_param_slices_per_ltc_v(reg);
g->ltc->cacheline_size = g->ltc->cacheline_size =
U32(512) << ltc_ltcs_ltss_cbc_param_cache_line_size_v(reg); line_size << ltc_ltcs_ltss_cbc_param_cache_line_size_v(reg);
gk20a_writel(g, ltc_ltcs_ltss_cbc_num_active_ltcs_r(), gk20a_writel(g, ltc_ltcs_ltss_cbc_num_active_ltcs_r(),
g->ltc->ltc_count); g->ltc->ltc_count);
@@ -116,8 +117,8 @@ void gm20b_flush_ltc(struct gk20a *g)
} }
do { do {
int cmgmt1 = ltc_ltc0_ltss_tstg_cmgmt1_r() + u32 cmgmt1 = (u32)(ltc_ltc0_ltss_tstg_cmgmt1_r() +
ltc * ltc_stride; (ltc * ltc_stride));
op_pending = gk20a_readl(g, cmgmt1); op_pending = gk20a_readl(g, cmgmt1);
is_clean_pending_set = (op_pending & is_clean_pending_set = (op_pending &
ltc_ltc0_ltss_tstg_cmgmt1_clean_pending_f()) != 0U; ltc_ltc0_ltss_tstg_cmgmt1_clean_pending_f()) != 0U;
@@ -148,8 +149,8 @@ void gm20b_flush_ltc(struct gk20a *g)
} }
do { do {
int cmgmt0 = ltc_ltc0_ltss_tstg_cmgmt0_r() + u32 cmgmt0 = (u32)(ltc_ltc0_ltss_tstg_cmgmt0_r() +
ltc * ltc_stride; (ltc * ltc_stride));
op_pending = gk20a_readl(g, cmgmt0); op_pending = gk20a_readl(g, cmgmt0);
is_invalidate_pending_set = (op_pending & is_invalidate_pending_set = (op_pending &
ltc_ltc0_ltss_tstg_cmgmt0_invalidate_pending_f()) != 0U; ltc_ltc0_ltss_tstg_cmgmt0_invalidate_pending_f()) != 0U;

3
drivers/gpu/nvgpu/hal/ltc/ltc_gv11b.c
View File

@@ -51,6 +51,7 @@ void gv11b_ltc_set_zbc_stencil_entry(struct gk20a *g,
void gv11b_ltc_init_fs_state(struct gk20a *g) void gv11b_ltc_init_fs_state(struct gk20a *g)
{ {
u32 reg; u32 reg;
u32 line_size = 512U;
nvgpu_log_info(g, "initialize gv11b l2"); nvgpu_log_info(g, "initialize gv11b l2");
@@ -62,7 +63,7 @@ void gv11b_ltc_init_fs_state(struct gk20a *g)
reg = gk20a_readl(g, ltc_ltcs_ltss_cbc_param_r()); reg = gk20a_readl(g, ltc_ltcs_ltss_cbc_param_r());
g->ltc->slices_per_ltc = ltc_ltcs_ltss_cbc_param_slices_per_ltc_v(reg);; g->ltc->slices_per_ltc = ltc_ltcs_ltss_cbc_param_slices_per_ltc_v(reg);;
g->ltc->cacheline_size = g->ltc->cacheline_size =
U32(512) << ltc_ltcs_ltss_cbc_param_cache_line_size_v(reg); line_size << ltc_ltcs_ltss_cbc_param_cache_line_size_v(reg);
g->ops.ltc.intr.configure(g); g->ops.ltc.intr.configure(g);

3
drivers/gpu/nvgpu/hal/ltc/ltc_tu104.c
View File

@@ -38,6 +38,7 @@
void ltc_tu104_init_fs_state(struct gk20a *g) void ltc_tu104_init_fs_state(struct gk20a *g)
{ {
u32 reg; u32 reg;
u32 line_size = 512U;
gv11b_ltc_init_fs_state(g); gv11b_ltc_init_fs_state(g);
@@ -45,7 +46,7 @@ void ltc_tu104_init_fs_state(struct gk20a *g)
g->ltc->slices_per_ltc = g->ltc->slices_per_ltc =
ltc_ltcs_ltss_cbc_param2_slices_per_ltc_v(reg); ltc_ltcs_ltss_cbc_param2_slices_per_ltc_v(reg);
g->ltc->cacheline_size = g->ltc->cacheline_size =
U32(512) << ltc_ltcs_ltss_cbc_param2_cache_line_size_v(reg); line_size << ltc_ltcs_ltss_cbc_param2_cache_line_size_v(reg);
/* disable PLC compression */ /* disable PLC compression */
reg = nvgpu_readl(g, ltc_ltcs_ltss_tstg_set_mgmt_1_r()); reg = nvgpu_readl(g, ltc_ltcs_ltss_tstg_set_mgmt_1_r());