drm/amd/powerplay: add SMU mode1 reset
Subsystems (2)
PATCH 1/4 drm/amd/powerplay: add SMU mode1 reset
From PM FW 58.26.0 for sienna cichlid, SMU mode1 reset is support, driver sends PPSMC_MSG_Mode1Reset message to PM FW could trigger this reset.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 37 +++++++++++++++++++ .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 4 ++ drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 1 + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 2 + .../drm/amd/powerplay/sienna_cichlid_ppt.c | 29 ++++++++++++++- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 11 ++++++ 6 files changed, 82 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +37 -0
@@ -2737,6 +2737,43 @@ int smu_baco_exit(struct smu_context *smu)return ret; } +bool smu_mode1_reset_is_support (struct smu_context *smu) +{ +bool ret = false; + +if (!smu->pm_enabled) +return false; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs && smu->ppt_funcs->mode1_reset_is_support) + ret = smu->ppt_funcs->mode1_reset_is_support (smu); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_mode1_reset (struct smu_context *smu) +{ +int ret =0 ; + +if (!smu->pm_enabled) +return -EOPNOTSUPP ; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->mode1_reset) + ret = smu->ppt_funcs->mode1_reset (smu); + +mutex_unlock (&smu->mutex); + +if (ret) +dev_err (smu->adev->dev,"Mode1 reset failed!\n" ); + +return ret; +} +int smu_mode2_reset (struct smu_context *smu) {int ret =0 ;
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +4 -0
@@ -561,6 +561,8 @@ struct pptable_funcs {int (*baco_set_state)(struct smu_context *smu,enum smu_baco_state state);int (*baco_enter)(struct smu_context *smu);int (*baco_exit)(struct smu_context *smu); +bool (*mode1_reset_is_support)(struct smu_context *smu); +int (*mode1_reset)(struct smu_context *smu);int (*mode2_reset)(struct smu_context *smu);int (*get_dpm_ultimate_freq)(struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max);int (*set_soft_freq_limited_range)(struct smu_context *smu,enum smu_clk_type clk_type,uint32_t min,uint32_t max);
@@ -672,6 +674,8 @@ int smu_baco_get_state(struct smu_context *smu, enum smu_baco_state *state);int smu_baco_enter (struct smu_context *smu);int smu_baco_exit (struct smu_context *smu); +bool smu_mode1_reset_is_support (struct smu_context *smu); +int smu_mode1_reset (struct smu_context *smu);int smu_mode2_reset (struct smu_context *smu); extern int smu_get_atom_data_table(struct smu_context *smu, uint32_t table,
drivers/gpu/drm/amd/powerplay/inc/smu_types.h +1 -0
@@ -173,6 +173,7 @@__SMU_DUMMY_MAP (GmiPwrDnControl), \__SMU_DUMMY_MAP (DAL_DISABLE_DUMMY_PSTATE_CHANGE ), \__SMU_DUMMY_MAP (DAL_ENABLE_DUMMY_PSTATE_CHANGE ), \ +__SMU_DUMMY_MAP (Mode1Reset), \ #undef __SMU_DUMMY_MAP#define __SMU_DUMMY_MAP (type) SMU_MSG_##type
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +2 -0
@@ -252,6 +252,8 @@ int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state)int smu_v11_0_baco_enter (struct smu_context *smu);int smu_v11_0_baco_exit (struct smu_context *smu); +int smu_v11_0_mode1_reset (struct smu_context *smu); +int smu_v11_0_get_dpm_ultimate_freq (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max);
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +27 -2
@@ -39,8 +39,8 @@#include "nbio/nbio_2_3_sh_mask.h" #include "thm/thm_11_0_2_offset.h" #include "thm/thm_11_0_2_sh_mask.h" - -#include "asic_reg/mp/mp_11_0_sh_mask.h" +#include "mp/mp_11_0_offset.h" +#include "mp/mp_11_0_sh_mask.h" /* * DO NOT use these for err/warn/info/debug messages.
@@ -116,6 +116,7 @@ static struct smu_11_0_cmn2aisc_mapping sienna_cichlid_message_map[SMU_MSG_MAX_CMSG_MAP (PowerDownJpeg, PPSMC_MSG_PowerDownJpeg),MSG_MAP (BacoAudioD3PME, PPSMC_MSG_BacoAudioD3PME),MSG_MAP (ArmD3, PPSMC_MSG_ArmD3), + MSG_MAP(Mode1Reset, PPSMC_MSG_Mode1Reset), }; static struct smu_11_0_cmn2aisc_mapping sienna_cichlid_clk_map[SMU_CLK_COUNT] = {
@@ -1767,6 +1768,28 @@ static bool sienna_cichlid_is_baco_supported(struct smu_context *smu)return (val &RCC_BIF_STRAP0__STRAP_PX_CAPABLE_MASK ) ? true : false; } +static bool sienna_cichlid_is_mode1_reset_supported (struct smu_context *smu) +{ +struct amdgpu_device *adev = smu->adev; +uint32_t val; +u32 smu_version; + +/** +* SRIOV env will not support SMU mode1 reset +* PM FW support mode1 reset from 58.26 +*/ +smu_get_smc_version (smu,NULL , &smu_version); +if (amdgpu_sriov_vf (adev) || (smu_version <0x003a1a00 )) +return false; + +/** +* mode1 reset relies on PSP, so we should check if +* PSP is alive. +*/ + val =RREG32_SOC15 (MP0 ,0 , mmMP0_SMN_C2PMSG_81); +return val !=0x0 ; +} +static int sienna_cichlid_set_thermal_range (struct smu_context *smu,struct smu_temperature_range range) {
@@ -2538,6 +2561,8 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = { .baco_set_state = smu_v11_0_baco_set_state, .baco_enter = smu_v11_0_baco_enter, .baco_exit = smu_v11_0_baco_exit, + .mode1_reset_is_support = sienna_cichlid_is_mode1_reset_supported, + .mode1_reset = smu_v11_0_mode1_reset, .get_dpm_ultimate_freq = sienna_cichlid_get_dpm_ultimate_freq, .set_soft_freq_limited_range = sienna_cichlid_set_soft_freq_limited_range, .override_pcie_parameters = smu_v11_0_override_pcie_parameters,
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +11 -0
@@ -1741,6 +1741,17 @@ int smu_v11_0_baco_exit(struct smu_context *smu)return ret; } +int smu_v11_0_mode1_reset (struct smu_context *smu) +{ +int ret =0 ; + + ret =smu_send_smc_msg (smu, SMU_MSG_Mode1Reset,NULL ); +if (!ret) +msleep (500 ); + +return ret; +} +int smu_v11_0_get_dpm_ultimate_freq (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max) {
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/4 drm/amdgpu: add psp mode1 reset mode
AMD_RESET_METHOD_MODE1 will be used by SMU mode1 reset for sienna cichlid, so add AMD_RESET_METHOD_PSP_MODE1 for psp mode1 reset.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/nv.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/soc15.c | 6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -1
@@ -580,7 +580,8 @@ enum amd_reset_method {AMD_RESET_METHOD_MODE0 ,AMD_RESET_METHOD_MODE1 ,AMD_RESET_METHOD_MODE2 , - AMD_RESET_METHOD_BACO +AMD_RESET_METHOD_BACO , + AMD_RESET_METHOD_PSP_MODE1, };/*
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -3
@@ -2119,7 +2119,7 @@ static bool amdgpu_device_check_vram_lost(struct amdgpu_device *adev)*/ switch (amdgpu_asic_reset_method (adev)) {case AMD_RESET_METHOD_BACO : -case AMD_RESET_METHOD_MODE1 : +case AMD_RESET_METHOD_PSP_MODE1 :return true;default :return false;
@@ -4174,7 +4174,7 @@ static bool amdgpu_device_lock_adev(struct amdgpu_device *adev, bool trylock)atomic_inc (&adev->gpu_reset_counter); adev->in_gpu_reset = true;switch (amdgpu_asic_reset_method (adev)) { -case AMD_RESET_METHOD_MODE1 : +case AMD_RESET_METHOD_PSP_MODE1 : adev->mp1_state =PP_MP1_STATE_SHUTDOWN ;break ;case AMD_RESET_METHOD_MODE2 :
@@ -4220,7 +4220,7 @@ static int amdgpu_device_suspend_display_audio(struct amdgpu_device *adev)*/ reset_method =amdgpu_asic_reset_method (adev);if ((reset_method !=AMD_RESET_METHOD_BACO ) && - (reset_method !=AMD_RESET_METHOD_MODE1 )) + (reset_method !=AMD_RESET_METHOD_PSP_MODE1 ))return -EINVAL ; p = pci_get_domain_bus_and_slot(pci_domain_nr(adev->pdev->bus),
drivers/gpu/drm/amd/amdgpu/nv.c +3 -3
@@ -265,7 +265,7 @@ static int nv_asic_mode1_reset(struct amdgpu_device *adev)amdgpu_atombios_scratch_regs_engine_hung (adev, true); -dev_info (adev->dev,"GPU mode1 reset\n" ); +dev_info (adev->dev,"GPU psp mode1 reset\n" );/* disable BM */ pci_clear_master (adev->pdev);
@@ -274,7 +274,7 @@ static int nv_asic_mode1_reset(struct amdgpu_device *adev) ret =psp_gpu_reset (adev);if (ret) -dev_err (adev->dev,"GPU mode1 reset failed\n" ); +dev_err (adev->dev,"GPU psp mode1 reset failed\n" );pci_restore_state (adev->pdev);
@@ -310,7 +310,7 @@ nv_asic_reset_method(struct amdgpu_device *adev)if (!amdgpu_sriov_vf (adev) &&smu_baco_is_support (smu))return AMD_RESET_METHOD_BACO ;else -return AMD_RESET_METHOD_MODE1 ; +return AMD_RESET_METHOD_PSP_MODE1 ; }static int nv_asic_reset (struct amdgpu_device *adev)
drivers/gpu/drm/amd/amdgpu/soc15.c +3 -3
@@ -479,7 +479,7 @@ static int soc15_asic_mode1_reset(struct amdgpu_device *adev)amdgpu_atombios_scratch_regs_engine_hung (adev, true); -dev_info (adev->dev,"GPU mode1 reset\n" ); +dev_info (adev->dev,"GPU psp mode1 reset\n" );/* disable BM */ pci_clear_master (adev->pdev);
@@ -488,7 +488,7 @@ static int soc15_asic_mode1_reset(struct amdgpu_device *adev) ret =psp_gpu_reset (adev);if (ret) -dev_err (adev->dev,"GPU mode1 reset failed\n" ); +dev_err (adev->dev,"GPU psp mode1 reset failed\n" );pci_restore_state (adev->pdev);
@@ -559,7 +559,7 @@ soc15_asic_reset_method(struct amdgpu_device *adev)if (baco_reset)return AMD_RESET_METHOD_BACO ;else -return AMD_RESET_METHOD_MODE1 ; +return AMD_RESET_METHOD_PSP_MODE1 ; }static int soc15_asic_reset (struct amdgpu_device *adev)
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 2/4] drm/amdgpu: add psp mode1 reset mode
[AMD Public Use]
Hi @Sheng, Wenhui,
I'm thinking of hiding the MP0/MP1 mode 1 reset under AMD_RESET_METHOD_MODE1. the callback function reset is per ASIC function, where nv_asic_reset and soc15_aisc_reset serve for NV series and pre-NV series respectively.
The new mode 1 reset will be used starting from sienna_cichlid. It should be quite strait forward for us to either initialize a flag like is_smu_support_mode1 during sw_init or even check the asic_type in nv_asic_mode1_reset to decide whether we use psp_gpu_reset or smu_gpu_reset.etc.
That's saying, we don't need to change the reset_method interface, where we decide whether we go to BACO/mode reset/pci config space reset.etc. We just differentiate the approach (i.e. psp or smu) in nv_asic_mode1_reset.
Thoughts?
Regards,
Hawking
-----Original Message-----
From: Sheng, Wenhui <[email protected]>
Sent: Friday, July 10, 2020 13:46
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Sheng, Wenhui <[email protected]>; Gao, Likun <[email protected]>
Subject: [PATCH 2/4] drm/amdgpu: add psp mode1 reset mode
AMD_RESET_METHOD_MODE1 will be used by SMU
mode1 reset for sienna cichlid, so addAMD_RESET_METHOD_PSP_MODE1 for psp mode1 reset.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/nv.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/soc15.c | 6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -1
@@ -580,7 +580,8 @@ enum amd_reset_method {AMD_RESET_METHOD_MODE0 ,AMD_RESET_METHOD_MODE1 ,AMD_RESET_METHOD_MODE2 , - AMD_RESET_METHOD_BACO +AMD_RESET_METHOD_BACO , + AMD_RESET_METHOD_PSP_MODE1, };/*
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -3
@@ -2119,7 +2119,7 @@ static bool amdgpu_device_check_vram_lost(struct amdgpu_device *adev)*/ switch (amdgpu_asic_reset_method (adev)) {case AMD_RESET_METHOD_BACO : -case AMD_RESET_METHOD_MODE1 : +case AMD_RESET_METHOD_PSP_MODE1 :return true;default :return false;
@@ -4174,7 +4174,7 @@ static bool amdgpu_device_lock_adev(struct amdgpu_device *adev, bool trylock)atomic_inc (&adev->gpu_reset_counter); adev->in_gpu_reset = true;switch (amdgpu_asic_reset_method (adev)) { -case AMD_RESET_METHOD_MODE1 : +case AMD_RESET_METHOD_PSP_MODE1 : adev->mp1_state =PP_MP1_STATE_SHUTDOWN ;break ;case AMD_RESET_METHOD_MODE2 :
@@ -4220,7 +4220,7 @@ static int amdgpu_device_suspend_display_audio(struct amdgpu_device *adev)*/ reset_method =amdgpu_asic_reset_method (adev);if ((reset_method !=AMD_RESET_METHOD_BACO ) && - (reset_method !=AMD_RESET_METHOD_MODE1 )) + (reset_method !=AMD_RESET_METHOD_PSP_MODE1 ))return -EINVAL ; p = pci_get_domain_bus_and_slot(pci_domain_nr(adev->pdev->bus),
drivers/gpu/drm/amd/amdgpu/nv.c +3 -3
@@ -265,7 +265,7 @@ static int nv_asic_mode1_reset(struct amdgpu_device *adev)amdgpu_atombios_scratch_regs_engine_hung (adev, true); -dev_info (adev->dev,"GPU mode1 reset\n" ); +dev_info (adev->dev,"GPU psp mode1 reset\n" );/* disable BM */ pci_clear_master (adev->pdev);
@@ -274,7 +274,7 @@ static int nv_asic_mode1_reset(struct amdgpu_device *adev) ret =psp_gpu_reset (adev);if (ret) -dev_err (adev->dev,"GPU mode1 reset failed\n" ); +dev_err (adev->dev,"GPU psp mode1 reset failed\n" );pci_restore_state (adev->pdev);
@@ -310,7 +310,7 @@ nv_asic_reset_method(struct amdgpu_device *adev)if (!amdgpu_sriov_vf (adev) &&smu_baco_is_support (smu))return AMD_RESET_METHOD_BACO ;else -return AMD_RESET_METHOD_MODE1 ; +return AMD_RESET_METHOD_PSP_MODE1 ; } static int nv_asic_reset(struct amdgpu_device *adev) diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 8c739b285915..86ce2f165038 100644
drivers/gpu/drm/amd/amdgpu/soc15.c +3 -3
@@ -479,7 +479,7 @@ static int soc15_asic_mode1_reset(struct amdgpu_device *adev)amdgpu_atombios_scratch_regs_engine_hung (adev, true); -dev_info (adev->dev,"GPU mode1 reset\n" ); +dev_info (adev->dev,"GPU psp mode1 reset\n" );/* disable BM */ pci_clear_master (adev->pdev);
@@ -488,7 +488,7 @@ static int soc15_asic_mode1_reset(struct amdgpu_device *adev) ret =psp_gpu_reset (adev);if (ret) -dev_err (adev->dev,"GPU mode1 reset failed\n" ); +dev_err (adev->dev,"GPU psp mode1 reset failed\n" );pci_restore_state (adev->pdev);
@@ -559,7 +559,7 @@ soc15_asic_reset_method(struct amdgpu_device *adev)if (baco_reset)return AMD_RESET_METHOD_BACO ;else -return AMD_RESET_METHOD_MODE1 ; +return AMD_RESET_METHOD_PSP_MODE1 ; }static int soc15_asic_reset (struct amdgpu_device *adev)
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 2/4] drm/amdgpu: add psp mode1 reset mode
[AMD Public Use]
Hi @Zhang, Hawking
I tried to hide mp0/mp1 mode1 reset under AMD_RESET_METHOD_MODE1, while it seems that we need to tackle the difference in function amdgpu_device_gpu_recover, like following change in 3rd patch:
@@ -4275,16 +4277,18 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
struct amdgpu_device *tmp_adev = NULL;
int i, r = 0;
bool in_ras_intr = amdgpu_ras_intr_triggered();
- bool use_baco =
- (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) ?
- true : false;
+ bool is_full_reset = false;
bool audio_suspended = false;
+ if ((amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) ||
+ (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_MODE1))
+ is_full_reset = true;
That's the reason I add new AMD_RESET_METHOD_PSP_MODE1.
Brs
Wenhui
-----Original Message-----
From: Zhang, Hawking <[email protected]>
Sent: Friday, July 10, 2020 2:35 PM
To: Sheng, Wenhui <[email protected]>; [email protected]
Cc: Gao, Likun <[email protected]>
Subject: RE: [PATCH 2/4] drm/amdgpu: add psp mode1 reset mode
[AMD Public Use]
Hi @Sheng, Wenhui,
I'm thinking of hiding the MP0/MP1 mode 1 reset under AMD_RESET_METHOD_MODE1. the callback function reset is per ASIC function, where nv_asic_reset and soc15_aisc_reset serve for NV series and pre-NV series respectively.
The new mode 1 reset will be used starting from sienna_cichlid. It should be quite strait forward for us to either initialize a flag like is_smu_support_mode1 during sw_init or even check the asic_type in nv_asic_mode1_reset to decide whether we use psp_gpu_reset or smu_gpu_reset.etc.
That's saying, we don't need to change the reset_method interface, where we decide whether we go to BACO/mode reset/pci config space reset.etc. We just differentiate the approach (i.e. psp or smu) in nv_asic_mode1_reset.
Thoughts?
Regards,
Hawking
-----Original Message-----
From: Sheng, Wenhui <[email protected]>
Sent: Friday, July 10, 2020 13:46
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Sheng, Wenhui <[email protected]>; Gao, Likun <[email protected]>
Subject: [PATCH 2/4] drm/amdgpu: add psp mode1 reset mode
AMD_RESET_METHOD_MODE1 will be used by SMU
mode1 reset for sienna cichlid, so addAMD_RESET_METHOD_PSP_MODE1 for psp mode1 reset.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/nv.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/soc15.c | 6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -1
@@ -580,7 +580,8 @@ enum amd_reset_method {AMD_RESET_METHOD_MODE0 ,AMD_RESET_METHOD_MODE1 ,AMD_RESET_METHOD_MODE2 , - AMD_RESET_METHOD_BACO +AMD_RESET_METHOD_BACO , + AMD_RESET_METHOD_PSP_MODE1, };/*
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -3
@@ -2119,7 +2119,7 @@ static bool amdgpu_device_check_vram_lost(struct amdgpu_device *adev)*/ switch (amdgpu_asic_reset_method (adev)) {case AMD_RESET_METHOD_BACO : -case AMD_RESET_METHOD_MODE1 : +case AMD_RESET_METHOD_PSP_MODE1 :return true;default :return false;
@@ -4174,7 +4174,7 @@ static bool amdgpu_device_lock_adev(struct amdgpu_device *adev, bool trylock)atomic_inc (&adev->gpu_reset_counter); adev->in_gpu_reset = true;switch (amdgpu_asic_reset_method (adev)) { -case AMD_RESET_METHOD_MODE1 : +case AMD_RESET_METHOD_PSP_MODE1 : adev->mp1_state =PP_MP1_STATE_SHUTDOWN ;break ;case AMD_RESET_METHOD_MODE2 :
@@ -4220,7 +4220,7 @@ static int amdgpu_device_suspend_display_audio(struct amdgpu_device *adev)*/ reset_method =amdgpu_asic_reset_method (adev);if ((reset_method !=AMD_RESET_METHOD_BACO ) && - (reset_method !=AMD_RESET_METHOD_MODE1 )) + (reset_method !=AMD_RESET_METHOD_PSP_MODE1 ))return -EINVAL ; p = pci_get_domain_bus_and_slot(pci_domain_nr(adev->pdev->bus),
drivers/gpu/drm/amd/amdgpu/nv.c +3 -3
@@ -265,7 +265,7 @@ static int nv_asic_mode1_reset(struct amdgpu_device *adev)amdgpu_atombios_scratch_regs_engine_hung (adev, true); -dev_info (adev->dev,"GPU mode1 reset\n" ); +dev_info (adev->dev,"GPU psp mode1 reset\n" );/* disable BM */ pci_clear_master (adev->pdev);
@@ -274,7 +274,7 @@ static int nv_asic_mode1_reset(struct amdgpu_device *adev) ret =psp_gpu_reset (adev);if (ret) -dev_err (adev->dev,"GPU mode1 reset failed\n" ); +dev_err (adev->dev,"GPU psp mode1 reset failed\n" );pci_restore_state (adev->pdev);
@@ -310,7 +310,7 @@ nv_asic_reset_method(struct amdgpu_device *adev)if (!amdgpu_sriov_vf (adev) &&smu_baco_is_support (smu))return AMD_RESET_METHOD_BACO ;else -return AMD_RESET_METHOD_MODE1 ; +return AMD_RESET_METHOD_PSP_MODE1 ; } static int nv_asic_reset(struct amdgpu_device *adev) diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 8c739b285915..86ce2f165038 100644
drivers/gpu/drm/amd/amdgpu/soc15.c +3 -3
@@ -479,7 +479,7 @@ static int soc15_asic_mode1_reset(struct amdgpu_device *adev)amdgpu_atombios_scratch_regs_engine_hung (adev, true); -dev_info (adev->dev,"GPU mode1 reset\n" ); +dev_info (adev->dev,"GPU psp mode1 reset\n" );/* disable BM */ pci_clear_master (adev->pdev);
@@ -488,7 +488,7 @@ static int soc15_asic_mode1_reset(struct amdgpu_device *adev) ret =psp_gpu_reset (adev);if (ret) -dev_err (adev->dev,"GPU mode1 reset failed\n" ); +dev_err (adev->dev,"GPU psp mode1 reset failed\n" );pci_restore_state (adev->pdev);
@@ -559,7 +559,7 @@ soc15_asic_reset_method(struct amdgpu_device *adev)if (baco_reset)return AMD_RESET_METHOD_BACO ;else -return AMD_RESET_METHOD_MODE1 ; +return AMD_RESET_METHOD_PSP_MODE1 ; }static int soc15_asic_reset (struct amdgpu_device *adev)
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 2/4] drm/amdgpu: add psp mode1 reset mode
[AMD Public Use]
Hi @Sheng, Wenhui,
Regarding the following corner cases that need to differentiate legacy mode 1 and new mode 1
1). Emergency start
Create a new function in amdgpu_ras.c, called amdgpu_ras_emergency_start, where only execute the emergency start for the following configuration Vega20 with PMFW version < 0x284300
2). the use_baco logic in amdgpu_device_gpu_recovery
The remaining (in_ras_intr && !use_baco) are all serving for the emergency start case. we use in_emergency_start or other proper name to replace use_baco
3). the use_baco logic in amdgpu_device_suspend_display_audio
It's safe to unified legacy mode 1 and new mode 1 to AMD_RESET_METHOD_MODE1. The same behavior from driver perspective
4). Issue PP_MP1_STATE_SHUTDOWN (i.e. PrepareMp1ForShutdown) in suspend
Same as 3). PrepareMp1ForShutdown is require for the new mode 1 reset as well. Please try it
Regards,
Hawking
-----Original Message-----
From: Sheng, Wenhui <[email protected]>
Sent: Friday, July 10, 2020 14:53
To: Zhang, Hawking <[email protected]>; [email protected]
Cc: Gao, Likun <[email protected]>
Subject: RE: [PATCH 2/4] drm/amdgpu: add psp mode1 reset mode
[AMD Public Use]
Hi @Zhang, Hawking
I tried to hide mp0/mp1 mode1 reset under AMD_RESET_METHOD_MODE1, while it seems that we need to tackle the difference in function amdgpu_device_gpu_recover, like following change in 3rd patch:
@@ -4275,16 +4277,18 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
struct amdgpu_device *tmp_adev = NULL;
int i, r = 0;
bool in_ras_intr = amdgpu_ras_intr_triggered();
- bool use_baco =
- (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) ?
- true : false;
+ bool is_full_reset = false;
bool audio_suspended = false;
+ if ((amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) ||
+ (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_MODE1))
+ is_full_reset = true;
That's the reason I add new AMD_RESET_METHOD_PSP_MODE1.
Brs
Wenhui
-----Original Message-----
From: Zhang, Hawking <[email protected]>
Sent: Friday, July 10, 2020 2:35 PM
To: Sheng, Wenhui <[email protected]>; [email protected]
Cc: Gao, Likun <[email protected]>
Subject: RE: [PATCH 2/4] drm/amdgpu: add psp mode1 reset mode
[AMD Public Use]
Hi @Sheng, Wenhui,
I'm thinking of hiding the MP0/MP1 mode 1 reset under AMD_RESET_METHOD_MODE1. the callback function reset is per ASIC function, where nv_asic_reset and soc15_aisc_reset serve for NV series and pre-NV series respectively.
The new mode 1 reset will be used starting from sienna_cichlid. It should be quite strait forward for us to either initialize a flag like is_smu_support_mode1 during sw_init or even check the asic_type in nv_asic_mode1_reset to decide whether we use psp_gpu_reset or smu_gpu_reset.etc.
That's saying, we don't need to change the reset_method interface, where we decide whether we go to BACO/mode reset/pci config space reset.etc. We just differentiate the approach (i.e. psp or smu) in nv_asic_mode1_reset.
Thoughts?
Regards,
Hawking
-----Original Message-----
From: Sheng, Wenhui <[email protected]>
Sent: Friday, July 10, 2020 13:46
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Sheng, Wenhui <[email protected]>; Gao, Likun <[email protected]>
Subject: [PATCH 2/4] drm/amdgpu: add psp mode1 reset mode
AMD_RESET_METHOD_MODE1 will be used by SMU
mode1 reset for sienna cichlid, so addAMD_RESET_METHOD_PSP_MODE1 for psp mode1 reset.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/nv.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/soc15.c | 6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -1
@@ -580,7 +580,8 @@ enum amd_reset_method {AMD_RESET_METHOD_MODE0 ,AMD_RESET_METHOD_MODE1 ,AMD_RESET_METHOD_MODE2 , - AMD_RESET_METHOD_BACO +AMD_RESET_METHOD_BACO , + AMD_RESET_METHOD_PSP_MODE1, };/*
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -3
@@ -2119,7 +2119,7 @@ static bool amdgpu_device_check_vram_lost(struct amdgpu_device *adev)*/ switch (amdgpu_asic_reset_method (adev)) {case AMD_RESET_METHOD_BACO : -case AMD_RESET_METHOD_MODE1 : +case AMD_RESET_METHOD_PSP_MODE1 :return true;default :return false;
@@ -4174,7 +4174,7 @@ static bool amdgpu_device_lock_adev(struct amdgpu_device *adev, bool trylock)atomic_inc (&adev->gpu_reset_counter); adev->in_gpu_reset = true;switch (amdgpu_asic_reset_method (adev)) { -case AMD_RESET_METHOD_MODE1 : +case AMD_RESET_METHOD_PSP_MODE1 : adev->mp1_state =PP_MP1_STATE_SHUTDOWN ;break ;case AMD_RESET_METHOD_MODE2 :
@@ -4220,7 +4220,7 @@ static int amdgpu_device_suspend_display_audio(struct amdgpu_device *adev)*/ reset_method =amdgpu_asic_reset_method (adev);if ((reset_method !=AMD_RESET_METHOD_BACO ) && - (reset_method !=AMD_RESET_METHOD_MODE1 )) + (reset_method !=AMD_RESET_METHOD_PSP_MODE1 ))return -EINVAL ; p = pci_get_domain_bus_and_slot(pci_domain_nr(adev->pdev->bus),
drivers/gpu/drm/amd/amdgpu/nv.c +3 -3
@@ -265,7 +265,7 @@ static int nv_asic_mode1_reset(struct amdgpu_device *adev)amdgpu_atombios_scratch_regs_engine_hung (adev, true); -dev_info (adev->dev,"GPU mode1 reset\n" ); +dev_info (adev->dev,"GPU psp mode1 reset\n" );/* disable BM */ pci_clear_master (adev->pdev);
@@ -274,7 +274,7 @@ static int nv_asic_mode1_reset(struct amdgpu_device *adev) ret =psp_gpu_reset (adev);if (ret) -dev_err (adev->dev,"GPU mode1 reset failed\n" ); +dev_err (adev->dev,"GPU psp mode1 reset failed\n" );pci_restore_state (adev->pdev);
@@ -310,7 +310,7 @@ nv_asic_reset_method(struct amdgpu_device *adev)if (!amdgpu_sriov_vf (adev) &&smu_baco_is_support (smu))return AMD_RESET_METHOD_BACO ;else -return AMD_RESET_METHOD_MODE1 ; +return AMD_RESET_METHOD_PSP_MODE1 ; } static int nv_asic_reset(struct amdgpu_device *adev) diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 8c739b285915..86ce2f165038 100644
drivers/gpu/drm/amd/amdgpu/soc15.c +3 -3
@@ -479,7 +479,7 @@ static int soc15_asic_mode1_reset(struct amdgpu_device *adev)amdgpu_atombios_scratch_regs_engine_hung (adev, true); -dev_info (adev->dev,"GPU mode1 reset\n" ); +dev_info (adev->dev,"GPU psp mode1 reset\n" );/* disable BM */ pci_clear_master (adev->pdev);
@@ -488,7 +488,7 @@ static int soc15_asic_mode1_reset(struct amdgpu_device *adev) ret =psp_gpu_reset (adev);if (ret) -dev_err (adev->dev,"GPU mode1 reset failed\n" ); +dev_err (adev->dev,"GPU psp mode1 reset failed\n" );pci_restore_state (adev->pdev);
@@ -559,7 +559,7 @@ soc15_asic_reset_method(struct amdgpu_device *adev)if (baco_reset)return AMD_RESET_METHOD_BACO ;else -return AMD_RESET_METHOD_MODE1 ; +return AMD_RESET_METHOD_PSP_MODE1 ; }static int soc15_asic_reset (struct amdgpu_device *adev)
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 2/4] drm/amdgpu: add psp mode1 reset mode
[AMD Public Use]
Got it, Thanks Hawking!
Brs
Wenhui
-----Original Message-----
From: Zhang, Hawking <[email protected]>
Sent: Friday, July 10, 2020 4:07 PM
To: Sheng, Wenhui <[email protected]>; [email protected]
Cc: Gao, Likun <[email protected]>
Subject: RE: [PATCH 2/4] drm/amdgpu: add psp mode1 reset mode
[AMD Public Use]
Hi @Sheng, Wenhui,
Regarding the following corner cases that need to differentiate legacy mode 1 and new mode 1
1). Emergency start
Create a new function in amdgpu_ras.c, called amdgpu_ras_emergency_start, where only execute the emergency start for the following configuration Vega20 with PMFW version < 0x284300
2). the use_baco logic in amdgpu_device_gpu_recovery The remaining (in_ras_intr && !use_baco) are all serving for the emergency start case. we use in_emergency_start or other proper name to replace use_baco
3). the use_baco logic in amdgpu_device_suspend_display_audio
It's safe to unified legacy mode 1 and new mode 1 to AMD_RESET_METHOD_MODE1. The same behavior from driver perspective
4). Issue PP_MP1_STATE_SHUTDOWN (i.e. PrepareMp1ForShutdown) in suspend Same as 3). PrepareMp1ForShutdown is require for the new mode 1 reset as well. Please try it
Regards,
Hawking
-----Original Message-----
From: Sheng, Wenhui <[email protected]>
Sent: Friday, July 10, 2020 14:53
To: Zhang, Hawking <[email protected]>; [email protected]
Cc: Gao, Likun <[email protected]>
Subject: RE: [PATCH 2/4] drm/amdgpu: add psp mode1 reset mode
[AMD Public Use]
Hi @Zhang, Hawking
I tried to hide mp0/mp1 mode1 reset under AMD_RESET_METHOD_MODE1, while it seems that we need to tackle the difference in function amdgpu_device_gpu_recover, like following change in 3rd patch:
@@ -4275,16 +4277,18 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,
struct amdgpu_device *tmp_adev = NULL;
int i, r = 0;
bool in_ras_intr = amdgpu_ras_intr_triggered();
- bool use_baco =
- (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) ?
- true : false;
+ bool is_full_reset = false;
bool audio_suspended = false;
+ if ((amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_BACO) ||
+ (amdgpu_asic_reset_method(adev) == AMD_RESET_METHOD_MODE1))
+ is_full_reset = true;
That's the reason I add new AMD_RESET_METHOD_PSP_MODE1.
Brs
Wenhui
-----Original Message-----
From: Zhang, Hawking <[email protected]>
Sent: Friday, July 10, 2020 2:35 PM
To: Sheng, Wenhui <[email protected]>; [email protected]
Cc: Gao, Likun <[email protected]>
Subject: RE: [PATCH 2/4] drm/amdgpu: add psp mode1 reset mode
[AMD Public Use]
Hi @Sheng, Wenhui,
I'm thinking of hiding the MP0/MP1 mode 1 reset under AMD_RESET_METHOD_MODE1. the callback function reset is per ASIC function, where nv_asic_reset and soc15_aisc_reset serve for NV series and pre-NV series respectively.
The new mode 1 reset will be used starting from sienna_cichlid. It should be quite strait forward for us to either initialize a flag like is_smu_support_mode1 during sw_init or even check the asic_type in nv_asic_mode1_reset to decide whether we use psp_gpu_reset or smu_gpu_reset.etc.
That's saying, we don't need to change the reset_method interface, where we decide whether we go to BACO/mode reset/pci config space reset.etc. We just differentiate the approach (i.e. psp or smu) in nv_asic_mode1_reset.
Thoughts?
Regards,
Hawking
-----Original Message-----
From: Sheng, Wenhui <[email protected]>
Sent: Friday, July 10, 2020 13:46
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Sheng, Wenhui <[email protected]>; Gao, Likun <[email protected]>
Subject: [PATCH 2/4] drm/amdgpu: add psp mode1 reset mode
AMD_RESET_METHOD_MODE1 will be used by SMU
mode1 reset for sienna cichlid, so addAMD_RESET_METHOD_PSP_MODE1 for psp mode1 reset.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 ++- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/nv.c | 6 +++--- drivers/gpu/drm/amd/amdgpu/soc15.c | 6 +++--- 4 files changed, 11 insertions(+), 10 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +2 -1
@@ -580,7 +580,8 @@ enum amd_reset_method {AMD_RESET_METHOD_MODE0 ,AMD_RESET_METHOD_MODE1 ,AMD_RESET_METHOD_MODE2 , - AMD_RESET_METHOD_BACO +AMD_RESET_METHOD_BACO , + AMD_RESET_METHOD_PSP_MODE1, };/*
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +3 -3
@@ -2119,7 +2119,7 @@ static bool amdgpu_device_check_vram_lost(struct amdgpu_device *adev)*/ switch (amdgpu_asic_reset_method (adev)) {case AMD_RESET_METHOD_BACO : -case AMD_RESET_METHOD_MODE1 : +case AMD_RESET_METHOD_PSP_MODE1 :return true;default :return false;
@@ -4174,7 +4174,7 @@ static bool amdgpu_device_lock_adev(struct amdgpu_device *adev, bool trylock)atomic_inc (&adev->gpu_reset_counter); adev->in_gpu_reset = true;switch (amdgpu_asic_reset_method (adev)) { -case AMD_RESET_METHOD_MODE1 : +case AMD_RESET_METHOD_PSP_MODE1 : adev->mp1_state =PP_MP1_STATE_SHUTDOWN ;break ;case AMD_RESET_METHOD_MODE2 :
@@ -4220,7 +4220,7 @@ static int amdgpu_device_suspend_display_audio(struct amdgpu_device *adev)*/ reset_method =amdgpu_asic_reset_method (adev);if ((reset_method !=AMD_RESET_METHOD_BACO ) && - (reset_method !=AMD_RESET_METHOD_MODE1 )) + (reset_method !=AMD_RESET_METHOD_PSP_MODE1 ))return -EINVAL ; p = pci_get_domain_bus_and_slot(pci_domain_nr(adev->pdev->bus),
drivers/gpu/drm/amd/amdgpu/nv.c +3 -3
@@ -265,7 +265,7 @@ static int nv_asic_mode1_reset(struct amdgpu_device *adev)amdgpu_atombios_scratch_regs_engine_hung (adev, true); -dev_info (adev->dev,"GPU mode1 reset\n" ); +dev_info (adev->dev,"GPU psp mode1 reset\n" );/* disable BM */ pci_clear_master (adev->pdev);
@@ -274,7 +274,7 @@ static int nv_asic_mode1_reset(struct amdgpu_device *adev) ret =psp_gpu_reset (adev);if (ret) -dev_err (adev->dev,"GPU mode1 reset failed\n" ); +dev_err (adev->dev,"GPU psp mode1 reset failed\n" );pci_restore_state (adev->pdev);
@@ -310,7 +310,7 @@ nv_asic_reset_method(struct amdgpu_device *adev)if (!amdgpu_sriov_vf (adev) &&smu_baco_is_support (smu))return AMD_RESET_METHOD_BACO ;else -return AMD_RESET_METHOD_MODE1 ; +return AMD_RESET_METHOD_PSP_MODE1 ; } static int nv_asic_reset(struct amdgpu_device *adev) diff --git a/drivers/gpu/drm/amd/amdgpu/soc15.c b/drivers/gpu/drm/amd/amdgpu/soc15.c
index 8c739b285915..86ce2f165038 100644
drivers/gpu/drm/amd/amdgpu/soc15.c +3 -3
@@ -479,7 +479,7 @@ static int soc15_asic_mode1_reset(struct amdgpu_device *adev)amdgpu_atombios_scratch_regs_engine_hung (adev, true); -dev_info (adev->dev,"GPU mode1 reset\n" ); +dev_info (adev->dev,"GPU psp mode1 reset\n" );/* disable BM */ pci_clear_master (adev->pdev);
@@ -488,7 +488,7 @@ static int soc15_asic_mode1_reset(struct amdgpu_device *adev) ret =psp_gpu_reset (adev);if (ret) -dev_err (adev->dev,"GPU mode1 reset failed\n" ); +dev_err (adev->dev,"GPU psp mode1 reset failed\n" );pci_restore_state (adev->pdev);
@@ -559,7 +559,7 @@ soc15_asic_reset_method(struct amdgpu_device *adev)if (baco_reset)return AMD_RESET_METHOD_BACO ;else -return AMD_RESET_METHOD_MODE1 ; +return AMD_RESET_METHOD_PSP_MODE1 ; }static int soc15_asic_reset (struct amdgpu_device *adev)
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 3/4 drm/amdgpu: enable mode1 reset
In reply to Wenhui ShengFor sienna cichlid, add mode1 reset path for sGPU.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 24 ++++++++------ drivers/gpu/drm/amd/amdgpu/nv.c | 32 +++++++++++++------ drivers/gpu/drm/amd/powerplay/navi10_ppt.c | 2 +- .../drm/amd/powerplay/sienna_cichlid_ppt.c | 2 +- 4 files changed, 39 insertions(+), 21 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +14 -10
@@ -2119,6 +2119,7 @@ static bool amdgpu_device_check_vram_lost(struct amdgpu_device *adev)*/ switch (amdgpu_asic_reset_method (adev)) {case AMD_RESET_METHOD_BACO : +case AMD_RESET_METHOD_MODE1 :case AMD_RESET_METHOD_PSP_MODE1 :return true;default :
@@ -4220,7 +4221,8 @@ static int amdgpu_device_suspend_display_audio(struct amdgpu_device *adev)*/ reset_method =amdgpu_asic_reset_method (adev);if ((reset_method !=AMD_RESET_METHOD_BACO ) && - (reset_method !=AMD_RESET_METHOD_PSP_MODE1 )) + (reset_method !=AMD_RESET_METHOD_PSP_MODE1 ) && + (reset_method !=AMD_RESET_METHOD_MODE1 ))return -EINVAL ; p = pci_get_domain_bus_and_slot(pci_domain_nr(adev->pdev->bus),
@@ -4275,16 +4277,18 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,struct amdgpu_device *tmp_adev =NULL ;int i, r =0 ;bool in_ras_intr =amdgpu_ras_intr_triggered (); -bool use_baco = - (amdgpu_asic_reset_method (adev) ==AMD_RESET_METHOD_BACO ) ? - true : false; +bool is_full_reset = false;bool audio_suspended = false; +if ((amdgpu_asic_reset_method (adev) ==AMD_RESET_METHOD_BACO ) || + (amdgpu_asic_reset_method (adev) ==AMD_RESET_METHOD_MODE1 )) + is_full_reset = true; +/* * Flush RAM to disk so that after reboot * the user can read log and see why the system rebooted. */ -if (in_ras_intr && !use_baco &&amdgpu_ras_get_context (adev)->reboot) { +if (in_ras_intr && !is_full_reset &&amdgpu_ras_get_context (adev)->reboot) {DRM_WARN ("Emergency reboot." );
@@ -4293,7 +4297,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, }dev_info (adev->dev,"GPU %s begin!\n" , - (in_ras_intr && !use_baco) ?"jobs stop" :"reset" ); + (in_ras_intr && !is_full_reset) ?"jobs stop" :"reset" );/* * Here we trylock to avoid chain of resets executing from
@@ -4365,7 +4369,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,amdgpu_fbdev_set_suspend (tmp_adev,1 );/* disable ras on ALL IPs */ -if (!(in_ras_intr && !use_baco) && +if (!(in_ras_intr && !is_full_reset) &&amdgpu_device_ip_need_full_reset (tmp_adev))amdgpu_ras_suspend (tmp_adev);
@@ -4377,12 +4381,12 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev,drm_sched_stop (&ring->sched, job ? &job->base :NULL ); -if (in_ras_intr && !use_baco) +if (in_ras_intr && !is_full_reset)amdgpu_job_stop_all_jobs_on_sched (&ring->sched); } } -if (in_ras_intr && !use_baco) +if (in_ras_intr && !is_full_reset) goto skip_sched_resume;/*
@@ -4459,7 +4463,7 @@ int amdgpu_device_gpu_recover(struct amdgpu_device *adev, skip_sched_resume:list_for_each_entry (tmp_adev, device_list_handle, gmc.xgmi.head) {/*unlock kfd: SRIOV would do it separately */ -if (!(in_ras_intr && !use_baco) && !amdgpu_sriov_vf (tmp_adev)) +if (!(in_ras_intr && !is_full_reset) && !amdgpu_sriov_vf (tmp_adev))amdgpu_amdkfd_post_reset (tmp_adev);if (audio_suspended)amdgpu_device_resume_display_audio (tmp_adev);
drivers/gpu/drm/amd/amdgpu/nv.c +23 -9
@@ -258,23 +258,32 @@ static int nv_read_register(struct amdgpu_device *adev, u32 se_num,return -EINVAL ; } -static int nv_asic_mode1_reset (struct amdgpu_device *adev) +static int nv_asic_mode1_reset (struct amdgpu_device *adev, +enum amd_reset_method reset_method) {u32 i;int ret =0 ;amdgpu_atombios_scratch_regs_engine_hung (adev, true); -dev_info (adev->dev,"GPU psp mode1 reset\n" ); +dev_info (adev->dev,"GPU %s reset\n" , + reset_method ==AMD_RESET_METHOD_MODE1 + ?"mode1" :"psp mode1" );/* disable BM */ pci_clear_master (adev->pdev);pci_save_state (adev->pdev); - ret =psp_gpu_reset (adev); +if (reset_method ==AMD_RESET_METHOD_MODE1 ) + ret =smu_mode1_reset (&adev->smu); +else + ret =psp_gpu_reset (adev); +if (ret) -dev_err (adev->dev,"GPU psp mode1 reset failed\n" ); +dev_err (adev->dev,"GPU %s reset failed\n" , + reset_method ==AMD_RESET_METHOD_MODE1 + ?"mode1" :"psp mode1" );pci_restore_state (adev->pdev);
@@ -307,8 +316,10 @@ nv_asic_reset_method(struct amdgpu_device *adev) {struct smu_context *smu = &adev->smu; -if (!amdgpu_sriov_vf (adev) &&smu_baco_is_support (smu)) +if (smu_baco_is_support (smu))return AMD_RESET_METHOD_BACO ; +else if (smu_mode1_reset_is_support (smu)) +return AMD_RESET_METHOD_MODE1 ;else return AMD_RESET_METHOD_PSP_MODE1 ; }
@@ -317,17 +328,20 @@ static int nv_asic_reset(struct amdgpu_device *adev) {int ret =0 ;struct smu_context *smu = &adev->smu; +enum amd_reset_method reset_method; + + reset_method =nv_asic_reset_method (adev); +if (reset_method ==AMD_RESET_METHOD_BACO ) { +dev_info (adev->dev,"GPU BACO reset\n" ); -if (nv_asic_reset_method (adev) ==AMD_RESET_METHOD_BACO ) { ret =smu_baco_enter (smu);if (ret)return ret; ret =smu_baco_exit (smu);if (ret)return ret; - }else { - ret =nv_asic_mode1_reset (adev); - } + }else + ret =nv_asic_mode1_reset (adev, reset_method);return ret; }
drivers/gpu/drm/amd/powerplay/navi10_ppt.c +1 -1
@@ -2039,7 +2039,7 @@ static bool navi10_is_baco_supported(struct smu_context *smu)struct amdgpu_device *adev = smu->adev;uint32_t val; -if (!smu_v11_0_baco_is_support (smu)) +if (amdgpu_sriov_vf (adev) || (!smu_v11_0_baco_is_support (smu)))return false; val =RREG32_SOC15 (NBIO ,0 , mmRCC_BIF_STRAP0);
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +1 -1
@@ -1761,7 +1761,7 @@ static bool sienna_cichlid_is_baco_supported(struct smu_context *smu)struct amdgpu_device *adev = smu->adev;uint32_t val; -if (!smu_v11_0_baco_is_support (smu)) +if (amdgpu_sriov_vf (adev) || (!smu_v11_0_baco_is_support (smu)))return false; val =RREG32_SOC15 (NBIO ,0 , mmRCC_BIF_STRAP0);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 4/4 drm/amdgpu: add mode1 reset module parameter
In reply to Wenhui ShengFor sienna cichlid, defaut path is baco reset, only when parameter mode1_reset is set, mode1 reset will be chosen.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 8 ++++++++ drivers/gpu/drm/amd/amdgpu/nv.c | 9 ++++++--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -196,6 +196,7 @@ static const bool debug_evictions; /* = false */#endif extern int amdgpu_tmz; +extern int amdgpu_mode1_reset;#ifdef CONFIG_DRM_AMDGPU_SI extern int amdgpu_si_support;
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +8 -0
@@ -154,6 +154,7 @@ int amdgpu_mes = 0;int amdgpu_noretry =1 ;int amdgpu_force_asic_type =-1 ;int amdgpu_tmz =0 ; +int amdgpu_mode1_reset =0 ;struct amdgpu_mgpu_info mgpu_info = { .mutex =__MUTEX_INITIALIZER (mgpu_info.mutex),
@@ -793,6 +794,13 @@ module_param_named(abmlevel, amdgpu_dm_abm_level, uint, 0444);MODULE_PARM_DESC (tmz,"Enable TMZ feature (-1 = auto, 0 = off (default), 1 = on)" );module_param_named (tmz, amdgpu_tmz, int,0444 ); +/** +* DOC: mode1_reset (int) +* Enable SMU mode1 reset (0 = disabled (default), 1 = enabled) +*/ +MODULE_PARM_DESC (mode1_reset,"Enable SMU mode1 reset (0 = disabled (default), 1 = enabled)" ); +module_param_named (mode1_reset, amdgpu_mode1_reset, int,0444 ); +static const struct pci_device_id pciidlist[] = { #ifdef CONFIG_DRM_AMDGPU_SI {0x1002, 0x6780, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI},
drivers/gpu/drm/amd/amdgpu/nv.c +6 -3
@@ -316,10 +316,13 @@ nv_asic_reset_method(struct amdgpu_device *adev) {struct smu_context *smu = &adev->smu; -if (smu_baco_is_support (smu)) -return AMD_RESET_METHOD_BACO ; -else if (smu_mode1_reset_is_support (smu)) +/** +* If mode1 reset is support&enabled, choose mode1 reset +*/ +if (smu_mode1_reset_is_support (smu))return AMD_RESET_METHOD_MODE1 ; +else if (smu_baco_is_support (smu)) +return AMD_RESET_METHOD_BACO ;else return AMD_RESET_METHOD_PSP_MODE1 ; }
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1 -1
@@ -2741,7 +2741,7 @@ bool smu_mode1_reset_is_support(struct smu_context *smu) {bool ret = false; -if (!smu->pm_enabled) +if (!smu->pm_enabled || !amdgpu_mode1_reset)return false;mutex_lock (&smu->mutex);
Signature · 6 lines
2.17.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 4/4] drm/amdgpu: add mode1 reset module parameter
[AMD Public Use]
How about we expose the reset_method as a new amdgpu module parameter?
Regards,
Hawking
-----Original Message-----
From: Sheng, Wenhui <[email protected]>
Sent: Friday, July 10, 2020 13:46
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Sheng, Wenhui <[email protected]>; Gao, Likun <[email protected]>
Subject: [PATCH 4/4] drm/amdgpu: add mode1 reset module parameter
For sienna cichlid, defaut path is baco reset, only when parameter mode1_reset is set, mode1 reset will be chosen.
--- drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 8 ++++++++ drivers/gpu/drm/amd/amdgpu/nv.c | 9 ++++++--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 2 +- 4 files changed, 16 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu.h +1 -0
@@ -196,6 +196,7 @@ static const bool debug_evictions; /* = false */ #endifextern int amdgpu_tmz; +extern int amdgpu_mode1_reset;#ifdef CONFIG_DRM_AMDGPU_SI extern int amdgpu_si_support;
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +15 -4
@@ -154,6 +154,7 @@ int amdgpu_mes = 0;int amdgpu_noretry =1 ;int amdgpu_force_asic_type =-1 ;int amdgpu_tmz =0 ; +int amdgpu_mode1_reset =0 ;struct amdgpu_mgpu_info mgpu_info = { .mutex =__MUTEX_INITIALIZER (mgpu_info.mutex),
@@ -793,6 +794,13 @@ module_param_named(abmlevel, amdgpu_dm_abm_level, uint, 0444); MODULE_PARM_DESC(tmz, "Enable TMZ feature (-1 = auto, 0 = off (default), 1 = on)"); module_param_named(tmz, amdgpu_tmz, int, 0444); +/** +* DOC: mode1_reset (int) +* Enable SMU mode1 reset (0 = disabled (default), 1 = enabled) */ +MODULE_PARM_DESC(mode1_reset, "Enable SMU mode1 reset (0 = disabled +(default), 1 = enabled)"); module_param_named(mode1_reset, +amdgpu_mode1_reset, int, 0444); + static const struct pci_device_id pciidlist[] = { #ifdef CONFIG_DRM_AMDGPU_SI {0x1002, 0x6780, PCI_ANY_ID, PCI_ANY_ID, 0, 0, CHIP_TAHITI}, diff --git a/drivers/gpu/drm/amd/amdgpu/nv.c b/drivers/gpu/drm/amd/amdgpu/nv.c index abccb155b28e..11a662a2f8d2 100644 --- a/drivers/gpu/drm/amd/amdgpu/nv.c +++ b/drivers/gpu/drm/amd/amdgpu/nv.c
@@ -316,10 +316,13 @@ nv_asic_reset_method(struct amdgpu_device *adev) {struct smu_context *smu = &adev->smu; -if (smu_baco_is_support (smu)) -return AMD_RESET_METHOD_BACO ; -else if (smu_mode1_reset_is_support (smu)) +/** +* If mode1 reset is support&enabled, choose mode1 reset +*/ +if (smu_mode1_reset_is_support (smu))return AMD_RESET_METHOD_MODE1 ; +else if (smu_baco_is_support (smu)) +return AMD_RESET_METHOD_BACO ;else return AMD_RESET_METHOD_PSP_MODE1 ; }
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +1 -2
@@ -2741,7 +2741,7 @@ bool smu_mode1_reset_is_support(struct smu_context *smu) {bool ret = false; -if (!smu->pm_enabled) +if (!smu->pm_enabled || !amdgpu_mode1_reset)return false;mutex_lock (&smu->mutex); --
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Public Use]
We shall consider add smu mode 1 reset interface in amdgpu_dpm.c, where we have amdgpu_dpm_mode2_reset and amdgpu_dpm_baco_reset already.
So totally three interfaces there
amdgpu_dpm_baco_resetamdgpu_dpm_mode2_resetamdgpu_dpm_mode1_reset
Does it make sense to you? Thoughts?
Regards,
Hawking
-----Original Message-----
From: Sheng, Wenhui <[email protected]>
Sent: Friday, July 10, 2020 13:46
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Sheng, Wenhui <[email protected]>; Gao, Likun <[email protected]>
Subject: [PATCH 1/4] drm/amd/powerplay: add SMU mode1 reset
From PM FW 58.26.0 for sienna cichlid, SMU mode1 reset is support, driver sends PPSMC_MSG_Mode1Reset message to PM FW could trigger this reset.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 37 +++++++++++++++++++ .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 4 ++ drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 1 + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 2 + .../drm/amd/powerplay/sienna_cichlid_ppt.c | 29 ++++++++++++++- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 11 ++++++ 6 files changed, 82 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +35 -0
@@ -2737,6 +2737,43 @@ int smu_baco_exit(struct smu_context *smu)return ret; } +bool smu_mode1_reset_is_support (struct smu_context *smu) { +bool ret = false; + +if (!smu->pm_enabled) +return false; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs && smu->ppt_funcs->mode1_reset_is_support) + ret = smu->ppt_funcs->mode1_reset_is_support (smu); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_mode1_reset (struct smu_context *smu) { +int ret =0 ; + +if (!smu->pm_enabled) +return -EOPNOTSUPP ; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->mode1_reset) + ret = smu->ppt_funcs->mode1_reset (smu); + +mutex_unlock (&smu->mutex); + +if (ret) +dev_err (smu->adev->dev,"Mode1 reset failed!\n" ); + +return ret; +} +int smu_mode2_reset (struct smu_context *smu) {int ret =0 ;
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +2 -0
@@ -561,6 +561,8 @@ struct pptable_funcs {int (*baco_set_state)(struct smu_context *smu,enum smu_baco_state state);int (*baco_enter)(struct smu_context *smu);int (*baco_exit)(struct smu_context *smu); +bool (*mode1_reset_is_support)(struct smu_context *smu); +int (*mode1_reset)(struct smu_context *smu);int (*mode2_reset)(struct smu_context *smu);int (*get_dpm_ultimate_freq)(struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max); int (*set_soft_freq_limited_range)(struct smu_context *smu, enum smu_clk_type clk_type, uint32_t min, uint32_t max); @@ -672,6 +674,8 @@ int smu_baco_get_state(struct smu_context *smu, enum smu_baco_state *state); int smu_baco_enter(struct smu_context *smu); int smu_baco_exit(struct smu_context *smu);
+bool smu_mode1_reset_is_support(struct smu_context *smu); int +smu_mode1_reset(struct smu_context *smu);
int smu_mode2_reset(struct smu_context *smu);
extern int smu_get_atom_data_table(struct smu_context *smu, uint32_t table, diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu_types.h b/drivers/gpu/drm/amd/powerplay/inc/smu_types.h
index dff2295705be..7b585e205a5a 100644
drivers/gpu/drm/amd/powerplay/inc/smu_types.h +1 -0
@@ -173,6 +173,7 @@__SMU_DUMMY_MAP (GmiPwrDnControl), \__SMU_DUMMY_MAP (DAL_DISABLE_DUMMY_PSTATE_CHANGE ), \__SMU_DUMMY_MAP (DAL_ENABLE_DUMMY_PSTATE_CHANGE ), \ +__SMU_DUMMY_MAP (Mode1Reset), \ #undef __SMU_DUMMY_MAP#define __SMU_DUMMY_MAP (type) SMU_MSG_##type
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +2 -0
@@ -252,6 +252,8 @@ int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state) int smu_v11_0_baco_enter(struct smu_context *smu); int smu_v11_0_baco_exit(struct smu_context *smu); +int smu_v11_0_mode1_reset (struct smu_context *smu); +int smu_v11_0_get_dpm_ultimate_freq (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max);
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +3 -2
@@ -39,8 +39,8 @@#include "nbio/nbio_2_3_sh_mask.h" #include "thm/thm_11_0_2_offset.h" #include "thm/thm_11_0_2_sh_mask.h" - -#include "asic_reg/mp/mp_11_0_sh_mask.h" +#include "mp/mp_11_0_offset.h" +#include "mp/mp_11_0_sh_mask.h" /* * DO NOT use these for err/warn/info/debug messages.
@@ -116,6 +116,7 @@ static struct smu_11_0_cmn2aisc_mapping sienna_cichlid_message_map[SMU_MSG_MAX_CMSG_MAP (PowerDownJpeg, PPSMC_MSG_PowerDownJpeg),MSG_MAP (BacoAudioD3PME, PPSMC_MSG_BacoAudioD3PME),MSG_MAP (ArmD3, PPSMC_MSG_ArmD3), + MSG_MAP(Mode1Reset, PPSMC_MSG_Mode1Reset), }; static struct smu_11_0_cmn2aisc_mapping sienna_cichlid_clk_map[SMU_CLK_COUNT] = { @@ -1767,6 +1768,28 @@ static bool sienna_cichlid_is_baco_supported(struct smu_context *smu)
return (val & RCC_BIF_STRAP0__STRAP_PX_CAPABLE_MASK) ? true : false; }
+static bool sienna_cichlid_is_mode1_reset_supported(struct smu_context
+*smu) {
+ struct amdgpu_device *adev = smu->adev;
+ uint32_t val;
+ u32 smu_version;
+
+ /**
+ * SRIOV env will not support SMU mode1 reset
+ * PM FW support mode1 reset from 58.26
+ */
+ smu_get_smc_version(smu, NULL, &smu_version);
+ if (amdgpu_sriov_vf(adev) || (smu_version < 0x003a1a00))
+ return false;
+
+ /**
+ * mode1 reset relies on PSP, so we should check if
+ * PSP is alive.
+ */
+ val = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_81);
+ return val != 0x0;
+}
+
static int sienna_cichlid_set_thermal_range(struct smu_context *smu,
struct smu_temperature_range range) { @@ -2538,6 +2561,8 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = {
.baco_set_state = smu_v11_0_baco_set_state,
.baco_enter = smu_v11_0_baco_enter,
.baco_exit = smu_v11_0_baco_exit,
+ .mode1_reset_is_support = sienna_cichlid_is_mode1_reset_supported,
+ .mode1_reset = smu_v11_0_mode1_reset,
.get_dpm_ultimate_freq = sienna_cichlid_get_dpm_ultimate_freq,
.set_soft_freq_limited_range = sienna_cichlid_set_soft_freq_limited_range,
.override_pcie_parameters = smu_v11_0_override_pcie_parameters,
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +10 -0
@@ -1741,6 +1741,17 @@ int smu_v11_0_baco_exit(struct smu_context *smu)return ret; } +int smu_v11_0_mode1_reset (struct smu_context *smu) { +int ret =0 ; + + ret =smu_send_smc_msg (smu, SMU_MSG_Mode1Reset,NULL ); +if (!ret) +msleep (500 ); + +return ret; +} +int smu_v11_0_get_dpm_ultimate_freq (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max) {
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Public Use]
BTW, we'd better make the 500ms setting to be a MACRO. We haven't passed the stress test so might need to extend the waiting in near future.
+ ret = smu_send_smc_msg(smu, SMU_MSG_Mode1Reset, NULL);
+ if (!ret)
+ msleep(500);
Regards,
Hawking
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Zhang, Hawking
Sent: Friday, July 10, 2020 14:41
To: Sheng, Wenhui <[email protected]>; [email protected]
Cc: Gao, Likun <[email protected]>
Subject: RE: [PATCH 1/4] drm/amd/powerplay: add SMU mode1 reset
[AMD Public Use]
We shall consider add smu mode 1 reset interface in amdgpu_dpm.c, where we have amdgpu_dpm_mode2_reset and amdgpu_dpm_baco_reset already.
So totally three interfaces there
amdgpu_dpm_baco_resetamdgpu_dpm_mode2_resetamdgpu_dpm_mode1_reset
Does it make sense to you? Thoughts?
Regards,
Hawking
-----Original Message-----
From: Sheng, Wenhui <[email protected]>
Sent: Friday, July 10, 2020 13:46
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Sheng, Wenhui <[email protected]>; Gao, Likun <[email protected]>
Subject: [PATCH 1/4] drm/amd/powerplay: add SMU mode1 reset
From PM FW 58.26.0 for sienna cichlid, SMU mode1 reset is support, driver sends PPSMC_MSG_Mode1Reset message to PM FW could trigger this reset.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 37 +++++++++++++++++++ .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 4 ++ drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 1 + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 2 + .../drm/amd/powerplay/sienna_cichlid_ppt.c | 29 ++++++++++++++- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 11 ++++++ 6 files changed, 82 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +35 -0
@@ -2737,6 +2737,43 @@ int smu_baco_exit(struct smu_context *smu)return ret; } +bool smu_mode1_reset_is_support (struct smu_context *smu) { +bool ret = false; + +if (!smu->pm_enabled) +return false; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs && smu->ppt_funcs->mode1_reset_is_support) + ret = smu->ppt_funcs->mode1_reset_is_support (smu); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_mode1_reset (struct smu_context *smu) { +int ret =0 ; + +if (!smu->pm_enabled) +return -EOPNOTSUPP ; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->mode1_reset) + ret = smu->ppt_funcs->mode1_reset (smu); + +mutex_unlock (&smu->mutex); + +if (ret) +dev_err (smu->adev->dev,"Mode1 reset failed!\n" ); + +return ret; +} +int smu_mode2_reset (struct smu_context *smu) {int ret =0 ;
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +2 -0
@@ -561,6 +561,8 @@ struct pptable_funcs {int (*baco_set_state)(struct smu_context *smu,enum smu_baco_state state);int (*baco_enter)(struct smu_context *smu);int (*baco_exit)(struct smu_context *smu); +bool (*mode1_reset_is_support)(struct smu_context *smu); +int (*mode1_reset)(struct smu_context *smu);int (*mode2_reset)(struct smu_context *smu);int (*get_dpm_ultimate_freq)(struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max); int (*set_soft_freq_limited_range)(struct smu_context *smu, enum smu_clk_type clk_type, uint32_t min, uint32_t max); @@ -672,6 +674,8 @@ int smu_baco_get_state(struct smu_context *smu, enum smu_baco_state *state); int smu_baco_enter(struct smu_context *smu); int smu_baco_exit(struct smu_context *smu);
+bool smu_mode1_reset_is_support(struct smu_context *smu); int +smu_mode1_reset(struct smu_context *smu);
int smu_mode2_reset(struct smu_context *smu);
extern int smu_get_atom_data_table(struct smu_context *smu, uint32_t table, diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu_types.h b/drivers/gpu/drm/amd/powerplay/inc/smu_types.h
index dff2295705be..7b585e205a5a 100644
drivers/gpu/drm/amd/powerplay/inc/smu_types.h +1 -0
@@ -173,6 +173,7 @@__SMU_DUMMY_MAP (GmiPwrDnControl), \__SMU_DUMMY_MAP (DAL_DISABLE_DUMMY_PSTATE_CHANGE ), \__SMU_DUMMY_MAP (DAL_ENABLE_DUMMY_PSTATE_CHANGE ), \ +__SMU_DUMMY_MAP (Mode1Reset), \ #undef __SMU_DUMMY_MAP#define __SMU_DUMMY_MAP (type) SMU_MSG_##type
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +2 -0
@@ -252,6 +252,8 @@ int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state) int smu_v11_0_baco_enter(struct smu_context *smu); int smu_v11_0_baco_exit(struct smu_context *smu); +int smu_v11_0_mode1_reset (struct smu_context *smu); +int smu_v11_0_get_dpm_ultimate_freq (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max);
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +3 -2
@@ -39,8 +39,8 @@#include "nbio/nbio_2_3_sh_mask.h" #include "thm/thm_11_0_2_offset.h" #include "thm/thm_11_0_2_sh_mask.h" - -#include "asic_reg/mp/mp_11_0_sh_mask.h" +#include "mp/mp_11_0_offset.h" +#include "mp/mp_11_0_sh_mask.h" /* * DO NOT use these for err/warn/info/debug messages.
@@ -116,6 +116,7 @@ static struct smu_11_0_cmn2aisc_mapping sienna_cichlid_message_map[SMU_MSG_MAX_CMSG_MAP (PowerDownJpeg, PPSMC_MSG_PowerDownJpeg),MSG_MAP (BacoAudioD3PME, PPSMC_MSG_BacoAudioD3PME),MSG_MAP (ArmD3, PPSMC_MSG_ArmD3), + MSG_MAP(Mode1Reset, PPSMC_MSG_Mode1Reset), }; static struct smu_11_0_cmn2aisc_mapping sienna_cichlid_clk_map[SMU_CLK_COUNT] = { @@ -1767,6 +1768,28 @@ static bool sienna_cichlid_is_baco_supported(struct smu_context *smu)
return (val & RCC_BIF_STRAP0__STRAP_PX_CAPABLE_MASK) ? true : false; }
+static bool sienna_cichlid_is_mode1_reset_supported(struct smu_context
+*smu) {
+ struct amdgpu_device *adev = smu->adev;
+ uint32_t val;
+ u32 smu_version;
+
+ /**
+ * SRIOV env will not support SMU mode1 reset
+ * PM FW support mode1 reset from 58.26
+ */
+ smu_get_smc_version(smu, NULL, &smu_version);
+ if (amdgpu_sriov_vf(adev) || (smu_version < 0x003a1a00))
+ return false;
+
+ /**
+ * mode1 reset relies on PSP, so we should check if
+ * PSP is alive.
+ */
+ val = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_81);
+ return val != 0x0;
+}
+
static int sienna_cichlid_set_thermal_range(struct smu_context *smu,
struct smu_temperature_range range) { @@ -2538,6 +2561,8 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = {
.baco_set_state = smu_v11_0_baco_set_state,
.baco_enter = smu_v11_0_baco_enter,
.baco_exit = smu_v11_0_baco_exit,
+ .mode1_reset_is_support = sienna_cichlid_is_mode1_reset_supported,
+ .mode1_reset = smu_v11_0_mode1_reset,
.get_dpm_ultimate_freq = sienna_cichlid_get_dpm_ultimate_freq,
.set_soft_freq_limited_range = sienna_cichlid_set_soft_freq_limited_range,
.override_pcie_parameters = smu_v11_0_override_pcie_parameters,
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +10 -0
@@ -1741,6 +1741,17 @@ int smu_v11_0_baco_exit(struct smu_context *smu)return ret; } +int smu_v11_0_mode1_reset (struct smu_context *smu) { +int ret =0 ; + + ret =smu_send_smc_msg (smu, SMU_MSG_Mode1Reset,NULL ); +if (!ret) +msleep (500 ); + +return ret; +} +int smu_v11_0_get_dpm_ultimate_freq (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max) {
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Chawking.zhang%40amd.com%7Ca291cfb51ecb40a1cf0608d8249c4460%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637299600875655517&sdata=XDn3x0%2FbPxccIUwQi4wRWCOyDdunP12Hq17vJZNA420%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Public Use]
Ok I will refine it.
Brs
Wenhui
-----Original Message-----
From: Zhang, Hawking <[email protected]>
Sent: Friday, July 10, 2020 2:51 PM
To: Zhang, Hawking <[email protected]>; Sheng, Wenhui <[email protected]>; [email protected]
Cc: Gao, Likun <[email protected]>
Subject: RE: [PATCH 1/4] drm/amd/powerplay: add SMU mode1 reset
[AMD Public Use]
BTW, we'd better make the 500ms setting to be a MACRO. We haven't passed the stress test so might need to extend the waiting in near future.
+ ret = smu_send_smc_msg(smu, SMU_MSG_Mode1Reset, NULL);
+ if (!ret)
+ msleep(500);
Regards,
Hawking
-----Original Message-----
From: amd-gfx <[email protected]> On Behalf Of Zhang, Hawking
Sent: Friday, July 10, 2020 14:41
To: Sheng, Wenhui <[email protected]>; [email protected]
Cc: Gao, Likun <[email protected]>
Subject: RE: [PATCH 1/4] drm/amd/powerplay: add SMU mode1 reset
[AMD Public Use]
We shall consider add smu mode 1 reset interface in amdgpu_dpm.c, where we have amdgpu_dpm_mode2_reset and amdgpu_dpm_baco_reset already.
So totally three interfaces there
amdgpu_dpm_baco_resetamdgpu_dpm_mode2_resetamdgpu_dpm_mode1_reset
Does it make sense to you? Thoughts?
Regards,
Hawking
-----Original Message-----
From: Sheng, Wenhui <[email protected]>
Sent: Friday, July 10, 2020 13:46
To: [email protected]
Cc: Zhang, Hawking <[email protected]>; Sheng, Wenhui <[email protected]>; Gao, Likun <[email protected]>
Subject: [PATCH 1/4] drm/amd/powerplay: add SMU mode1 reset
From PM FW 58.26.0 for sienna cichlid, SMU mode1 reset is support, driver sends PPSMC_MSG_Mode1Reset message to PM FW could trigger this reset.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 37 +++++++++++++++++++ .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 4 ++ drivers/gpu/drm/amd/powerplay/inc/smu_types.h | 1 + drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 2 + .../drm/amd/powerplay/sienna_cichlid_ppt.c | 29 ++++++++++++++- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 11 ++++++ 6 files changed, 82 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +35 -0
@@ -2737,6 +2737,43 @@ int smu_baco_exit(struct smu_context *smu)return ret; } +bool smu_mode1_reset_is_support (struct smu_context *smu) { +bool ret = false; + +if (!smu->pm_enabled) +return false; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs && smu->ppt_funcs->mode1_reset_is_support) + ret = smu->ppt_funcs->mode1_reset_is_support (smu); + +mutex_unlock (&smu->mutex); + +return ret; +} + +int smu_mode1_reset (struct smu_context *smu) { +int ret =0 ; + +if (!smu->pm_enabled) +return -EOPNOTSUPP ; + +mutex_lock (&smu->mutex); + +if (smu->ppt_funcs->mode1_reset) + ret = smu->ppt_funcs->mode1_reset (smu); + +mutex_unlock (&smu->mutex); + +if (ret) +dev_err (smu->adev->dev,"Mode1 reset failed!\n" ); + +return ret; +} +int smu_mode2_reset (struct smu_context *smu) {int ret =0 ;
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +2 -0
@@ -561,6 +561,8 @@ struct pptable_funcs {int (*baco_set_state)(struct smu_context *smu,enum smu_baco_state state);int (*baco_enter)(struct smu_context *smu);int (*baco_exit)(struct smu_context *smu); +bool (*mode1_reset_is_support)(struct smu_context *smu); +int (*mode1_reset)(struct smu_context *smu);int (*mode2_reset)(struct smu_context *smu);int (*get_dpm_ultimate_freq)(struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max); int (*set_soft_freq_limited_range)(struct smu_context *smu, enum smu_clk_type clk_type, uint32_t min, uint32_t max); @@ -672,6 +674,8 @@ int smu_baco_get_state(struct smu_context *smu, enum smu_baco_state *state); int smu_baco_enter(struct smu_context *smu); int smu_baco_exit(struct smu_context *smu);
+bool smu_mode1_reset_is_support(struct smu_context *smu); int +smu_mode1_reset(struct smu_context *smu);
int smu_mode2_reset(struct smu_context *smu);
extern int smu_get_atom_data_table(struct smu_context *smu, uint32_t table, diff --git a/drivers/gpu/drm/amd/powerplay/inc/smu_types.h b/drivers/gpu/drm/amd/powerplay/inc/smu_types.h
index dff2295705be..7b585e205a5a 100644
drivers/gpu/drm/amd/powerplay/inc/smu_types.h +1 -0
@@ -173,6 +173,7 @@__SMU_DUMMY_MAP (GmiPwrDnControl), \__SMU_DUMMY_MAP (DAL_DISABLE_DUMMY_PSTATE_CHANGE ), \__SMU_DUMMY_MAP (DAL_ENABLE_DUMMY_PSTATE_CHANGE ), \ +__SMU_DUMMY_MAP (Mode1Reset), \ #undef __SMU_DUMMY_MAP#define __SMU_DUMMY_MAP (type) SMU_MSG_##type
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +2 -0
@@ -252,6 +252,8 @@ int smu_v11_0_baco_set_state(struct smu_context *smu, enum smu_baco_state state) int smu_v11_0_baco_enter(struct smu_context *smu); int smu_v11_0_baco_exit(struct smu_context *smu); +int smu_v11_0_mode1_reset (struct smu_context *smu); +int smu_v11_0_get_dpm_ultimate_freq (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max);
drivers/gpu/drm/amd/powerplay/sienna_cichlid_ppt.c +3 -2
@@ -39,8 +39,8 @@#include "nbio/nbio_2_3_sh_mask.h" #include "thm/thm_11_0_2_offset.h" #include "thm/thm_11_0_2_sh_mask.h" - -#include "asic_reg/mp/mp_11_0_sh_mask.h" +#include "mp/mp_11_0_offset.h" +#include "mp/mp_11_0_sh_mask.h" /* * DO NOT use these for err/warn/info/debug messages.
@@ -116,6 +116,7 @@ static struct smu_11_0_cmn2aisc_mapping sienna_cichlid_message_map[SMU_MSG_MAX_CMSG_MAP (PowerDownJpeg, PPSMC_MSG_PowerDownJpeg),MSG_MAP (BacoAudioD3PME, PPSMC_MSG_BacoAudioD3PME),MSG_MAP (ArmD3, PPSMC_MSG_ArmD3), + MSG_MAP(Mode1Reset, PPSMC_MSG_Mode1Reset), }; static struct smu_11_0_cmn2aisc_mapping sienna_cichlid_clk_map[SMU_CLK_COUNT] = { @@ -1767,6 +1768,28 @@ static bool sienna_cichlid_is_baco_supported(struct smu_context *smu)
return (val & RCC_BIF_STRAP0__STRAP_PX_CAPABLE_MASK) ? true : false; }
+static bool sienna_cichlid_is_mode1_reset_supported(struct smu_context
+*smu) {
+ struct amdgpu_device *adev = smu->adev;
+ uint32_t val;
+ u32 smu_version;
+
+ /**
+ * SRIOV env will not support SMU mode1 reset
+ * PM FW support mode1 reset from 58.26
+ */
+ smu_get_smc_version(smu, NULL, &smu_version);
+ if (amdgpu_sriov_vf(adev) || (smu_version < 0x003a1a00))
+ return false;
+
+ /**
+ * mode1 reset relies on PSP, so we should check if
+ * PSP is alive.
+ */
+ val = RREG32_SOC15(MP0, 0, mmMP0_SMN_C2PMSG_81);
+ return val != 0x0;
+}
+
static int sienna_cichlid_set_thermal_range(struct smu_context *smu,
struct smu_temperature_range range) { @@ -2538,6 +2561,8 @@ static const struct pptable_funcs sienna_cichlid_ppt_funcs = {
.baco_set_state = smu_v11_0_baco_set_state,
.baco_enter = smu_v11_0_baco_enter,
.baco_exit = smu_v11_0_baco_exit,
+ .mode1_reset_is_support = sienna_cichlid_is_mode1_reset_supported,
+ .mode1_reset = smu_v11_0_mode1_reset,
.get_dpm_ultimate_freq = sienna_cichlid_get_dpm_ultimate_freq,
.set_soft_freq_limited_range = sienna_cichlid_set_soft_freq_limited_range,
.override_pcie_parameters = smu_v11_0_override_pcie_parameters,
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +10 -0
@@ -1741,6 +1741,17 @@ int smu_v11_0_baco_exit(struct smu_context *smu)return ret; } +int smu_v11_0_mode1_reset (struct smu_context *smu) { +int ret =0 ; + + ret =smu_send_smc_msg (smu, SMU_MSG_Mode1Reset,NULL ); +if (!ret) +msleep (500 ); + +return ret; +} +int smu_v11_0_get_dpm_ultimate_freq (struct smu_context *smu,enum smu_clk_type clk_type,uint32_t *min,uint32_t *max) {
--
2.17.1
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flists.freedesktop.org%2Fmailman%2Flistinfo%2Famd-gfx&data=02%7C01%7Chawking.zhang%40amd.com%7Ca291cfb51ecb40a1cf0608d8249c4460%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637299600875655517&sdata=XDn3x0%2FbPxccIUwQi4wRWCOyDdunP12Hq17vJZNA420%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx