gpu: nvgpu: do not abort probe if secure page alloc fails

Do not abort GPU probe if secure page alloc fails.
We can just note that this allocation failed (using bool
secure_alloc_ready) and prevent further secure memory
allocation if this flag is not set.

Bug 1525465

Change-Id: Ie4eb6393951690174013d2de3db507876d7b657f
Signed-off-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-on: http://git-master/r/427730
GVS: Gerrit_Virtual_Submit
Reviewed-by: Shridhar Rasal <srasal@nvidia.com>
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

1 files changed, 6 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.c b/drivers/gpu/nvgpu/gk20a/gk20a.c
index 4c6566a6..790b366c 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.c
@@ -1351,6 +1351,9 @@ int gk20a_secure_page_alloc(struct platform_device *pdev)
                 tegra_periph_reset_deassert(platform->clk[0]);
         }
 
+        if (!err)
+                platform->secure_alloc_ready = true;
+
         return err;
 }
 
@@ -1453,10 +1456,9 @@ static int gk20a_probe(struct platform_device *dev)
         }
 
         err = gk20a_secure_page_alloc(dev);
-        if (err) {
-                dev_err(&dev->dev, "failed to allocate secure buffer\n");
-                return err;
-        }
+        if (err)
+                dev_err(&dev->dev,
+                        "failed to allocate secure buffer %d\n", err);
 
         gk20a_debug_init(dev);