drm/amdgpu: use node_id and node_size to calcualte dram_base_address

physical_node_id * node_segment_size should be the
dram_base_address for current gpu node in xgmi config

Signed-off-by: Hawking Zhang <Hawking.Zhang@amd.com>
Reviewed-by: John Clements <john.clements@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_df.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_df.h
index 057f6ea645d7eb12384007a96365002ef5e0aa17..61a26c15c8dd50398b4dc0909372863b15fc1782 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_df.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_df.h
@@ -52,9 +52,6 @@ struct amdgpu_df_funcs {
        uint64_t (*get_fica)(struct amdgpu_device *adev, uint32_t ficaa_val);
        void (*set_fica)(struct amdgpu_device *adev, uint32_t ficaa_val,
                         uint32_t ficadl_val, uint32_t ficadh_val);
-       uint64_t (*get_dram_base_addr)(struct amdgpu_device *adev,
-                                      uint32_t df_inst);
-       uint32_t (*get_df_inst_id)(struct amdgpu_device *adev);
 };
 
 struct amdgpu_df {

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
index 48c0ce13f68e30bcadd4fbf982af603e18da0f84..90610b4f2c75a570294625f6a03babb1ba5bd9b3 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c
@@ -649,31 +649,8 @@ void amdgpu_xgmi_ras_fini(struct amdgpu_device *adev)
 uint64_t amdgpu_xgmi_get_relative_phy_addr(struct amdgpu_device *adev,
                                           uint64_t addr)
 {
-       uint32_t df_inst_id;
-       uint64_t dram_base_addr = 0;
-       const struct amdgpu_df_funcs *df_funcs = adev->df.funcs;
-
-       if ((!df_funcs)                 ||
-           (!df_funcs->get_df_inst_id) ||
-           (!df_funcs->get_dram_base_addr)) {
-               dev_warn(adev->dev,
-                        "XGMI: relative phy_addr algorithm is not supported\n");
-               return addr;
-       }
-
-       if (amdgpu_dpm_set_df_cstate(adev, DF_CSTATE_DISALLOW)) {
-               dev_warn(adev->dev,
-                        "failed to disable DF-Cstate, DF register may not be accessible\n");
-               return addr;
-       }
-
-       df_inst_id = df_funcs->get_df_inst_id(adev);
-       dram_base_addr = df_funcs->get_dram_base_addr(adev, df_inst_id);
-
-       if (amdgpu_dpm_set_df_cstate(adev, DF_CSTATE_ALLOW))
-               dev_warn(adev->dev, "failed to enable DF-Cstate\n");
-
-       return addr + dram_base_addr;
+       struct amdgpu_xgmi *xgmi = &adev->gmc.xgmi;
+       return (addr + xgmi->physical_node_id * xgmi->node_segment_size);
 }
 
 static void pcs_clear_status(struct amdgpu_device *adev, uint32_t pcs_status_reg)

diff --git a/drivers/gpu/drm/amd/amdgpu/df_v3_6.c b/drivers/gpu/drm/amd/amdgpu/df_v3_6.c
index 5a1bd8ed1a6c51ab34d0d65f834c3d5a8ccd666a..a7b8292cefee2998fe3d03068a1eb3e20aa6408f 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/df_v3_6.c
+++ b/drivers/gpu/drm/amd/amdgpu/df_v3_6.c
@@ -686,58 +686,6 @@ static void df_v3_6_pmc_get_count(struct amdgpu_device *adev,
        }
 }
 
-static uint64_t df_v3_6_get_dram_base_addr(struct amdgpu_device *adev,
-                                          uint32_t df_inst)
-{
-       uint32_t base_addr_reg_val      = 0;
-       uint64_t base_addr              = 0;
-
-       base_addr_reg_val = RREG32_PCIE(smnDF_CS_UMC_AON0_DramBaseAddress0 +
-                                       df_inst * DF_3_6_SMN_REG_INST_DIST);
-
-       if (REG_GET_FIELD(base_addr_reg_val,
-                         DF_CS_UMC_AON0_DramBaseAddress0,
-                         AddrRngVal) == 0) {
-               DRM_WARN("address range not valid");
-               return 0;
-       }
-
-       base_addr = REG_GET_FIELD(base_addr_reg_val,
-                                 DF_CS_UMC_AON0_DramBaseAddress0,
-                                 DramBaseAddr);
-
-       return base_addr << 28;
-}
-
-static uint32_t df_v3_6_get_df_inst_id(struct amdgpu_device *adev)
-{
-       uint32_t xgmi_node_id   = 0;
-       uint32_t df_inst_id     = 0;
-
-       /* Walk through DF dst nodes to find current XGMI node */
-       for (df_inst_id = 0; df_inst_id < DF_3_6_INST_CNT; df_inst_id++) {
-
-               xgmi_node_id = RREG32_PCIE(smnDF_CS_UMC_AON0_DramLimitAddress0 +
-                                          df_inst_id * DF_3_6_SMN_REG_INST_DIST);
-               xgmi_node_id = REG_GET_FIELD(xgmi_node_id,
-                                            DF_CS_UMC_AON0_DramLimitAddress0,
-                                            DstFabricID);
-
-               /* TODO: establish reason dest fabric id is offset by 7 */
-               xgmi_node_id = xgmi_node_id >> 7;
-
-               if (adev->gmc.xgmi.physical_node_id == xgmi_node_id)
-                       break;
-       }
-
-       if (df_inst_id == DF_3_6_INST_CNT) {
-               DRM_WARN("cant match df dst id with gpu node");
-               return 0;
-       }
-
-       return df_inst_id;
-}
-
 const struct amdgpu_df_funcs df_v3_6_funcs = {
        .sw_init = df_v3_6_sw_init,
        .sw_fini = df_v3_6_sw_fini,
@@ -752,6 +700,4 @@ const struct amdgpu_df_funcs df_v3_6_funcs = {
        .pmc_get_count = df_v3_6_pmc_get_count,
        .get_fica = df_v3_6_get_fica,
        .set_fica = df_v3_6_set_fica,
-       .get_dram_base_addr = df_v3_6_get_dram_base_addr,
-       .get_df_inst_id = df_v3_6_get_df_inst_id
 };