diff options
author | Alex Waterman <alexw@nvidia.com> | 2018-02-26 14:50:58 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-02-27 19:03:21 -0500 |
commit | 84cbb3ad4717afd848fbed6e7c5c2b9d69b89789 (patch) | |
tree | 119a07134188d8e06c29a570dd8c6b143f39c9e1 /drivers/gpu/nvgpu | |
parent | 86cf2d0857dcc3b7109d4008b00a27d72dacf990 (diff) |
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>
Diffstat (limited to 'drivers/gpu/nvgpu')
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) | |||
1276 | { | 1276 | { |
1277 | return 0x30000000U; | 1277 | return 0x30000000U; |
1278 | } | 1278 | } |
1279 | static inline u32 gr_fecs_new_ctx_target_sys_mem_coh_f(void) | ||
1280 | { | ||
1281 | return 0x20000000U; | ||
1282 | } | ||
1279 | static inline u32 gr_fecs_new_ctx_valid_s(void) | 1283 | static inline u32 gr_fecs_new_ctx_valid_s(void) |
1280 | { | 1284 | { |
1281 | return 1U; | 1285 | return 1U; |
@@ -1336,6 +1340,10 @@ static inline u32 gr_fecs_arb_ctx_ptr_target_sys_mem_ncoh_f(void) | |||
1336 | { | 1340 | { |
1337 | return 0x30000000U; | 1341 | return 0x30000000U; |
1338 | } | 1342 | } |
1343 | static inline u32 gr_fecs_arb_ctx_ptr_target_sys_mem_coh_f(void) | ||
1344 | { | ||
1345 | return 0x20000000U; | ||
1346 | } | ||
1339 | static inline u32 gr_fecs_arb_ctx_cmd_r(void) | 1347 | static inline u32 gr_fecs_arb_ctx_cmd_r(void) |
1340 | { | 1348 | { |
1341 | return 0x00409a10U; | 1349 | 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 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2014-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2014-2018, NVIDIA CORPORATION. All rights reserved. |
3 | * | 3 | * |
4 | * Permission is hereby granted, free of charge, to any person obtaining a | 4 | * Permission is hereby granted, free of charge, to any person obtaining a |
5 | * copy of this software and associated documentation files (the "Software"), | 5 | * 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) | |||
1268 | { | 1268 | { |
1269 | return 0x30000000U; | 1269 | return 0x30000000U; |
1270 | } | 1270 | } |
1271 | static inline u32 gr_fecs_new_ctx_target_sys_mem_coh_f(void) | ||
1272 | { | ||
1273 | return 0x20000000U; | ||
1274 | } | ||
1271 | static inline u32 gr_fecs_new_ctx_valid_s(void) | 1275 | static inline u32 gr_fecs_new_ctx_valid_s(void) |
1272 | { | 1276 | { |
1273 | return 1U; | 1277 | return 1U; |
@@ -1328,6 +1332,10 @@ static inline u32 gr_fecs_arb_ctx_ptr_target_sys_mem_ncoh_f(void) | |||
1328 | { | 1332 | { |
1329 | return 0x30000000U; | 1333 | return 0x30000000U; |
1330 | } | 1334 | } |
1335 | static inline u32 gr_fecs_arb_ctx_ptr_target_sys_mem_coh_f(void) | ||
1336 | { | ||
1337 | return 0x20000000U; | ||
1338 | } | ||
1331 | static inline u32 gr_fecs_arb_ctx_cmd_r(void) | 1339 | static inline u32 gr_fecs_arb_ctx_cmd_r(void) |
1332 | { | 1340 | { |
1333 | return 0x00409a10U; | 1341 | 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) | |||
1380 | { | 1380 | { |
1381 | return 0x30000000U; | 1381 | return 0x30000000U; |
1382 | } | 1382 | } |
1383 | static inline u32 gr_fecs_new_ctx_target_sys_mem_coh_f(void) | ||
1384 | { | ||
1385 | return 0x20000000U; | ||
1386 | } | ||
1383 | static inline u32 gr_fecs_new_ctx_valid_s(void) | 1387 | static inline u32 gr_fecs_new_ctx_valid_s(void) |
1384 | { | 1388 | { |
1385 | return 1U; | 1389 | return 1U; |
@@ -1440,6 +1444,10 @@ static inline u32 gr_fecs_arb_ctx_ptr_target_sys_mem_ncoh_f(void) | |||
1440 | { | 1444 | { |
1441 | return 0x30000000U; | 1445 | return 0x30000000U; |
1442 | } | 1446 | } |
1447 | static inline u32 gr_fecs_arb_ctx_ptr_target_sys_mem_coh_f(void) | ||
1448 | { | ||
1449 | return 0x20000000U; | ||
1450 | } | ||
1443 | static inline u32 gr_fecs_arb_ctx_cmd_r(void) | 1451 | static inline u32 gr_fecs_arb_ctx_cmd_r(void) |
1444 | { | 1452 | { |
1445 | return 0x00409a10U; | 1453 | 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) | |||
1456 | { | 1456 | { |
1457 | return 0x30000000U; | 1457 | return 0x30000000U; |
1458 | } | 1458 | } |
1459 | static inline u32 gr_fecs_new_ctx_target_sys_mem_coh_f(void) | ||
1460 | { | ||
1461 | return 0x20000000U; | ||
1462 | } | ||
1459 | static inline u32 gr_fecs_new_ctx_valid_s(void) | 1463 | static inline u32 gr_fecs_new_ctx_valid_s(void) |
1460 | { | 1464 | { |
1461 | return 1U; | 1465 | return 1U; |
@@ -1516,6 +1520,10 @@ static inline u32 gr_fecs_arb_ctx_ptr_target_sys_mem_ncoh_f(void) | |||
1516 | { | 1520 | { |
1517 | return 0x30000000U; | 1521 | return 0x30000000U; |
1518 | } | 1522 | } |
1523 | static inline u32 gr_fecs_arb_ctx_ptr_target_sys_mem_coh_f(void) | ||
1524 | { | ||
1525 | return 0x20000000U; | ||
1526 | } | ||
1519 | static inline u32 gr_fecs_arb_ctx_cmd_r(void) | 1527 | static inline u32 gr_fecs_arb_ctx_cmd_r(void) |
1520 | { | 1528 | { |
1521 | return 0x00409a10U; | 1529 | return 0x00409a10U; |