gpu: nvgpu: Add coherent aperture target field

Add the coherent aperture target field for FECS_ARB_CTX_PTR_TARGET
and FECS_NEW_CTX_TARGET. This is required for completeness with regard
to IO coherence.

JIRA EVLR-2333

Change-Id: I70576481e6af24bf2494e9cb5480e10062958235
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1664538
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

4 files changed, 33 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_gr_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_gr_gk20a.h
index 3be17f41..8655a0d3 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_gr_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_gr_gk20a.h
@@ -1276,6 +1276,10 @@ static inline u32 gr_fecs_new_ctx_target_sys_mem_ncoh_f(void)
 {
         return 0x30000000U;
 }
+static inline u32 gr_fecs_new_ctx_target_sys_mem_coh_f(void)
+{
+        return 0x20000000U;
+}
 static inline u32 gr_fecs_new_ctx_valid_s(void)
 {
         return 1U;
@@ -1336,6 +1340,10 @@ static inline u32 gr_fecs_arb_ctx_ptr_target_sys_mem_ncoh_f(void)
 {
         return 0x30000000U;
 }
+static inline u32 gr_fecs_arb_ctx_ptr_target_sys_mem_coh_f(void)
+{
+        return 0x20000000U;
+}
 static inline u32 gr_fecs_arb_ctx_cmd_r(void)
 {
         return 0x00409a10U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h
index d9776b7c..30bce9f9 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_gr_gm20b.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014-2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2014-2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -1268,6 +1268,10 @@ static inline u32 gr_fecs_new_ctx_target_sys_mem_ncoh_f(void)
 {
         return 0x30000000U;
 }
+static inline u32 gr_fecs_new_ctx_target_sys_mem_coh_f(void)
+{
+        return 0x20000000U;
+}
 static inline u32 gr_fecs_new_ctx_valid_s(void)
 {
         return 1U;
@@ -1328,6 +1332,10 @@ static inline u32 gr_fecs_arb_ctx_ptr_target_sys_mem_ncoh_f(void)
 {
         return 0x30000000U;
 }
+static inline u32 gr_fecs_arb_ctx_ptr_target_sys_mem_coh_f(void)
+{
+        return 0x20000000U;
+}
 static inline u32 gr_fecs_arb_ctx_cmd_r(void)
 {
         return 0x00409a10U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gr_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gr_gp106.h
index 7630bda2..7d3135f9 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gr_gp106.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_gr_gp106.h
@@ -1380,6 +1380,10 @@ static inline u32 gr_fecs_new_ctx_target_sys_mem_ncoh_f(void)
 {
         return 0x30000000U;
 }
+static inline u32 gr_fecs_new_ctx_target_sys_mem_coh_f(void)
+{
+        return 0x20000000U;
+}
 static inline u32 gr_fecs_new_ctx_valid_s(void)
 {
         return 1U;
@@ -1440,6 +1444,10 @@ static inline u32 gr_fecs_arb_ctx_ptr_target_sys_mem_ncoh_f(void)
 {
         return 0x30000000U;
 }
+static inline u32 gr_fecs_arb_ctx_ptr_target_sys_mem_coh_f(void)
+{
+        return 0x20000000U;
+}
 static inline u32 gr_fecs_arb_ctx_cmd_r(void)
 {
         return 0x00409a10U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h
index dca75004..4ae70aab 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h
@@ -1456,6 +1456,10 @@ static inline u32 gr_fecs_new_ctx_target_sys_mem_ncoh_f(void)
 {
         return 0x30000000U;
 }
+static inline u32 gr_fecs_new_ctx_target_sys_mem_coh_f(void)
+{
+        return 0x20000000U;
+}
 static inline u32 gr_fecs_new_ctx_valid_s(void)
 {
         return 1U;
@@ -1516,6 +1520,10 @@ static inline u32 gr_fecs_arb_ctx_ptr_target_sys_mem_ncoh_f(void)
 {
         return 0x30000000U;
 }
+static inline u32 gr_fecs_arb_ctx_ptr_target_sys_mem_coh_f(void)
+{
+        return 0x20000000U;
+}
 static inline u32 gr_fecs_arb_ctx_cmd_r(void)
 {
         return 0x00409a10U;