diff options
author | Terje Bergstrom <tbergstrom@nvidia.com> | 2018-08-27 16:58:41 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-08-30 23:11:49 -0400 |
commit | 9c60230b5723d6a0dbb83bf85d499a671491245f (patch) | |
tree | 9478600a314fa29d41e6a7cfb7b96247231f730b /drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_timer_gk20a.h | |
parent | 220c10fac4af01cbd54a5afb210c2023ac7ef0ed (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/gk20a/hw_timer_gk20a.h')
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_timer_gk20a.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_timer_gk20a.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_timer_gk20a.h index f0dbfc30..972d68af 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_timer_gk20a.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gk20a/hw_timer_gk20a.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2013-2017, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2013-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"), |
@@ -98,15 +98,15 @@ static inline u32 timer_pri_timeout_save_0_r(void) | |||
98 | } | 98 | } |
99 | static inline u32 timer_pri_timeout_save_0_fecs_tgt_v(u32 r) | 99 | static inline u32 timer_pri_timeout_save_0_fecs_tgt_v(u32 r) |
100 | { | 100 | { |
101 | return (r >> 31) & 0x1; | 101 | return (r >> 31U) & 0x1U; |
102 | } | 102 | } |
103 | static inline u32 timer_pri_timeout_save_0_addr_v(u32 r) | 103 | static inline u32 timer_pri_timeout_save_0_addr_v(u32 r) |
104 | { | 104 | { |
105 | return (r >> 2) & 0x3fffff; | 105 | return (r >> 2U) & 0x3fffffU; |
106 | } | 106 | } |
107 | static inline u32 timer_pri_timeout_save_0_write_v(u32 r) | 107 | static inline u32 timer_pri_timeout_save_0_write_v(u32 r) |
108 | { | 108 | { |
109 | return (r >> 1) & 0x1; | 109 | return (r >> 1U) & 0x1U; |
110 | } | 110 | } |
111 | static inline u32 timer_pri_timeout_save_1_r(void) | 111 | static inline u32 timer_pri_timeout_save_1_r(void) |
112 | { | 112 | { |