summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b
diff options
context:
space:
mode:
authorTerje Bergstrom <tbergstrom@nvidia.com>2018-08-27 16:58:41 -0400
committermobile promotions <svcmobile_promotions@nvidia.com>2018-08-30 23:11:49 -0400
commit9c60230b5723d6a0dbb83bf85d499a671491245f (patch)
tree9478600a314fa29d41e6a7cfb7b96247231f730b /drivers/gpu/nvgpu/include/nvgpu/hw/gp10b
parent220c10fac4af01cbd54a5afb210c2023ac7ef0ed (diff)
gpu: nvgpu: Sync kernel headers with generator tool
HW headers in nvgpu have gotten a bit out of date. Regenerate headers and add the following registers: * Add PTIMER timeout registers to all chips * Add PD, SCC, SSYNC and MME interrupt registers to all chips * Add HWW ESR INFO register to all chips Change-Id: I34e09371083ac1568666b0cd487a106fad56aa12 Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com> Reviewed-on: https://git-master.nvidia.com/r/1807709 Reviewed-by: svc-misra-checker <svc-misra-checker@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Seshendra Gadagottu <sgadagottu@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/nvgpu/hw/gp10b')
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_gr_gp10b.h24
-rw-r--r--drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_timer_gp10b.h14
2 files changed, 37 insertions, 1 deletions
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 4ae70aab..efd8b555 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
@@ -184,6 +184,22 @@ static inline u32 gr_exception_sked_m(void)
184{ 184{
185 return 0x1U << 8U; 185 return 0x1U << 8U;
186} 186}
187static inline u32 gr_exception_pd_m(void)
188{
189 return 0x1U << 2U;
190}
191static inline u32 gr_exception_scc_m(void)
192{
193 return 0x1U << 3U;
194}
195static inline u32 gr_exception_ssync_m(void)
196{
197 return 0x1U << 5U;
198}
199static inline u32 gr_exception_mme_m(void)
200{
201 return 0x1U << 7U;
202}
187static inline u32 gr_exception1_r(void) 203static inline u32 gr_exception1_r(void)
188{ 204{
189 return 0x00400118U; 205 return 0x00400118U;
@@ -724,6 +740,10 @@ static inline u32 gr_fe_hww_esr_en_enable_f(void)
724{ 740{
725 return 0x80000000U; 741 return 0x80000000U;
726} 742}
743static inline u32 gr_fe_hww_esr_info_r(void)
744{
745 return 0x004041b0U;
746}
727static inline u32 gr_fe_go_idle_timeout_r(void) 747static inline u32 gr_fe_go_idle_timeout_r(void)
728{ 748{
729 return 0x00404154U; 749 return 0x00404154U;
@@ -776,6 +796,10 @@ static inline u32 gr_mme_hww_esr_en_enable_f(void)
776{ 796{
777 return 0x80000000U; 797 return 0x80000000U;
778} 798}
799static inline u32 gr_mme_hww_esr_info_r(void)
800{
801 return 0x00404494U;
802}
779static inline u32 gr_memfmt_hww_esr_r(void) 803static inline u32 gr_memfmt_hww_esr_r(void)
780{ 804{
781 return 0x00404600U; 805 return 0x00404600U;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_timer_gp10b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_timer_gp10b.h
index db752648..54facfc4 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_timer_gp10b.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gp10b/hw_timer_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"),
@@ -96,6 +96,18 @@ static inline u32 timer_pri_timeout_save_0_r(void)
96{ 96{
97 return 0x00009084U; 97 return 0x00009084U;
98} 98}
99static inline u32 timer_pri_timeout_save_0_fecs_tgt_v(u32 r)
100{
101 return (r >> 31U) & 0x1U;
102}
103static inline u32 timer_pri_timeout_save_0_addr_v(u32 r)
104{
105 return (r >> 2U) & 0x3fffffU;
106}
107static inline u32 timer_pri_timeout_save_0_write_v(u32 r)
108{
109 return (r >> 1U) & 0x1U;
110}
99static inline u32 timer_pri_timeout_save_1_r(void) 111static inline u32 timer_pri_timeout_save_1_r(void)
100{ 112{
101 return 0x00009088U; 113 return 0x00009088U;