From b86a5d16329995497625a6c4013a4293739b9d06 Mon Sep 17 00:00:00 2001 From: Terje Bergstrom Date: Mon, 29 Jan 2018 12:48:52 -0800 Subject: gpu: nvgpu: Remove the use of READ_ONLY for DMA API READ_ONLY flag for dma API is a Tegra specific API. We use it only to prevent accidental writes to non-secure ACR bootloader. Its use is marginal, so remove the flag. JIRA NVGPU-4 Change-Id: I887dc04aee8f7ace40220294851b210375dfde98 Signed-off-by: Terje Bergstrom Reviewed-on: https://git-master.nvidia.com/r/1648174 Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/common/linux/dma.c | 5 +---- drivers/gpu/nvgpu/gm20b/acr_gm20b.c | 3 +-- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/nvgpu/common/linux/dma.c b/drivers/gpu/nvgpu/common/linux/dma.c index fe4e9bc8..c13dae8b 100644 --- a/drivers/gpu/nvgpu/common/linux/dma.c +++ b/drivers/gpu/nvgpu/common/linux/dma.c @@ -50,7 +50,7 @@ * added it must be added here as well!! */ #define NVGPU_DMA_STR_SIZE \ - sizeof("NO_KERNEL_MAPPING FORCE_CONTIGUOUS READ_ONLY") + sizeof("NO_KERNEL_MAPPING FORCE_CONTIGUOUS") /* * The returned string is kmalloc()ed here but must be freed by the caller. @@ -77,7 +77,6 @@ static char *nvgpu_dma_flags_to_str(struct gk20a *g, unsigned long flags) APPEND_FLAG(NVGPU_DMA_NO_KERNEL_MAPPING, "NO_KERNEL_MAPPING "); APPEND_FLAG(NVGPU_DMA_FORCE_CONTIGUOUS, "FORCE_CONTIGUOUS "); - APPEND_FLAG(NVGPU_DMA_READ_ONLY, "READ_ONLY"); #undef APPEND_FLAG return buf; @@ -171,8 +170,6 @@ static void nvgpu_dma_flags_to_attrs(struct dma_attrs *attrs, dma_set_attr(DMA_ATTR_NO_KERNEL_MAPPING, ATTR_ARG(attrs)); if (flags & NVGPU_DMA_FORCE_CONTIGUOUS) dma_set_attr(DMA_ATTR_FORCE_CONTIGUOUS, ATTR_ARG(attrs)); - if (flags & NVGPU_DMA_READ_ONLY) - dma_set_attr(DMA_ATTR_READ_ONLY, ATTR_ARG(attrs)); #undef ATTR_ARG } diff --git a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c index c57fba45..cffe7199 100644 --- a/drivers/gpu/nvgpu/gm20b/acr_gm20b.c +++ b/drivers/gpu/nvgpu/gm20b/acr_gm20b.c @@ -1348,8 +1348,7 @@ int pmu_exec_gen_bl(struct gk20a *g, void *desc, u8 b_wait_for_halt) /*TODO in code verify that enable PMU is done, scrubbing etc is done*/ /*TODO in code verify that gmmu vm init is done*/ - err = nvgpu_dma_alloc_flags_sys(g, - NVGPU_DMA_READ_ONLY, bl_sz, &acr->hsbl_ucode); + err = nvgpu_dma_alloc_sys(g, bl_sz, &acr->hsbl_ucode); if (err) { nvgpu_err(g, "failed to allocate memory"); goto err_done; -- cgit v1.2.2