summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
diff options
context:
space:
mode:
authorSupriya <ssharatkumar@nvidia.com>2017-11-02 02:24:03 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2017-12-28 06:01:48 -0500
commitea1b69d3f5e419ab1e66340779fda143e8f4ebc3 (patch)
tree9c07bc5e9efab1f781bb28d07a89598469948f2a /drivers/gpu/nvgpu/gk20a/mc_gk20a.c
parent3a956a573d2ecb9a7520680ec6bcd6f626054488 (diff)
gpu: nvgpu: Fix crash on read fail of mc_boot_0_r
This CL handles - erroneous use of boot_0 function pointer before being assigned in __nvgpu_check_gpu_state - And proper handling of error returned from gk20a_readl in gk20a_mc_boot_0 With these fixes crash is not seen in case mc_boot_0 read returns 0 in gk20a_mc_boot_0 - And also this handles the recursion caused by mc.boot_0() calling nvgpu_readl and nvgpu_readl in turn calling mc.boot_0 in case of read failure Bug 2010966 Change-Id: Ia087811c67d88948b7fc5fff35e0fabc6ea91989 Signed-off-by: Supriya <ssharatkumar@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1616274 Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com> Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gk20a/mc_gk20a.c')
-rw-r--r--drivers/gpu/nvgpu/gk20a/mc_gk20a.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
index 9d9256bd..5027eaa4 100644
--- a/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/mc_gk20a.c
@@ -200,7 +200,10 @@ void gk20a_mc_reset(struct gk20a *g, u32 units)
200 200
201u32 gk20a_mc_boot_0(struct gk20a *g, u32 *arch, u32 *impl, u32 *rev) 201u32 gk20a_mc_boot_0(struct gk20a *g, u32 *arch, u32 *impl, u32 *rev)
202{ 202{
203 u32 val = gk20a_readl(g, mc_boot_0_r()); 203 u32 val = __nvgpu_readl(g, mc_boot_0_r());
204
205 if (val == 0xffffffff)
206 return val;
204 207
205 if (arch) 208 if (arch)
206 *arch = mc_boot_0_architecture_v(val) << 209 *arch = mc_boot_0_architecture_v(val) <<