summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/include
diff options
context:
space:
mode:
authorVinod G <vinodg@nvidia.com>2018-06-11 23:11:43 -0400
committerTejal Kudav <tkudav@nvidia.com>2018-06-14 09:44:08 -0400
commit0aa8d6e27394ec15c1816943996daf8f8ffab438 (patch)
treef4cc5406bfe6a2f39a3871bb680286ee66925130 /drivers/gpu/nvgpu/include
parent12637d9c23227647e5e62a907974afc987c773a4 (diff)
gpu: nvgpu: Mask an unused HCE_ILLEGAL_OP Interrupt
HCE interrupt is not being used in nvgpu platform now, masking the bit from the interrupt register. bug 2082123 Change-Id: I1d53584afebe57b9621c8f4ec395cd1dcd6c7611 Signed-off-by: Vinod G <vinodg@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1746850 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/include')
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pbdma_gk20a.h10
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_pbdma_gm20b.h10
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pbdma_gp106.h10
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pbdma_gp10b.h10
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h6
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h6
6 files changed, 46 insertions, 6 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pbdma_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pbdma_gk20a.h
index 338edef2..2c8f48d6 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pbdma_gk20a.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_pbdma_gk20a.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2012-2017, NVIDIA CORPORATION. All rights reserved. 2 * Copyright (c) 2012-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"),
@@ -528,6 +528,14 @@ static inline u32 pbdma_intr_stall_lbreq_enabled_f(void)
528{ 528{
529 return 0x100U; 529 return 0x100U;
530} 530}
531static inline u32 pbdma_intr_stall_1_r(u32 i)
532{
533 return 0x00040140U + i*8192U;
534}
535static inline u32 pbdma_intr_stall_1_hce_illegal_op_enabled_f(void)
536{
537 return 0x1U;
538}
531static inline u32 pbdma_udma_nop_r(void) 539static inline u32 pbdma_udma_nop_r(void)
532{ 540{
533 return 0x00000008U; 541 return 0x00000008U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_pbdma_gm20b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_pbdma_gm20b.h
index b8d7bbe4..10ed9eca 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_pbdma_gm20b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gm20b/hw_pbdma_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"),
@@ -516,6 +516,14 @@ static inline u32 pbdma_intr_stall_lbreq_enabled_f(void)
516{ 516{
517 return 0x100U; 517 return 0x100U;
518} 518}
519static inline u32 pbdma_intr_stall_1_r(u32 i)
520{
521 return 0x00040140U + i*8192U;
522}
523static inline u32 pbdma_intr_stall_1_hce_illegal_op_enabled_f(void)
524{
525 return 0x1U;
526}
519static inline u32 pbdma_udma_nop_r(void) 527static inline u32 pbdma_udma_nop_r(void)
520{ 528{
521 return 0x00000008U; 529 return 0x00000008U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pbdma_gp106.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pbdma_gp106.h
index dad6317d..1005c5ab 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pbdma_gp106.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp106/hw_pbdma_gp106.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. 2 * Copyright (c) 2016-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"),
@@ -504,6 +504,14 @@ static inline u32 pbdma_intr_stall_lbreq_enabled_f(void)
504{ 504{
505 return 0x100U; 505 return 0x100U;
506} 506}
507static inline u32 pbdma_intr_stall_1_r(u32 i)
508{
509 return 0x00040140U + i*8192U;
510}
511static inline u32 pbdma_intr_stall_1_hce_illegal_op_enabled_f(void)
512{
513 return 0x1U;
514}
507static inline u32 pbdma_udma_nop_r(void) 515static inline u32 pbdma_udma_nop_r(void)
508{ 516{
509 return 0x00000008U; 517 return 0x00000008U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pbdma_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pbdma_gp10b.h
index 4f45f824..66e8ddbf 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pbdma_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_pbdma_gp10b.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"),
@@ -528,6 +528,14 @@ static inline u32 pbdma_intr_stall_lbreq_enabled_f(void)
528{ 528{
529 return 0x100U; 529 return 0x100U;
530} 530}
531static inline u32 pbdma_intr_stall_1_r(u32 i)
532{
533 return 0x00040140U + i*8192U;
534}
535static inline u32 pbdma_intr_stall_1_hce_illegal_op_enabled_f(void)
536{
537 return 0x1U;
538}
531static inline u32 pbdma_udma_nop_r(void) 539static inline u32 pbdma_udma_nop_r(void)
532{ 540{
533 return 0x00000008U; 541 return 0x00000008U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h
index 4b7eb25c..a5c8dad3 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv100/hw_pbdma_gv100.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2017, NVIDIA CORPORATION. All rights reserved. 2 * Copyright (c) 2017-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"),
@@ -548,6 +548,10 @@ static inline u32 pbdma_intr_stall_1_r(u32 i)
548{ 548{
549 return 0x00040140U + i*8192U; 549 return 0x00040140U + i*8192U;
550} 550}
551static inline u32 pbdma_intr_stall_1_hce_illegal_op_enabled_f(void)
552{
553 return 0x1U;
554}
551static inline u32 pbdma_udma_nop_r(void) 555static inline u32 pbdma_udma_nop_r(void)
552{ 556{
553 return 0x00000008U; 557 return 0x00000008U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h
index f05bee84..75bdae1c 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_pbdma_gv11b.h
@@ -1,5 +1,5 @@
1/* 1/*
2 * Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. 2 * Copyright (c) 2016-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"),
@@ -548,6 +548,10 @@ static inline u32 pbdma_intr_stall_1_r(u32 i)
548{ 548{
549 return 0x00040140U + i*8192U; 549 return 0x00040140U + i*8192U;
550} 550}
551static inline u32 pbdma_intr_stall_1_hce_illegal_op_enabled_f(void)
552{
553 return 0x1U;
554}
551static inline u32 pbdma_udma_nop_r(void) 555static inline u32 pbdma_udma_nop_r(void)
552{ 556{
553 return 0x00000008U; 557 return 0x00000008U;