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/gk20a/flcn_gk20a.c | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) (limited to 'drivers/gpu/nvgpu/gk20a/flcn_gk20a.c') diff --git a/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c b/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c index 328f5bf7..b52652e2 100644 --- a/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/flcn_gk20a.c @@ -38,6 +38,26 @@ static int gk20a_flcn_reset(struct nvgpu_falcon *flcn) return status; } +static bool gk20a_flcn_clear_halt_interrupt_status(struct nvgpu_falcon *flcn) +{ + struct gk20a *g = flcn->g; + u32 base_addr = flcn->flcn_base; + u32 data = 0; + bool status = false; + + gk20a_writel(g, base_addr + falcon_falcon_irqsclr_r(), + gk20a_readl(g, base_addr + falcon_falcon_irqsclr_r()) | + (0x10)); + data = gk20a_readl(g, (base_addr + falcon_falcon_irqstat_r())); + + if ((data & falcon_falcon_irqstat_halt_true_f()) != + falcon_falcon_irqstat_halt_true_f()) + /*halt irq is clear*/ + status = true; + + return status; +} + static void gk20a_flcn_set_irq(struct nvgpu_falcon *flcn, bool enable) { struct gk20a *g = flcn->g; @@ -275,6 +295,8 @@ void gk20a_falcon_ops(struct nvgpu_falcon *flcn) flcn_ops->reset = gk20a_flcn_reset; flcn_ops->set_irq = gk20a_flcn_set_irq; + flcn_ops->clear_halt_interrupt_status = + gk20a_flcn_clear_halt_interrupt_status; flcn_ops->is_falcon_cpu_halted = gk20a_is_falcon_cpu_halted; flcn_ops->is_falcon_idle = gk20a_is_falcon_idle; flcn_ops->is_falcon_scrubbing_done = gk20a_is_falcon_scrubbing_done; -- cgit v1.2.2