drm/amdgpu: add TX_POWER_CTRL_1 macro definitions for NBIO IP v7.7.0
Subsystems (2)
PATCH 1/3 drm/amdgpu: add TX_POWER_CTRL_1 macro definitions for NBIO IP v7.7.0
Add the BIF0_PCIE_TX_POWER_CTRL_1 register offset and mask macro definitions for AMD_CG_SUPPORT_BIF_LS.
--- .../amd/include/asic_reg/nbio/nbio_7_7_0_offset.h | 2 ++ .../amd/include/asic_reg/nbio/nbio_7_7_0_sh_mask.h | 13 +++++++++++++ 2 files changed, 15 insertions(+)
drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_7_0_offset.h +2 -0
@@ -15243,6 +15243,8 @@#define regBIF0_PCIE_TX_TRACKING_ADDR_HI_BASE_IDX 5#define regBIF0_PCIE_TX_TRACKING_CTRL_STATUS 0x420186#define regBIF0_PCIE_TX_TRACKING_CTRL_STATUS_BASE_IDX 5 +#define regBIF0_PCIE_TX_POWER_CTRL_1 0x420187 +#define regBIF0_PCIE_TX_POWER_CTRL_1_BASE_IDX 5#define regBIF0_PCIE_TX_CTRL_4 0x42018b#define regBIF0_PCIE_TX_CTRL_4_BASE_IDX 5#define regBIF0_PCIE_TX_STATUS 0x420194
drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_7_0_sh_mask.h +13 -0
@@ -85627,6 +85627,19 @@#define BIF0_PCIE_TX_TRACKING_CTRL_STATUS__TX_TRACKING_PORT_MASK 0x0000000EL#define BIF0_PCIE_TX_TRACKING_CTRL_STATUS__TX_TRACKING_UNIT_ID_MASK 0x00007F00L#define BIF0_PCIE_TX_TRACKING_CTRL_STATUS__TX_TRACKING_STATUS_VALID_MASK 0x00008000L +//BIF0_PCIE_TX_POWER_CTRL_1 +#define BIF0_PCIE_TX_POWER_CTRL_1__MST_MEM_LS_EN__SHIFT 0x0 +#define BIF0_PCIE_TX_POWER_CTRL_1__MST_MEM_DS_EN__SHIFT 0x1 +#define BIF0_PCIE_TX_POWER_CTRL_1__MST_MEM_SD_EN__SHIFT 0x2 +#define BIF0_PCIE_TX_POWER_CTRL_1__REPLAY_MEM_LS_EN__SHIFT 0x3 +#define BIF0_PCIE_TX_POWER_CTRL_1__REPLAY_MEM_DS_EN__SHIFT 0x4 +#define BIF0_PCIE_TX_POWER_CTRL_1__REPLAY_MEM_SD_EN__SHIFT 0x5 +#define BIF0_PCIE_TX_POWER_CTRL_1__MST_MEM_LS_EN_MASK 0x00000001L +#define BIF0_PCIE_TX_POWER_CTRL_1__MST_MEM_DS_EN_MASK 0x00000002L +#define BIF0_PCIE_TX_POWER_CTRL_1__MST_MEM_SD_EN_MASK 0x00000004L +#define BIF0_PCIE_TX_POWER_CTRL_1__REPLAY_MEM_LS_EN_MASK 0x00000008L +#define BIF0_PCIE_TX_POWER_CTRL_1__REPLAY_MEM_DS_EN_MASK 0x00000010L +#define BIF0_PCIE_TX_POWER_CTRL_1__REPLAY_MEM_SD_EN_MASK 0x00000020L//BIF0_PCIE_TX_CTRL_4 #define BIF0_PCIE_TX_CTRL_4__TX_PORT_ACCESS_TIMER_SKEW__SHIFT 0x0#define BIF0_PCIE_TX_CTRL_4__TX_PORT_ACCESS_TIMER_SKEW_MASK 0x0000000FL
Signature · 1 line
2.25.1
PATCH 2/3 drm/amdgpu: add NBIO IP v7.7.0 Clock Gating support
Add BIF Clock Gating MGCG and LS support for NBIO IP v7.7.0.
--- drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 78 ++++++++++++++++++++++++++ 1 file changed, 78 insertions(+)
drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c +78 -0
@@ -247,6 +247,81 @@ static void nbio_v7_7_init_registers(struct amdgpu_device *adev) } +static void nbio_v7_7_update_medium_grain_clock_gating (struct amdgpu_device *adev, +bool enable) +{ +uint32_t def, data; + +if (enable && !(adev->cg_flags &AMD_CG_SUPPORT_BIF_MGCG )) +return ; + + def = data =RREG32_SOC15 (NBIO ,0 , regBIF0_CPM_CONTROL); +if (enable) { + data |= (BIF0_CPM_CONTROL__LCLK_DYN_GATE_ENABLE_MASK | +BIF0_CPM_CONTROL__TXCLK_DYN_GATE_ENABLE_MASK | +BIF0_CPM_CONTROL__TXCLK_LCNT_GATE_ENABLE_MASK | +BIF0_CPM_CONTROL__TXCLK_REGS_GATE_ENABLE_MASK | +BIF0_CPM_CONTROL__TXCLK_PRBS_GATE_ENABLE_MASK | +BIF0_CPM_CONTROL__REFCLK_REGS_GATE_ENABLE_MASK ); + }else { + data &= ~(BIF0_CPM_CONTROL__LCLK_DYN_GATE_ENABLE_MASK | +BIF0_CPM_CONTROL__TXCLK_DYN_GATE_ENABLE_MASK | +BIF0_CPM_CONTROL__TXCLK_LCNT_GATE_ENABLE_MASK | +BIF0_CPM_CONTROL__TXCLK_REGS_GATE_ENABLE_MASK | +BIF0_CPM_CONTROL__TXCLK_PRBS_GATE_ENABLE_MASK | +BIF0_CPM_CONTROL__REFCLK_REGS_GATE_ENABLE_MASK ); + } + +if (def != data) +WREG32_SOC15 (NBIO ,0 , regBIF0_CPM_CONTROL, data); +} + +static void nbio_v7_7_update_medium_grain_light_sleep (struct amdgpu_device *adev, +bool enable) +{ +uint32_t def, data; + +if (enable && !(adev->cg_flags &AMD_CG_SUPPORT_BIF_LS )) +return ; + + def = data =RREG32_SOC15 (NBIO ,0 , regBIF0_PCIE_CNTL2); +if (enable) + data |=BIF0_PCIE_CNTL2__SLV_MEM_LS_EN_MASK ; +else + data &= ~BIF0_PCIE_CNTL2__SLV_MEM_LS_EN_MASK ; + +if (def != data) +WREG32_SOC15 (NBIO ,0 , regBIF0_PCIE_CNTL2, data); + + def = data =RREG32_SOC15 (NBIO ,0 , regBIF0_PCIE_TX_POWER_CTRL_1); +if (enable) { + data |= (BIF0_PCIE_TX_POWER_CTRL_1__MST_MEM_LS_EN_MASK | +BIF0_PCIE_TX_POWER_CTRL_1__REPLAY_MEM_LS_EN_MASK ); + }else { + data &= ~(BIF0_PCIE_TX_POWER_CTRL_1__MST_MEM_LS_EN_MASK | +BIF0_PCIE_TX_POWER_CTRL_1__REPLAY_MEM_LS_EN_MASK ); + } + +if (def != data) +WREG32_SOC15 (NBIO ,0 , regBIF0_PCIE_TX_POWER_CTRL_1, data); +} + +static void nbio_v7_7_get_clockgating_state (struct amdgpu_device *adev, +u64 *flags) +{ +uint32_t data; + +/* AMD_CG_SUPPORT_BIF_MGCG */ + data =RREG32_SOC15 (NBIO ,0 , regBIF0_CPM_CONTROL); +if (data &BIF0_CPM_CONTROL__LCLK_DYN_GATE_ENABLE_MASK ) + *flags |=AMD_CG_SUPPORT_BIF_MGCG ; + +/* AMD_CG_SUPPORT_BIF_LS */ + data =RREG32_SOC15 (NBIO ,0 , regBIF0_PCIE_CNTL2); +if (data &BIF0_PCIE_CNTL2__SLV_MEM_LS_EN_MASK ) + *flags |=AMD_CG_SUPPORT_BIF_LS ; +} +const struct amdgpu_nbio_funcs nbio_v7_7_funcs = { .get_hdp_flush_req_offset = nbio_v7_7_get_hdp_flush_req_offset, .get_hdp_flush_done_offset = nbio_v7_7_get_hdp_flush_done_offset,
@@ -262,6 +337,9 @@ const struct amdgpu_nbio_funcs nbio_v7_7_funcs = { .enable_doorbell_aperture = nbio_v7_7_enable_doorbell_aperture, .enable_doorbell_selfring_aperture = nbio_v7_7_enable_doorbell_selfring_aperture, .ih_doorbell_range = nbio_v7_7_ih_doorbell_range, + .update_medium_grain_clock_gating = nbio_v7_7_update_medium_grain_clock_gating, + .update_medium_grain_light_sleep = nbio_v7_7_update_medium_grain_light_sleep, + .get_clockgating_state = nbio_v7_7_get_clockgating_state, .ih_control = nbio_v7_7_ih_control, .init_registers = nbio_v7_7_init_registers, };
Signature · 1 line
2.25.1
PATCH 3/3 drm/amdgpu: enable NBIO IP v7.7.0 Clock Gating
In reply to Tim HuangEnable AMD_CG_SUPPORT_BIF_MGCG and AMD_CG_SUPPORT_BIF_LS support.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc21.c +3 -4
@@ -603,6 +603,8 @@ static int soc21_common_early_init(void *handle)AMD_CG_SUPPORT_ATHUB_MGCG |AMD_CG_SUPPORT_ATHUB_LS |AMD_CG_SUPPORT_IH_CG | +AMD_CG_SUPPORT_BIF_MGCG | +AMD_CG_SUPPORT_BIF_LS |AMD_CG_SUPPORT_VCN_MGCG |AMD_CG_SUPPORT_JPEG_MGCG ; adev->pg_flags =
@@ -702,6 +704,7 @@ static int soc21_common_set_clockgating_state(void *handle,switch (adev->ip_versions[NBIO_HWIP ][0 ]) {case IP_VERSION (4 ,3 ,0 ):case IP_VERSION (4 ,3 ,1 ): +case IP_VERSION (7 ,7 ,0 ): adev->nbio.funcs->update_medium_grain_clock_gating (adev, state ==AMD_CG_STATE_GATE ); adev->nbio.funcs->update_medium_grain_light_sleep(adev,
@@ -709,10 +712,6 @@ static int soc21_common_set_clockgating_state(void *handle, adev->hdp.funcs->update_clock_gating (adev, state ==AMD_CG_STATE_GATE );break ; -case IP_VERSION (7 ,7 ,0 ): - adev->hdp.funcs->update_clock_gating (adev, - state ==AMD_CG_STATE_GATE ); -break ;default :break ; }
Signature · 1 line
2.25.1
Re: [PATCH 3/3] drm/amdgpu: enable NBIO IP v7.7.0 Clock Gating
[AMD Official Use Only - General]
This series is:
Reviewed-by: Yifan Zhang
________________________________
发件人: Huang, Tim <[email protected]>
发送时间: Thursday, August 18, 2022 10:17:32 AM
收件人: [email protected] <[email protected]>
抄送: Deucher, Alexander <[email protected]>; Zhang, Yifan <[email protected]>; Du, Xiaojian <[email protected]>; Huang, Tim <[email protected]> 主题: [PATCH 3/3] drm/amdgpu: enable NBIO IP v7.7.0 Clock Gating
Enable AMD_CG_SUPPORT_BIF_MGCG and AMD_CG_SUPPORT_BIF_LS support.
--- drivers/gpu/drm/amd/amdgpu/soc21.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/soc21.c +3 -4
@@ -603,6 +603,8 @@ static int soc21_common_early_init(void *handle)AMD_CG_SUPPORT_ATHUB_MGCG |AMD_CG_SUPPORT_ATHUB_LS |AMD_CG_SUPPORT_IH_CG | +AMD_CG_SUPPORT_BIF_MGCG | +AMD_CG_SUPPORT_BIF_LS |AMD_CG_SUPPORT_VCN_MGCG |AMD_CG_SUPPORT_JPEG_MGCG ; adev->pg_flags =
@@ -702,6 +704,7 @@ static int soc21_common_set_clockgating_state(void *handle,switch (adev->ip_versions[NBIO_HWIP ][0 ]) {case IP_VERSION (4 ,3 ,0 ):case IP_VERSION (4 ,3 ,1 ): +case IP_VERSION (7 ,7 ,0 ): adev->nbio.funcs->update_medium_grain_clock_gating (adev, state ==AMD_CG_STATE_GATE ); adev->nbio.funcs->update_medium_grain_light_sleep(adev,
@@ -709,10 +712,6 @@ static int soc21_common_set_clockgating_state(void *handle, adev->hdp.funcs->update_clock_gating (adev, state ==AMD_CG_STATE_GATE );break ; -case IP_VERSION (7 ,7 ,0 ): - adev->hdp.funcs->update_clock_gating (adev, - state ==AMD_CG_STATE_GATE ); -break ;default :break ; }
--
2.25.1