diff options
author | Tejal Kudav <tkudav@nvidia.com> | 2018-08-08 04:36:08 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-08-17 16:54:12 -0400 |
commit | 9feeae658acc2c997ef05b669ace8a0621e68ebb (patch) | |
tree | 1dd22dfb5fc4fc8e286808c29fcf043edf9f4b10 /drivers | |
parent | 70c20bb75be7815ebc67ac82d6999f46bc25ed6d (diff) |
gpu: nvgpu: Remove code to save hshub config regs
We do not use the stored hshub_config* register values.
Remove these redundant fields from nvlink data structure too.
This also allows us to not #include a FB hardware header in
nvlink.
JIRA NVGPU-966
Change-Id: I3be169a958ec17370b55889d1e1fbabb887a79fd
Signed-off-by: Tejal Kudav <tkudav@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1794955
GVS: Gerrit_Virtual_Submit
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')
-rw-r--r-- | drivers/gpu/nvgpu/gv100/nvlink_gv100.c | 7 | ||||
-rw-r--r-- | drivers/gpu/nvgpu/include/nvgpu/nvlink.h | 6 |
2 files changed, 0 insertions, 13 deletions
diff --git a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c index ef1343d8..b945b902 100644 --- a/drivers/gpu/nvgpu/gv100/nvlink_gv100.c +++ b/drivers/gpu/nvgpu/gv100/nvlink_gv100.c | |||
@@ -45,7 +45,6 @@ | |||
45 | #include <nvgpu/hw/gv100/hw_trim_gv100.h> | 45 | #include <nvgpu/hw/gv100/hw_trim_gv100.h> |
46 | #include <nvgpu/hw/gv100/hw_nvtlc_gv100.h> | 46 | #include <nvgpu/hw/gv100/hw_nvtlc_gv100.h> |
47 | 47 | ||
48 | #include <nvgpu/hw/gv100/hw_fb_gv100.h> | ||
49 | #include <nvgpu/hw/gv100/hw_mc_gv100.h> | 48 | #include <nvgpu/hw/gv100/hw_mc_gv100.h> |
50 | 49 | ||
51 | #define NVLINK_PLL_ON_TIMEOUT_MS 30 | 50 | #define NVLINK_PLL_ON_TIMEOUT_MS 30 |
@@ -1367,12 +1366,6 @@ static void gv100_nvlink_common_intr_enable(struct gk20a *g, | |||
1367 | { | 1366 | { |
1368 | u32 reg, i; | 1367 | u32 reg, i; |
1369 | 1368 | ||
1370 | /* Init HS HUB SW state */ | ||
1371 | g->nvlink.hshub_config0 = gk20a_readl(g, fb_hshub_config0_r()); | ||
1372 | g->nvlink.hshub_config1 = gk20a_readl(g, fb_hshub_config1_r()); | ||
1373 | g->nvlink.hshub_config2 = gk20a_readl(g, fb_hshub_config2_r()); | ||
1374 | g->nvlink.hshub_config6 = gk20a_readl(g, fb_hshub_config6_r()); | ||
1375 | |||
1376 | /* Init IOCTRL */ | 1369 | /* Init IOCTRL */ |
1377 | for_each_set_bit(i, &mask, 32) { | 1370 | for_each_set_bit(i, &mask, 32) { |
1378 | reg = IOCTRL_REG_RD32(g, ioctrl_link_intr_0_mask_r(i)); | 1371 | reg = IOCTRL_REG_RD32(g, ioctrl_link_intr_0_mask_r(i)); |
diff --git a/drivers/gpu/nvgpu/include/nvgpu/nvlink.h b/drivers/gpu/nvgpu/include/nvgpu/nvlink.h index 9824e62b..aa1b62c5 100644 --- a/drivers/gpu/nvgpu/include/nvgpu/nvlink.h +++ b/drivers/gpu/nvgpu/include/nvgpu/nvlink.h | |||
@@ -216,12 +216,6 @@ struct nvgpu_nvlink_dev { | |||
216 | 216 | ||
217 | enum nvgpu_nvlink_speed speed; | 217 | enum nvgpu_nvlink_speed speed; |
218 | 218 | ||
219 | /* hshub settings */ | ||
220 | u32 hshub_config0; | ||
221 | u32 hshub_config1; | ||
222 | u32 hshub_config2; | ||
223 | u32 hshub_config6; | ||
224 | |||
225 | /* tlc cached errors */ | 219 | /* tlc cached errors */ |
226 | u32 tlc_rx_err_status_0[NVLINK_MAX_LINKS_SW]; | 220 | u32 tlc_rx_err_status_0[NVLINK_MAX_LINKS_SW]; |
227 | u32 tlc_rx_err_status_1[NVLINK_MAX_LINKS_SW]; | 221 | u32 tlc_rx_err_status_1[NVLINK_MAX_LINKS_SW]; |