From 80fec3f69979150f4395df7ee1f7caadc0591d15 Mon Sep 17 00:00:00 2001 From: Seshendra Gadagottu Date: Fri, 26 Jun 2020 20:37:16 -0700 Subject: [PATCH] gpu: nvgpu: skip secure_alloc for pre-silicon Skip secure memory alloc for all pre-silicon platforms. If vpr support is added in future for any of pre-slicon platforms, then modify check for sec_alloc as per requirement. Jira NVGPU-5521 Change-Id: I15bebe8719436c689abfbbf5422722ea750800ec Signed-off-by: Seshendra Gadagottu Reviewed-on: https://git-master.nvidia.com/r/c/linux-nvgpu/+/2367627 Reviewed-by: automaticguardword Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Alex Waterman Reviewed-by: Seema Khowala Reviewed-by: mobile promotions GVS: Gerrit_Virtual_Submit Tested-by: mobile promotions --- drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c index 51a123dc0..d7b4c01b4 100644 --- a/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c +++ b/drivers/gpu/nvgpu/os/linux/platform_gk20a_tegra.c @@ -659,8 +659,11 @@ int gk20a_tegra_init_secure_alloc(struct gk20a_platform *platform) struct secure_page_buffer *secure_buffer = &platform->secure_buffer; dma_addr_t iova; - if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) + /* VPR is not supported on pre-silicon platforms - Jira NVGPU-5302 */ + if (!tegra_platform_is_silicon()) { + nvgpu_log_info(g, "VPR is not supported on pre-si platform"); return 0; + } #if PAGE_SIZE > 4096 platform->secure_buffer_size += SZ_64K;