From 2cf964d175abc0f3eae9ed0e01e6eeed5cd6b4da Mon Sep 17 00:00:00 2001 From: Mahantesh Kumbar Date: Fri, 30 Jun 2017 11:42:17 +0530 Subject: gpu: nvgpu: Falcon controller halt interrupt status clear - Added nvgpu_flcn_clear_halt_intr_status() to Wait for halt interrupt status clear by clear_halt_interrupt_status() HAL within timeout - Added gk20a_flcn_clear_halt_interrupt_status() to clear falcon controller halt interrupt status - Replaced flacon halt interrupt clear with nvgpu_flcn_clear_halt_intr_status() method NVGPU JIRA-99 Change-Id: I762a3c01cd1d02028eb6aaa9898a50be94376619 Signed-off-by: Mahantesh Kumbar Reviewed-on: https://git-master/r/1511333 Reviewed-by: Terje Bergstrom GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu --- drivers/gpu/nvgpu/gm206/bios_gm206.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'drivers/gpu/nvgpu/gm206/bios_gm206.c') diff --git a/drivers/gpu/nvgpu/gm206/bios_gm206.c b/drivers/gpu/nvgpu/gm206/bios_gm206.c index 7aec21e7..be089f2f 100644 --- a/drivers/gpu/nvgpu/gm206/bios_gm206.c +++ b/drivers/gpu/nvgpu/gm206/bios_gm206.c @@ -154,9 +154,8 @@ static int gm206_bios_devinit(struct gk20a *g) if (nvgpu_timeout_peek_expired(&timeout)) err = -ETIMEDOUT; - gk20a_writel(g, pwr_falcon_irqsclr_r(), - pwr_falcon_irqstat_halt_true_f()); - gk20a_readl(g, pwr_falcon_irqsclr_r()); + nvgpu_flcn_clear_halt_intr_status(g->pmu.flcn, + gk20a_get_gr_idle_timeout(g)); out: gk20a_dbg_fn("done"); @@ -200,9 +199,8 @@ static int gm206_bios_preos(struct gk20a *g) goto out; } - gk20a_writel(g, pwr_falcon_irqsclr_r(), - pwr_falcon_irqstat_halt_true_f()); - gk20a_readl(g, pwr_falcon_irqsclr_r()); + nvgpu_flcn_clear_halt_intr_status(g->pmu.flcn, + gk20a_get_gr_idle_timeout(g)); out: gk20a_dbg_fn("done"); -- cgit v1.2.2