From 9feeae658acc2c997ef05b669ace8a0621e68ebb Mon Sep 17 00:00:00 2001 From: Tejal Kudav Date: Wed, 8 Aug 2018 14:06:08 +0530 Subject: 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 Reviewed-on: https://git-master.nvidia.com/r/1794955 GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom Reviewed-by: mobile promotions Tested-by: mobile promotions --- drivers/gpu/nvgpu/gv100/nvlink_gv100.c | 7 ------- drivers/gpu/nvgpu/include/nvgpu/nvlink.h | 6 ------ 2 files changed, 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 @@ #include #include -#include #include #define NVLINK_PLL_ON_TIMEOUT_MS 30 @@ -1367,12 +1366,6 @@ static void gv100_nvlink_common_intr_enable(struct gk20a *g, { u32 reg, i; - /* Init HS HUB SW state */ - g->nvlink.hshub_config0 = gk20a_readl(g, fb_hshub_config0_r()); - g->nvlink.hshub_config1 = gk20a_readl(g, fb_hshub_config1_r()); - g->nvlink.hshub_config2 = gk20a_readl(g, fb_hshub_config2_r()); - g->nvlink.hshub_config6 = gk20a_readl(g, fb_hshub_config6_r()); - /* Init IOCTRL */ for_each_set_bit(i, &mask, 32) { 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 { enum nvgpu_nvlink_speed speed; - /* hshub settings */ - u32 hshub_config0; - u32 hshub_config1; - u32 hshub_config2; - u32 hshub_config6; - /* tlc cached errors */ u32 tlc_rx_err_status_0[NVLINK_MAX_LINKS_SW]; u32 tlc_rx_err_status_1[NVLINK_MAX_LINKS_SW]; -- cgit v1.2.2