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, 4 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
index 28f82816..148496dd 100644
--- a/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
+++ b/drivers/gpu/nvgpu/gk20a/platform_gk20a_tegra.c
@@ -135,6 +135,7 @@ static int gk20a_tegra_secure_alloc(struct platform_device *pdev,
                                     struct gr_ctx_buffer_desc *desc,
                                     size_t size)
 {
+        struct gk20a_platform *platform = platform_get_drvdata(pdev);
         struct device *dev = &pdev->dev;
         DEFINE_DMA_ATTRS(attrs);
         dma_addr_t iova;
@@ -142,6 +143,9 @@ static int gk20a_tegra_secure_alloc(struct platform_device *pdev,
         struct page *page;
         int err = 0;
 
+        if (!platform->secure_alloc_ready)
+                return -EINVAL;
+
         (void)dma_alloc_attrs(&tegra_vpr_dev, size, &iova,
                                       DMA_MEMORY_NOMAP, &attrs);
         if (dma_mapping_error(&tegra_vpr_dev, iova))