From e462c6a7ad0ce05775bc15c58963df4a1a5606e8 Mon Sep 17 00:00:00 2001 From: Supriya Date: Sat, 6 Dec 2014 15:28:12 +0530 Subject: nvgpu: gm20b: Ensure ACR boot failure is returned Bug 200059877 ACR boot failure is returned in falcon mailbox 0 return EAGAIN in case of ACR boot failure Change-Id: I683984402137bb42dd69f2d667191d5986144c17 Signed-off-by: Supriya Reviewed-on: http://git-master/r/660529 (cherry picked from commit 404c98b704bec5c707bd0c9b03364c8c6d546cbf) Reviewed-on: http://git-master/r/662476 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Mitch Luban GVS: Gerrit_Virtual_Submit Reviewed-by: Vijayakumar Subbu Reviewed-by: Terje Bergstrom --- drivers/gpu/nvgpu/gm20b/acr_gm20b.c | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c index 2fb3bf9d..677f4eb4 100644 --- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c @@ -1338,6 +1338,11 @@ int pmu_wait_for_halt(struct gk20a *g, unsigned int timeout) } if (timeout == 0) return -EBUSY; + data = gk20a_readl(g, pwr_falcon_mailbox0_r()); + if (data) { + gk20a_err(dev_from_gk20a(g), "ACR boot failed, err %x", data); + return -EAGAIN; + } return 0; } -- cgit v1.2.2