drm/amdgpu/soc15: disable doorbell interrupt as part of BACO entry sequence
Subsystems (2)
PATCH 1/4 drm/amdgpu/soc15: disable doorbell interrupt as part of BACO entry sequence
Workaround to make RAS recovery work in BACO reset.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 ++ drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 8 ++++++++ drivers/gpu/drm/amd/amdgpu/soc15.c | 9 +++++++++ 3 files changed, 19 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h +2 -0
@@ -67,6 +67,8 @@ struct amdgpu_nbio_funcs { bool enable);void (*ih_doorbell_range)(struct amdgpu_device *adev,bool use_doorbell,int doorbell_index); +void (*enable_doorbell_interrupt)(struct amdgpu_device *adev, +bool enable);void (*update_medium_grain_clock_gating)(struct amdgpu_device *adev,bool enable); void (*update_medium_grain_light_sleep)(struct amdgpu_device *adev,
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +8 -0
@@ -502,6 +502,13 @@ static void nbio_v7_4_query_ras_error_count(struct amdgpu_device *adev, } } +static void nbio_v7_4_enable_doorbell_interrupt (struct amdgpu_device *adev, +bool enable) +{ +WREG32_FIELD15 (NBIO ,0 ,BIF_DOORBELL_INT_CNTL , +DOORBELL_INTERRUPT_DISABLE , enable ?0 :1 ); +} +const struct amdgpu_nbio_funcs nbio_v7_4_funcs = { .get_hdp_flush_req_offset = nbio_v7_4_get_hdp_flush_req_offset, .get_hdp_flush_done_offset = nbio_v7_4_get_hdp_flush_done_offset,
@@ -516,6 +523,7 @@ const struct amdgpu_nbio_funcs nbio_v7_4_funcs = { .enable_doorbell_aperture = nbio_v7_4_enable_doorbell_aperture, .enable_doorbell_selfring_aperture = nbio_v7_4_enable_doorbell_selfring_aperture, .ih_doorbell_range = nbio_v7_4_ih_doorbell_range, + .enable_doorbell_interrupt = nbio_v7_4_enable_doorbell_interrupt, .update_medium_grain_clock_gating = nbio_v7_4_update_medium_grain_clock_gating, .update_medium_grain_light_sleep = nbio_v7_4_update_medium_grain_light_sleep, .get_clockgating_state = nbio_v7_4_get_clockgating_state,
drivers/gpu/drm/amd/amdgpu/soc15.c +9 -0
@@ -493,10 +493,15 @@ static int soc15_asic_baco_reset(struct amdgpu_device *adev) {void *pp_handle = adev->powerplay.pp_handle;const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +struct amdgpu_ras *ras =amdgpu_ras_get_context (adev);if (!pp_funcs ||!pp_funcs->get_asic_baco_state ||!pp_funcs->set_asic_baco_state)return -ENOENT ; +/* avoid NBIF got stuck when do RAS recovery in BACO reset */ +if (ras && ras->supported) + adev->nbio.funcs->enable_doorbell_interrupt (adev, false); +/* enter BACO state */ if (pp_funcs->set_asic_baco_state (pp_handle,1 ))return -EIO ;
@@ -505,6 +510,10 @@ static int soc15_asic_baco_reset(struct amdgpu_device *adev)if (pp_funcs->set_asic_baco_state (pp_handle,0 ))return -EIO ; +/* re-enable doorbell interrupt after BACO exit */ +if (ras && ras->supported) + adev->nbio.funcs->enable_doorbell_interrupt (adev, true); +dev_info (adev->dev,"GPU BACO reset\n" ); adev->in_baco_reset =1 ;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1570792228-11189-1-git-send-email-le.ma-5C7GfCeVMHo@public.gmane.org
PATCH 2/4 drm/amd/powerplay: avoid disabling ECC if RAS is enabled for VEGA20
Program THM_BACO_CNTL.SOC_DOMAIN_IDLE=1 will tell VBIOS to disable ECC when BACO exit. This can save BACO exit time by PSP on none-ECC SKU. Drop the setting for ECC supported SKU.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c +7 -5
@@ -29,7 +29,7 @@#include "vega20_baco.h" #include "vega20_smumgr.h" - +#include "amdgpu_ras.h" static const struct soc15_baco_cmd_entry clean_baco_tbl[] = {
@@ -74,6 +74,7 @@ int vega20_baco_get_state(struct pp_hwmgr *hwmgr, enum BACO_STATE *state)int vega20_baco_set_state (struct pp_hwmgr *hwmgr,enum BACO_STATE state) {struct amdgpu_device *adev = (struct amdgpu_device *)(hwmgr->adev); +struct amdgpu_ras *ras =amdgpu_ras_get_context (adev);enum BACO_STATE cur_state;uint32_t data;
@@ -84,10 +85,11 @@ int vega20_baco_set_state(struct pp_hwmgr *hwmgr, enum BACO_STATE state)return 0 ;if (state ==BACO_STATE_IN ) { - data =RREG32_SOC15 (THM ,0 , mmTHM_BACO_CNTL); - data |=0x80000000 ; -WREG32_SOC15 (THM ,0 , mmTHM_BACO_CNTL, data); - +if (!ras || !ras->supported) { + data =RREG32_SOC15 (THM ,0 , mmTHM_BACO_CNTL); + data |=0x80000000 ; +WREG32_SOC15 (THM ,0 , mmTHM_BACO_CNTL, data); + }if (smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_EnterBaco,0 ))return -EINVAL ;
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/4 drm/amd/powerplay: send EnterBaco msg with argument as RAS recovery flag
In reply to a message not in the archive1 indicates RAS recovery flag in SMU FW.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_baco.c +8 -3
@@ -89,10 +89,15 @@ int vega20_baco_set_state(struct pp_hwmgr *hwmgr, enum BACO_STATE state) data =RREG32_SOC15 (THM ,0 , mmTHM_BACO_CNTL); data |=0x80000000 ;WREG32_SOC15 (THM ,0 , mmTHM_BACO_CNTL, data); - } -if (smum_send_msg_to_smc_with_parameter (hwmgr, PPSMC_MSG_EnterBaco,0 )) -return -EINVAL ; +if (smum_send_msg_to_smc_with_parameter (hwmgr, + PPSMC_MSG_EnterBaco,0 )) +return -EINVAL ; + }else { +if (smum_send_msg_to_smc_with_parameter (hwmgr, + PPSMC_MSG_EnterBaco,1 )) +return -EINVAL ; + } }else if (state ==BACO_STATE_OUT ) {if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ExitBaco))
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/4 drm/amd/powerplay: add BACO platformCaps for VEGA20
In reply to a message not in the archiveBACO reset is needed for RAS recovery.
--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +3 -0
@@ -183,6 +183,9 @@ static int vega20_set_features_platform_caps(struct pp_hwmgr *hwmgr) PHM_PlatformCaps_TablelessHardwareInterface);phm_cap_set (hwmgr->platform_descriptor.platformCaps, + PHM_PlatformCaps_BACO); + +phm_cap_set (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_EnableSMU7ThermalManagement);if (adev->pg_flags &AMD_PG_SUPPORT_UVD )
Signature · 6 lines
2.7.4 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
A message that is not in the archive (sent off-list or not yet received): 1570792228-11189-4-git-send-email-le.ma-5C7GfCeVMHo@public.gmane.org
Alex Deucher
Reviewed-byRe: [PATCH 4/4] drm/amd/powerplay: add BACO platformCaps for VEGA20
Series is:
Quoted 26 lines · On Fri, Oct 11, 2019 at 7:10 AM Le Ma <[email protected]> wrote:
BACO reset is needed for RAS recovery.
Change-Id I8207fc314744468c89ba4a030cb2bb15b082aac7Signed-off-by Le Ma <[email protected]>--- drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c | 3 +++ 1 file changed, 3 insertions(+)drivers/gpu/drm/amd/powerplay/hwmgr/vega20_hwmgr.c +3
-1@@ -183,6 +183,9 @@ static int vega20_set_features_platform_caps(struct pp_hwmgr *hwmgr) PHM_PlatformCaps_TablelessHardwareInterface);phm_cap_set (hwmgr->platform_descriptor.platformCaps, + PHM_PlatformCaps_BACO); + +phm_cap_set (hwmgr->platform_descriptor.platformCaps, PHM_PlatformCaps_EnableSMU7ThermalManagement);if (adev->pg_flags &AMD_PG_SUPPORT_UVD ) --2.7.4
Quoted 4 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Zhang, Hawking
Reviewed-by Hawking ZhangSeries is
Regards,
Hawking
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Le Ma
Sent: 2019年10月11日 19:10
To: [email protected]
Cc: Ma, Le <[email protected]>
Subject: [PATCH 1/4] drm/amdgpu/soc15: disable doorbell interrupt as part of BACO entry sequence
Workaround to make RAS recovery work in BACO reset.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 ++ drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 8 ++++++++ drivers/gpu/drm/amd/amdgpu/soc15.c | 9 +++++++++ 3 files changed, 19 insertions(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h +2 -0
@@ -67,6 +67,8 @@ struct amdgpu_nbio_funcs { bool enable);void (*ih_doorbell_range)(struct amdgpu_device *adev,bool use_doorbell,int doorbell_index); +void (*enable_doorbell_interrupt)(struct amdgpu_device *adev, +bool enable);void (*update_medium_grain_clock_gating)(struct amdgpu_device *adev,bool enable); void (*update_medium_grain_light_sleep)(struct amdgpu_device *adev, diff --git a/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c b/drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c
index 238c248..0db458f 100644
drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c +7 -0
@@ -502,6 +502,13 @@ static void nbio_v7_4_query_ras_error_count(struct amdgpu_device *adev, } } +static void nbio_v7_4_enable_doorbell_interrupt (struct amdgpu_device *adev, +bool enable) +{ +WREG32_FIELD15 (NBIO ,0 ,BIF_DOORBELL_INT_CNTL , +DOORBELL_INTERRUPT_DISABLE , enable ?0 :1 ); } +const struct amdgpu_nbio_funcs nbio_v7_4_funcs = { .get_hdp_flush_req_offset = nbio_v7_4_get_hdp_flush_req_offset, .get_hdp_flush_done_offset = nbio_v7_4_get_hdp_flush_done_offset,
@@ -516,6 +523,7 @@ const struct amdgpu_nbio_funcs nbio_v7_4_funcs = { .enable_doorbell_aperture = nbio_v7_4_enable_doorbell_aperture, .enable_doorbell_selfring_aperture = nbio_v7_4_enable_doorbell_selfring_aperture, .ih_doorbell_range = nbio_v7_4_ih_doorbell_range, + .enable_doorbell_interrupt = nbio_v7_4_enable_doorbell_interrupt, .update_medium_grain_clock_gating = nbio_v7_4_update_medium_grain_clock_gating, .update_medium_grain_light_sleep = nbio_v7_4_update_medium_grain_light_sleep, .get_clockgating_state = nbio_v7_4_get_clockgating_state, diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index fc6cfbc..5cf5f11 100644
drivers/gpu/drm/amd/amdgpu/soc15.c +9 -0
@@ -493,10 +493,15 @@ static int soc15_asic_baco_reset(struct amdgpu_device *adev) {void *pp_handle = adev->powerplay.pp_handle;const struct amd_pm_funcs *pp_funcs = adev->powerplay.pp_funcs; +struct amdgpu_ras *ras =amdgpu_ras_get_context (adev);if (!pp_funcs ||!pp_funcs->get_asic_baco_state ||!pp_funcs->set_asic_baco_state)return -ENOENT ; +/* avoid NBIF got stuck when do RAS recovery in BACO reset */ +if (ras && ras->supported) + adev->nbio.funcs->enable_doorbell_interrupt (adev, false); +/* enter BACO state */ if (pp_funcs->set_asic_baco_state (pp_handle,1 ))return -EIO ;
@@ -505,6 +510,10 @@ static int soc15_asic_baco_reset(struct amdgpu_device *adev)if (pp_funcs->set_asic_baco_state (pp_handle,0 ))return -EIO ; +/* re-enable doorbell interrupt after BACO exit */ +if (ras && ras->supported) + adev->nbio.funcs->enable_doorbell_interrupt (adev, true); +dev_info (adev->dev,"GPU BACO reset\n" ); adev->in_baco_reset =1 ;
--
2.7.4
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx