diff options
author | Vinod G <vinodg@nvidia.com> | 2019-02-06 19:23:11 -0500 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2020-01-08 11:35:39 -0500 |
commit | 7a26ad57a7d2fc5cec4a0c8a8395c0c666d31cba (patch) | |
tree | 4ec371f30086045414e785199052394a4a9bd739 /drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h | |
parent | dacb06f4647b924aa6455e8156b74df5098cf3bf (diff) |
gpu: nvgpu: enable platform atomic feature
Support following changes related to platform atomic feature
NV_PFB_PRI_MMU_CTRL_ATOMIC_CAPABILITY_MODE to RMW MODE
NV_PFB_PRI_MMU_CTRL_ATOMIC_CAPABILITY_SYS_NCOH_MODE to L2
NV_PFB_HSHUB_NUM_ACTIVE_LTCS_HUB_SYS_ATOMIC_MODE to USE_RMW
NV_PFB_FBHUB_NUM_ACTIVE_LTCS_HUB_SYS_ATOMIC_MODE to USE_RMW
NV_PFB_FBHUB_NUM_ACTIVE_LTCS_HUB_SYS_NCOH_ATOMIC_MODE to USE_READ
In gv11b, FBHUB_NUM_ACTIVE_LTCS register has read only privilege,
so atomic mode register bits cannot be updated from kernel code.
atomic capability and atomic_sys_ncoh_mode bits are copied from
fb mmu_ctrl to gpcs_mmu_ctrl register.
new tu104 hal for fb_enable_nvlink function.
bug 200580236
Change-Id: Ia78986c1c56795c6efad20f4ba42700ef1c2c1ad
Signed-off-by: Vinod G <vinodg@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2013481
(cherry picked from commit 251e3eaa8029c4ae07b2cde7af5d9775e1cd8ec1)
Signed-off-by: Lakshmanan M <lm@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/2274932
GVS: Gerrit_Virtual_Submit
Tested-by: Sreeniketh H <sh@nvidia.com>
Reviewed-by: Deepak Nibade <dnibade@nvidia.com>
Reviewed-by: Bibek Basu <bbasu@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/gv11b/hw_fb_gv11b.h')
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h | 54 |
1 files changed, 53 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h index 86bdaf28..fe35bb71 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h +++ b/drivers/gpu/nvgpu/include/nvgpu/hw/gv11b/hw_fb_gv11b.h | |||
@@ -1,5 +1,5 @@ | |||
1 | /* | 1 | /* |
2 | * Copyright (c) 2016-2018, NVIDIA CORPORATION. All rights reserved. | 2 | * Copyright (c) 2016-2020, 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"), |
@@ -60,6 +60,22 @@ static inline u32 fb_fbhub_num_active_ltcs_r(void) | |||
60 | { | 60 | { |
61 | return 0x00100800U; | 61 | return 0x00100800U; |
62 | } | 62 | } |
63 | static inline u32 fb_fbhub_num_active_ltcs_hub_sys_atomic_mode_m(void) | ||
64 | { | ||
65 | return U32(0x1U) << 25U; | ||
66 | } | ||
67 | static inline u32 fb_fbhub_num_active_ltcs_hub_sys_atomic_mode_use_rmw_f(void) | ||
68 | { | ||
69 | return 0x2000000U; | ||
70 | } | ||
71 | static inline u32 fb_fbhub_num_active_ltcs_hub_sys_ncoh_atomic_mode_m(void) | ||
72 | { | ||
73 | return U32(0x1U) << 26U; | ||
74 | } | ||
75 | static inline u32 fb_fbhub_num_active_ltcs_hub_sys_ncoh_atomic_mode_use_read_f(void) | ||
76 | { | ||
77 | return 0x0U; | ||
78 | } | ||
63 | static inline u32 fb_mmu_ctrl_r(void) | 79 | static inline u32 fb_mmu_ctrl_r(void) |
64 | { | 80 | { |
65 | return 0x00100c80U; | 81 | return 0x00100c80U; |
@@ -76,6 +92,42 @@ static inline u32 fb_mmu_ctrl_pri_fifo_space_v(u32 r) | |||
76 | { | 92 | { |
77 | return (r >> 16U) & 0xffU; | 93 | return (r >> 16U) & 0xffU; |
78 | } | 94 | } |
95 | static inline u32 fb_mmu_ctrl_atomic_capability_mode_m(void) | ||
96 | { | ||
97 | return U32(0x3U) << 24U; | ||
98 | } | ||
99 | static inline u32 fb_mmu_ctrl_atomic_capability_mode_l2_f(void) | ||
100 | { | ||
101 | return 0x0U; | ||
102 | } | ||
103 | static inline u32 fb_mmu_ctrl_atomic_capability_mode_rmw_f(void) | ||
104 | { | ||
105 | return 0x2000000U; | ||
106 | } | ||
107 | static inline u32 fb_mmu_ctrl_atomic_capability_sys_ncoh_mode_m(void) | ||
108 | { | ||
109 | return U32(0x1U) << 27U; | ||
110 | } | ||
111 | static inline u32 fb_mmu_ctrl_atomic_capability_sys_ncoh_mode_l2_f(void) | ||
112 | { | ||
113 | return 0x0U; | ||
114 | } | ||
115 | static inline u32 fb_hshub_num_active_ltcs_r(void) | ||
116 | { | ||
117 | return 0x001fbc20U; | ||
118 | } | ||
119 | static inline u32 fb_hshub_num_active_ltcs_hub_sys_atomic_mode_m(void) | ||
120 | { | ||
121 | return U32(0x1U) << 25U; | ||
122 | } | ||
123 | static inline u32 fb_hshub_num_active_ltcs_hub_sys_atomic_mode_use_read_f(void) | ||
124 | { | ||
125 | return 0x0U; | ||
126 | } | ||
127 | static inline u32 fb_hshub_num_active_ltcs_hub_sys_atomic_mode_use_rmw_f(void) | ||
128 | { | ||
129 | return 0x2000000U; | ||
130 | } | ||
79 | static inline u32 fb_priv_mmu_phy_secure_r(void) | 131 | static inline u32 fb_priv_mmu_phy_secure_r(void) |
80 | { | 132 | { |
81 | return 0x00100ce4U; | 133 | return 0x00100ce4U; |