From 9ed88c24c073ca1e27dfa3076be6efcf888cded5 Mon Sep 17 00:00:00 2001
From: Jiyu Yang <jiyu.yang@nxp.com>
Date: Mon, 9 Aug 2021 18:34:08 +0800
Subject: [PATCH] MGS-6364 [#imx-2637] mmuException enable on non-linux
platform
Signed-off-by: Jiyu Yang <jiyu.yang@nxp.com>
---
drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c | 2 +-
drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c | 4 ++--
drivers/mxc/gpu-viv/hal/security_v1/gc_hal_ta_mmu.c | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c
index ad2fa37b895ea2..1011b6dabdef5b 100644
--- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c
+++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_event.c
@@ -1776,7 +1776,7 @@ gckEVENT_Notify(
if ((pending & 0x40000000) && Event->kernel->hardware->mmuVersion)
{
- gctUINT64 mmuException = 0;
+ gctUINT64 mmuException = 1;
gckOS_QueryOption(Event->os, "mmuException", &mmuException);
if (mmuException)
{
diff --git a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c
index ab3dad8ae1d371..579a4c759d2b3d 100644
--- a/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c
+++ b/drivers/mxc/gpu-viv/hal/kernel/gc_hal_kernel_mmu.c
@@ -1607,7 +1607,7 @@ _Construct(
gcePOOL pool;
gctUINT64 data;
gctUINT32 allocFlag = gcvALLOC_FLAG_CONTIGUOUS;
- gctUINT64 mmuEnabled;
+ gctUINT64 mmuEnabled = 1;
gcmkHEADER_ARG("Kernel=0x%x MmuSize=%lu", Kernel, MmuSize);
@@ -1652,7 +1652,7 @@ _Construct(
/* Create the page table mutex. */
gcmkONERROR(gckOS_CreateMutex(os, &mmu->pageTableMutex));
- gcmkONERROR(gckOS_QueryOption(os, "mmuException", &mmuEnabled));
+ gckOS_QueryOption(os, "mmuException", &mmuEnabled);
mmu->mmuException = (gctUINT) mmuEnabled;
gcmkONERROR(gckOS_QueryOption(os, "mmu", &mmuEnabled));
diff --git a/drivers/mxc/gpu-viv/hal/security_v1/gc_hal_ta_mmu.c b/drivers/mxc/gpu-viv/hal/security_v1/gc_hal_ta_mmu.c
index 83e4c8b9ce98f0..eeb29d5c1ad8c0 100644
--- a/drivers/mxc/gpu-viv/hal/security_v1/gc_hal_ta_mmu.c
+++ b/drivers/mxc/gpu-viv/hal/security_v1/gc_hal_ta_mmu.c
@@ -202,7 +202,7 @@ _AllocateStlb(
gceSTATUS status;
gcsMMU_STLB_PTR stlb;
gctPOINTER pointer = gcvNULL;
- gctUINT64 mmuException = 0;
+ gctUINT64 mmuException = 1;
/* Allocate slave TLB record. */
gcmkONERROR(gctaOS_Allocate(gcmSIZEOF(gcsMMU_STLB), &pointer));
@@ -250,7 +250,7 @@ gctaMMU_Construct(
gctSIZE_T bytes = 4096;
gcTA_MMU mmu = gcvNULL;
- gctUINT64 mmuException = 0;
+ gctUINT64 mmuException = 1;
gcmkONERROR(gctaOS_Allocate(
gcmSIZEOF(gcsTA_MMU),
--
GitLab