From fbeca4a8414c03a1564d7a370964187be51a3e6c Mon Sep 17 00:00:00 2001 From: Mahantesh Kumbar Date: Wed, 28 Jun 2017 16:53:41 +0530 Subject: gpu: nvgpu: Falcon controller wait for halt - Added nvgpu_flcn_wait_for_halt() interface to wait for falcon halt, which block till falcon halt or timeout expire for selected falcon controller - Replaced falcon wait for halt code with method nvgpu_flcn_wait_for_halt() NVGPU JIRA-99 Change-Id: Ie1809dc29ff65bddc7ef2859a9ee9b4f0003b127 Signed-off-by: Mahantesh Kumbar Reviewed-on: https://git-master/r/1510201 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Terje Bergstrom GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu --- drivers/gpu/nvgpu/gm20b/acr_gm20b.c | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) (limited to 'drivers/gpu/nvgpu/gm20b/acr_gm20b.c') diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c index 08a58abb..e440e179 100644 --- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c @@ -1488,22 +1488,11 @@ err_done: */ static int pmu_wait_for_halt(struct gk20a *g, unsigned int timeout_ms) { + struct nvgpu_pmu *pmu = &g->pmu; u32 data = 0; int ret = -EBUSY; - struct nvgpu_timeout timeout; - - nvgpu_timeout_init(g, &timeout, timeout_ms, NVGPU_TIMER_CPU_TIMER); - - do { - data = gk20a_readl(g, pwr_falcon_cpuctl_r()); - if (data & pwr_falcon_cpuctl_halt_intr_m()) { - /* CPU is halted break */ - ret = 0; - break; - } - nvgpu_udelay(1); - } while (!nvgpu_timeout_expired(&timeout)); + ret = nvgpu_flcn_wait_for_halt(pmu->flcn, timeout_ms); if (ret) { nvgpu_err(g, "ACR boot timed out"); return ret; -- cgit v1.2.2