From 571c62d45e4a72a7243e37bf5c586452f9608fd3 Mon Sep 17 00:00:00 2001 From: Gagan Grover Date: Mon, 28 Mar 2016 17:39:39 +0530 Subject: gpu: nvgpu: WARN_ON if NULL params in pmu_cmd_post Don't need to BUG_ON. We can simply print kernel error message along with call stack and return. Bug 200182457 Change-Id: I06693f88372dfb5dd0dd2fae7630540594f302ba Signed-off-by: Gagan Grover Reviewed-on: http://git-master/r/1115992 (cherry picked from commit f5cc88880e147f90d2cf9980db4322ee5fd613a6) Reviewed-on: http://git-master/r/1117166 (cherry picked from commit ab0318b4a726886cd3e5ce97cf1a3bcaabab6171) Reviewed-on: http://git-master/r/1119038 (cherry picked from commit 9b977073d11d7a1caa72994f750293b0e5076cef) Reviewed-on: http://git-master/r/1127490 Reviewed-by: Automatic_Commit_Validation_User GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom --- drivers/gpu/nvgpu/gk20a/pmu_gk20a.c | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) (limited to 'drivers') diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c index 957537a9..6677798b 100644 --- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c +++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.c @@ -3884,9 +3884,20 @@ int gk20a_pmu_cmd_post(struct gk20a *g, struct pmu_cmd *cmd, gk20a_dbg_fn(""); - BUG_ON(!cmd); - BUG_ON(!seq_desc); - BUG_ON(!pmu->pmu_ready); + if ((!cmd) || (!seq_desc) || (!pmu->pmu_ready)) { + if (!cmd) + gk20a_warn(dev_from_gk20a(g), + "%s(): PMU cmd buffer is NULL", __func__); + else if (!seq_desc) + gk20a_warn(dev_from_gk20a(g), + "%s(): Seq descriptor is NULL", __func__); + else + gk20a_warn(dev_from_gk20a(g), + "%s(): PMU is not ready", __func__); + + WARN_ON(1); + return -EINVAL; + } if (!pmu_validate_cmd(pmu, cmd, msg, payload, queue_id)) return -EINVAL; -- cgit v1.2.2