nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-24 02:22:34 +03:00
Code Issues Packages Projects Releases Wiki Activity

gpu: nvgpu: reduce code complexity with gm20b_flush_ltc

Browse Source 
Added following helper functions to reduce code complexity
for gm20b_flush_ltc from to 11 to 3:
gm20b_ltc_wait_for_clean: code complexity 6
gm20b_ltc_wait_for_invalidate: code complexity 6

JIRA NVGPU-3976

Change-Id: Ifd6981ef9d3aa94c067e4d18500cc8aa09f80c5f
Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2192090
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
This commit is contained in:
Seshendra Gadagottu
2019-09-06 15:58:25 -07:00
committed by Alex Waterman
parent f14d9a36b7
commit 6766a7c09f
1 changed files with 49 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
drivers/gpu/nvgpu/hal/ltc/ltc_gm20b_fusa.c
View File

@@ -40,26 +40,13 @@
#include "ltc_gm20b.h"
/*
* Performs a full flush of the L2 cache.
*/
void gm20b_flush_ltc(struct gk20a *g)
static int gm20b_ltc_wait_for_clean(struct gk20a *g)
{
struct nvgpu_timeout timeout;
u32 ltc;
u32 ltc_stride = nvgpu_get_litter_value(g, GPU_LIT_LTC_STRIDE);
bool is_clean_pending_set = false;
bool is_invalidate_pending_set = false;
int err;
/* Clean... */
nvgpu_writel_check(g, ltc_ltcs_ltss_tstg_cmgmt1_r(),
ltc_ltcs_ltss_tstg_cmgmt1_clean_pending_f() |
ltc_ltcs_ltss_tstg_cmgmt1_max_cycles_between_cleans_3_f() |
ltc_ltcs_ltss_tstg_cmgmt1_clean_wait_for_fb_to_pull_true_f() |
ltc_ltcs_ltss_tstg_cmgmt1_clean_evict_last_class_true_f() |
ltc_ltcs_ltss_tstg_cmgmt1_clean_evict_normal_class_true_f() |
ltc_ltcs_ltss_tstg_cmgmt1_clean_evict_first_class_true_f());
int err = 0;
/* Wait on each LTC individually. */
for (ltc = 0; ltc < g->ltc->ltc_count; ltc++) {
@@ -85,7 +72,7 @@ void gm20b_flush_ltc(struct gk20a *g)
err = nvgpu_timeout_init(g, &timeout, 5, NVGPU_TIMER_CPU_TIMER);
if (err != 0) {
nvgpu_err(g, "nvgpu_timeout_init failed err=%d", err);
return;
return -ETIMEDOUT;
}
do {
@@ -101,16 +88,17 @@ void gm20b_flush_ltc(struct gk20a *g)
}
} while (is_clean_pending_set && (err == 0));
}
return err;
}
/* And invalidate. */
nvgpu_writel_check(g, ltc_ltcs_ltss_tstg_cmgmt0_r(),
ltc_ltcs_ltss_tstg_cmgmt0_invalidate_pending_f() |
ltc_ltcs_ltss_tstg_cmgmt0_max_cycles_between_invalidates_3_f() |
ltc_ltcs_ltss_tstg_cmgmt0_invalidate_evict_last_class_true_f() |
ltc_ltcs_ltss_tstg_cmgmt0_invalidate_evict_normal_class_true_f() |
ltc_ltcs_ltss_tstg_cmgmt0_invalidate_evict_first_class_true_f());
static int gm20b_ltc_wait_for_invalidate(struct gk20a *g)
{
u32 ltc;
u32 ltc_stride = nvgpu_get_litter_value(g, GPU_LIT_LTC_STRIDE);
struct nvgpu_timeout timeout;
bool is_invalidate_pending_set = false;
int err = 0;
/* Wait on each LTC individually. */
for (ltc = 0; ltc < g->ltc->ltc_count; ltc++) {
u32 op_pending;
@@ -118,7 +106,7 @@ void gm20b_flush_ltc(struct gk20a *g)
err = nvgpu_timeout_init(g, &timeout, 5, NVGPU_TIMER_CPU_TIMER);
if (err != 0) {
nvgpu_err(g, "nvgpu_timeout_init failed err=%d", err);
return;
return -ETIMEDOUT;
}
do {
@@ -134,6 +122,42 @@ void gm20b_flush_ltc(struct gk20a *g)
}
} while (is_invalidate_pending_set && (err == 0));
}
return err;
}
/*
* Performs a full flush of the L2 cache.
*/
void gm20b_flush_ltc(struct gk20a *g)
{
/* Clean... */
nvgpu_writel_check(g, ltc_ltcs_ltss_tstg_cmgmt1_r(),
ltc_ltcs_ltss_tstg_cmgmt1_clean_pending_f() |
ltc_ltcs_ltss_tstg_cmgmt1_max_cycles_between_cleans_3_f() |
ltc_ltcs_ltss_tstg_cmgmt1_clean_wait_for_fb_to_pull_true_f() |
ltc_ltcs_ltss_tstg_cmgmt1_clean_evict_last_class_true_f() |
ltc_ltcs_ltss_tstg_cmgmt1_clean_evict_normal_class_true_f() |
ltc_ltcs_ltss_tstg_cmgmt1_clean_evict_first_class_true_f());
/* Wait on each LTC individually. */
if (gm20b_ltc_wait_for_clean(g) != 0) {
nvgpu_err(g, "gm20b_ltc_wait_for_clean failed");
}
/* And invalidate. */
nvgpu_writel_check(g, ltc_ltcs_ltss_tstg_cmgmt0_r(),
ltc_ltcs_ltss_tstg_cmgmt0_invalidate_pending_f() |
ltc_ltcs_ltss_tstg_cmgmt0_max_cycles_between_invalidates_3_f() |
ltc_ltcs_ltss_tstg_cmgmt0_invalidate_evict_last_class_true_f() |
ltc_ltcs_ltss_tstg_cmgmt0_invalidate_evict_normal_class_true_f() |
ltc_ltcs_ltss_tstg_cmgmt0_invalidate_evict_first_class_true_f());
/* Wait on each LTC individually. */
if (gm20b_ltc_wait_for_invalidate(g) != 0) {
nvgpu_err(g, "gm20b_ltc_wait_for_invalidate failed");
}
}
/*