diff options
author | Vinod G <vinodg@nvidia.com> | 2018-06-26 21:09:57 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-07-14 18:36:53 -0400 |
commit | ac98827c9d81746020dce689f9eb8c4018a8c148 (patch) | |
tree | 142dea7d1109be3b12a4e94c738a01ab7b13ee89 /drivers/gpu/nvgpu/gp10b | |
parent | b97bcb3c689426a1b099e88ceef4d55584e2362b (diff) |
gpu: nvgpu: Add L2 register read-backs following writes
LTC register write is followed by a register read
and if data doesn't match code will report the error.
Renamed existing nvgpu_writel_check function as
nvgpu_writel_loop as it loops until the write get success.
nvgpu_writel_check function write and read back and
compare the data.
Bug 2039150
Change-Id: I0a49be36aad23936f2d58aa82872710827da1d32
Signed-off-by: Vinod G <vinodg@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1762344
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/gr_gp10b.c | 10 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/ltc_gp10b.c | 19 |
2 files changed, 15 insertions, 14 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c index 6249992a..424c8490 100644 --- a/drivers/gpu/nvgpu/gp10b/gr_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/gr_gp10b.c | |||
@@ -537,18 +537,18 @@ int gr_gp10b_add_zbc_color(struct gk20a *g, struct gr_gk20a *gr, | |||
537 | gr->zbc_col_tbl[index].format = color_val->format; | 537 | gr->zbc_col_tbl[index].format = color_val->format; |
538 | gr->zbc_col_tbl[index].ref_cnt++; | 538 | gr->zbc_col_tbl[index].ref_cnt++; |
539 | 539 | ||
540 | gk20a_writel_check(g, gr_gpcs_swdx_dss_zbc_color_r_r(index), | 540 | nvgpu_writel_loop(g, gr_gpcs_swdx_dss_zbc_color_r_r(index), |
541 | color_val->color_ds[0]); | 541 | color_val->color_ds[0]); |
542 | gk20a_writel_check(g, gr_gpcs_swdx_dss_zbc_color_g_r(index), | 542 | nvgpu_writel_loop(g, gr_gpcs_swdx_dss_zbc_color_g_r(index), |
543 | color_val->color_ds[1]); | 543 | color_val->color_ds[1]); |
544 | gk20a_writel_check(g, gr_gpcs_swdx_dss_zbc_color_b_r(index), | 544 | nvgpu_writel_loop(g, gr_gpcs_swdx_dss_zbc_color_b_r(index), |
545 | color_val->color_ds[2]); | 545 | color_val->color_ds[2]); |
546 | gk20a_writel_check(g, gr_gpcs_swdx_dss_zbc_color_a_r(index), | 546 | nvgpu_writel_loop(g, gr_gpcs_swdx_dss_zbc_color_a_r(index), |
547 | color_val->color_ds[3]); | 547 | color_val->color_ds[3]); |
548 | zbc_c = gk20a_readl(g, zbc_c_format_reg + (index & ~3)); | 548 | zbc_c = gk20a_readl(g, zbc_c_format_reg + (index & ~3)); |
549 | zbc_c &= ~(0x7f << ((index % 4) * 7)); | 549 | zbc_c &= ~(0x7f << ((index % 4) * 7)); |
550 | zbc_c |= color_val->format << ((index % 4) * 7); | 550 | zbc_c |= color_val->format << ((index % 4) * 7); |
551 | gk20a_writel_check(g, zbc_c_format_reg + (index & ~3), zbc_c); | 551 | nvgpu_writel_loop(g, zbc_c_format_reg + (index & ~3), zbc_c); |
552 | 552 | ||
553 | return 0; | 553 | return 0; |
554 | } | 554 | } |
diff --git a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c index b0938f75..1e5807d5 100644 --- a/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/ltc_gp10b.c | |||
@@ -156,14 +156,16 @@ int gp10b_ltc_cbc_ctrl(struct gk20a *g, enum gk20a_cbc_op op, | |||
156 | nvgpu_log_info(g, "clearing CBC lines %u..%u", min, iter_max); | 156 | nvgpu_log_info(g, "clearing CBC lines %u..%u", min, iter_max); |
157 | 157 | ||
158 | if (op == gk20a_cbc_op_clear) { | 158 | if (op == gk20a_cbc_op_clear) { |
159 | gk20a_writel( | 159 | nvgpu_writel_check( |
160 | g, ltc_ltcs_ltss_cbc_ctrl2_r(), | 160 | g, ltc_ltcs_ltss_cbc_ctrl2_r(), |
161 | ltc_ltcs_ltss_cbc_ctrl2_clear_lower_bound_f( | 161 | ltc_ltcs_ltss_cbc_ctrl2_clear_lower_bound_f( |
162 | min)); | 162 | min)); |
163 | gk20a_writel( | 163 | |
164 | nvgpu_writel_check( | ||
164 | g, ltc_ltcs_ltss_cbc_ctrl3_r(), | 165 | g, ltc_ltcs_ltss_cbc_ctrl3_r(), |
165 | ltc_ltcs_ltss_cbc_ctrl3_clear_upper_bound_f( | 166 | ltc_ltcs_ltss_cbc_ctrl3_clear_upper_bound_f( |
166 | iter_max)); | 167 | iter_max)); |
168 | |||
167 | hw_op = ltc_ltcs_ltss_cbc_ctrl1_clear_active_f(); | 169 | hw_op = ltc_ltcs_ltss_cbc_ctrl1_clear_active_f(); |
168 | full_cache_op = false; | 170 | full_cache_op = false; |
169 | } else if (op == gk20a_cbc_op_clean) { | 171 | } else if (op == gk20a_cbc_op_clean) { |
@@ -251,10 +253,9 @@ void gp10b_ltc_isr(struct gk20a *g) | |||
251 | ltc_ltc0_lts0_dstg_ecc_report_sec_count_v(ecc_stats_reg_val); | 253 | ltc_ltc0_lts0_dstg_ecc_report_sec_count_v(ecc_stats_reg_val); |
252 | ecc_stats_reg_val &= | 254 | ecc_stats_reg_val &= |
253 | ~(ltc_ltc0_lts0_dstg_ecc_report_sec_count_m()); | 255 | ~(ltc_ltc0_lts0_dstg_ecc_report_sec_count_m()); |
254 | gk20a_writel(g, | 256 | nvgpu_writel_check(g, |
255 | ltc_ltc0_lts0_dstg_ecc_report_r() + offset, | 257 | ltc_ltc0_lts0_dstg_ecc_report_r() + offset, |
256 | ecc_stats_reg_val); | 258 | ecc_stats_reg_val); |
257 | |||
258 | g->ops.mm.l2_flush(g, true); | 259 | g->ops.mm.l2_flush(g, true); |
259 | } | 260 | } |
260 | if (ltc_intr & | 261 | if (ltc_intr & |
@@ -271,16 +272,16 @@ void gp10b_ltc_isr(struct gk20a *g) | |||
271 | ltc_ltc0_lts0_dstg_ecc_report_ded_count_v(ecc_stats_reg_val); | 272 | ltc_ltc0_lts0_dstg_ecc_report_ded_count_v(ecc_stats_reg_val); |
272 | ecc_stats_reg_val &= | 273 | ecc_stats_reg_val &= |
273 | ~(ltc_ltc0_lts0_dstg_ecc_report_ded_count_m()); | 274 | ~(ltc_ltc0_lts0_dstg_ecc_report_ded_count_m()); |
274 | gk20a_writel(g, | 275 | nvgpu_writel_check(g, |
275 | ltc_ltc0_lts0_dstg_ecc_report_r() + offset, | 276 | ltc_ltc0_lts0_dstg_ecc_report_r() + offset, |
276 | ecc_stats_reg_val); | 277 | ecc_stats_reg_val); |
277 | } | 278 | } |
278 | 279 | ||
279 | nvgpu_err(g, "ltc%d, slice %d: %08x", | 280 | nvgpu_err(g, "ltc%d, slice %d: %08x", |
280 | ltc, slice, ltc_intr); | 281 | ltc, slice, ltc_intr); |
281 | gk20a_writel(g, ltc_ltc0_lts0_intr_r() + | 282 | nvgpu_writel_check(g, ltc_ltc0_lts0_intr_r() + |
282 | ltc_stride * ltc + lts_stride * slice, | 283 | ltc_stride * ltc + lts_stride * slice, |
283 | ltc_intr); | 284 | ltc_intr); |
284 | } | 285 | } |
285 | } | 286 | } |
286 | } | 287 | } |
@@ -314,5 +315,5 @@ void gp10b_ltc_set_enabled(struct gk20a *g, bool enabled) | |||
314 | /* bypass enabled (no caching) */ | 315 | /* bypass enabled (no caching) */ |
315 | reg |= reg_f; | 316 | reg |= reg_f; |
316 | 317 | ||
317 | gk20a_writel(g, ltc_ltcs_ltss_tstg_set_mgmt_2_r(), reg); | 318 | nvgpu_writel_check(g, ltc_ltcs_ltss_tstg_set_mgmt_2_r(), reg); |
318 | } | 319 | } |