From 690d560e65af8096bc391064631c74a3dd14fa89 Mon Sep 17 00:00:00 2001 From: Seema Khowala Date: Fri, 30 Jun 2017 11:45:16 -0700 Subject: gpu: nvgpu: gv11b: Use sm dbgr bpt and warp mask 0/1 Instead of assuming mask_0 and mask_1 as consecutive registers, use mask_1 and mask_0 registers for reading/writing sm dbgr warp and bpt mask registers JIRA GPUT19X-75 Change-Id: Ib6843d13828d899d4bd3f12bdf6701325ea760fd Signed-off-by: Seema Khowala Reviewed-on: https://git-master/r/1511736 GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu --- drivers/gpu/nvgpu/gv11b/gr_gv11b.c | 25 ++++++++++++++----------- 1 file changed, 14 insertions(+), 11 deletions(-) (limited to 'drivers/gpu/nvgpu/gv11b') diff --git a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c index 5b1b41ce..6ac0c44f 100644 --- a/drivers/gpu/nvgpu/gv11b/gr_gv11b.c +++ b/drivers/gpu/nvgpu/gv11b/gr_gv11b.c @@ -1389,8 +1389,11 @@ static int gr_gv11b_dump_gr_sm_regs(struct gk20a *g, "NV_PGRAPH_PRI_GPCS_TPCS_SMS_DBGR_STATUS0: 0x%x\n", gk20a_readl(g, gr_gpcs_tpcs_sms_dbgr_status0_r())); gk20a_debug_output(o, - "NV_PGRAPH_PRI_GPCS_TPCS_SMS_DBGR_BPT_PAUSE_MASK: 0x%x\n", - gk20a_readl(g, gr_gpcs_tpcs_sms_dbgr_bpt_pause_mask_r())); + "NV_PGRAPH_PRI_GPCS_TPCS_SMS_DBGR_BPT_PAUSE_MASK_0: 0x%x\n", + gk20a_readl(g, gr_gpcs_tpcs_sms_dbgr_bpt_pause_mask_0_r())); + gk20a_debug_output(o, + "NV_PGRAPH_PRI_GPCS_TPCS_SMS_DBGR_BPT_PAUSE_MASK_1: 0x%x\n", + gk20a_readl(g, gr_gpcs_tpcs_sms_dbgr_bpt_pause_mask_1_r())); sm_per_tpc = nvgpu_get_litter_value(g, GPU_LIT_NUM_SM_PER_TPC); for (gpc = 0; gpc < g->gr.gpc_count; gpc++) { @@ -2483,26 +2486,26 @@ static void gv11b_gr_bpt_reg_info(struct gk20a *g, struct warpstate *w_state) /* 64 bit read */ warps_valid = (u64)gk20a_readl(g, - gr_gpc0_tpc0_sm0_warp_valid_mask_r() + - offset + 4) << 32; + gr_gpc0_tpc0_sm0_warp_valid_mask_1_r() + + offset) << 32; warps_valid |= gk20a_readl(g, - gr_gpc0_tpc0_sm0_warp_valid_mask_r() + + gr_gpc0_tpc0_sm0_warp_valid_mask_0_r() + offset); /* 64 bit read */ warps_paused = (u64)gk20a_readl(g, - gr_gpc0_tpc0_sm0_dbgr_bpt_pause_mask_r() + - offset + 4) << 32; + gr_gpc0_tpc0_sm0_dbgr_bpt_pause_mask_1_r() + + offset) << 32; warps_paused |= gk20a_readl(g, - gr_gpc0_tpc0_sm0_dbgr_bpt_pause_mask_r() + + gr_gpc0_tpc0_sm0_dbgr_bpt_pause_mask_0_r() + offset); /* 64 bit read */ warps_trapped = (u64)gk20a_readl(g, - gr_gpc0_tpc0_sm0_dbgr_bpt_trap_mask_r() + - offset + 4) << 32; + gr_gpc0_tpc0_sm0_dbgr_bpt_trap_mask_1_r() + + offset) << 32; warps_trapped |= gk20a_readl(g, - gr_gpc0_tpc0_sm0_dbgr_bpt_trap_mask_r() + + gr_gpc0_tpc0_sm0_dbgr_bpt_trap_mask_0_r() + offset); w_state[sm_id].valid_warps[0] = warps_valid; -- cgit v1.2.2