drm/amd/powerplay: drop unnecessary API wrapper and return value
Subsystems (2)
PATCH 1/2 drm/amd/powerplay: drop unnecessary API wrapper and return value
Some minor cosmetic fixes.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 12 ++---- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 2 +- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 2 +- drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 2 +- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 39 +++++-------------- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 22 ++--------- 6 files changed, 19 insertions(+), 60 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +3 -9
@@ -198,9 +198,7 @@ int smu_get_smc_version(struct smu_context *smu, uint32_t *if_version, uint32_tif (ret)return ret; - ret =smu_read_smc_arg (smu, if_version); -if (ret) -return ret; +smu_read_smc_arg (smu, if_version); }if (smu_version) {
@@ -208,9 +206,7 @@ int smu_get_smc_version(struct smu_context *smu, uint32_t *if_version, uint32_tif (ret)return ret; - ret =smu_read_smc_arg (smu, smu_version); -if (ret) -return ret; +smu_read_smc_arg (smu, smu_version); }return ret;
@@ -339,9 +335,7 @@ int smu_get_dpm_freq_by_index(struct smu_context *smu, enum smu_clk_type clk_typif (ret)return ret; - ret =smu_read_smc_arg (smu, ¶m); -if (ret) -return ret; +smu_read_smc_arg (smu, ¶m);/* BIT31: 0 - Fine grained DPM, 1 - Dicrete DPM * now, we un-support it */
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1 -1
@@ -502,7 +502,7 @@ struct pptable_funcs {int (*system_features_control)(struct smu_context *smu,bool en);int (*send_smc_msg_with_param)(struct smu_context *smu,enum smu_message_type msg,uint32_t param); -int (*read_smc_arg)(struct smu_context *smu,uint32_t *arg); +void (*read_smc_arg)(struct smu_context *smu,uint32_t *arg);int (*init_display_count)(struct smu_context *smu,uint32_t count);int (*set_allowed_mask)(struct smu_context *smu);int (*get_enabled_mask)(struct smu_context *smu,uint32_t *feature_mask,uint32_t num);
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +1 -1
@@ -183,7 +183,7 @@ smu_v11_0_send_msg_with_param(struct smu_context *smu,enum smu_message_type msg, uint32_t param); -int smu_v11_0_read_arg (struct smu_context *smu,uint32_t *arg); +void smu_v11_0_read_arg (struct smu_context *smu,uint32_t *arg);int smu_v11_0_init_display_count (struct smu_context *smu,uint32_t count);
drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h +1 -1
@@ -40,7 +40,7 @@ struct smu_12_0_cmn2aisc_mapping {int smu_v12_0_send_msg_without_waiting (struct smu_context *smu,uint16_t msg); -int smu_v12_0_read_arg (struct smu_context *smu,uint32_t *arg); +void smu_v12_0_read_arg (struct smu_context *smu,uint32_t *arg);int smu_v12_0_wait_for_response (struct smu_context *smu);
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +9 -30
@@ -53,20 +53,11 @@ MODULE_FIRMWARE("amdgpu/navi12_smc.bin");#define SMU11_VOLTAGE_SCALE 4 -static int smu_v11_0_send_msg_without_waiting (struct smu_context *smu, -uint16_t msg) -{ -struct amdgpu_device *adev = smu->adev; -WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_66, msg); -return 0 ; -} - -int smu_v11_0_read_arg (struct smu_context *smu,uint32_t *arg) +void smu_v11_0_read_arg (struct smu_context *smu,uint32_t *arg) {struct amdgpu_device *adev = smu->adev; *arg =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_82); -return 0 ; }static int smu_v11_0_wait_for_response (struct smu_context *smu)
@@ -109,7 +100,7 @@ smu_v11_0_send_msg_with_param(struct smu_context *smu,WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_82, param); -smu_v11_0_send_msg_without_waiting (smu, (uint16_t )index); +WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_66, (uint16_t )index); ret =smu_v11_0_wait_for_response (smu);if (ret)
@@ -843,16 +834,12 @@ int smu_v11_0_get_enabled_mask(struct smu_context *smu, ret =smu_send_smc_msg (smu, SMU_MSG_GetEnabledSmuFeaturesHigh);if (ret)return ret; - ret =smu_read_smc_arg (smu, &feature_mask_high); -if (ret) -return ret; +smu_read_smc_arg (smu, &feature_mask_high); ret =smu_send_smc_msg (smu, SMU_MSG_GetEnabledSmuFeaturesLow);if (ret)return ret; - ret =smu_read_smc_arg (smu, &feature_mask_low); -if (ret) -return ret; +smu_read_smc_arg (smu, &feature_mask_low); feature_mask[0 ] = feature_mask_low; feature_mask[1 ] = feature_mask_high;
@@ -924,9 +911,7 @@ smu_v11_0_get_max_sustainable_clock(struct smu_context *smu, uint32_t *clock,return ret; } - ret =smu_read_smc_arg (smu, clock); -if (ret) -return ret; +smu_read_smc_arg (smu, clock);if (*clock !=0 )return 0 ;
@@ -939,7 +924,7 @@ smu_v11_0_get_max_sustainable_clock(struct smu_context *smu, uint32_t *clock,return ret; } - ret =smu_read_smc_arg (smu, clock); +smu_read_smc_arg (smu, clock);return ret; }
@@ -1107,9 +1092,7 @@ int smu_v11_0_get_current_clk_freq(struct smu_context *smu,if (ret)return ret; - ret =smu_read_smc_arg (smu, &freq); -if (ret) -return ret; +smu_read_smc_arg (smu, &freq); } freq *=100 ;
@@ -1749,18 +1732,14 @@ int smu_v11_0_get_dpm_ultimate_freq(struct smu_context *smu, enum smu_clk_type c ret =smu_send_smc_msg_with_param (smu, SMU_MSG_GetMaxDpmFreq, param);if (ret) goto failed; - ret =smu_read_smc_arg (smu, max); -if (ret) - goto failed; +smu_read_smc_arg (smu, max); }if (min) { ret =smu_send_smc_msg_with_param (smu, SMU_MSG_GetMinDpmFreq, param);if (ret) goto failed; - ret =smu_read_smc_arg (smu, min); -if (ret) - goto failed; +smu_read_smc_arg (smu, min); } failed:
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +4 -18
@@ -41,21 +41,11 @@#define SMUIO_GFX_MISC_CNTL__PWR_GFXOFF_STATUS_MASK 0x00000006L#define SMUIO_GFX_MISC_CNTL__PWR_GFXOFF_STATUS__SHIFT 0x1 -int smu_v12_0_send_msg_without_waiting (struct smu_context *smu, -uint16_t msg) -{ -struct amdgpu_device *adev = smu->adev; - -WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_66, msg); -return 0 ; -} - -int smu_v12_0_read_arg (struct smu_context *smu,uint32_t *arg) +void smu_v12_0_read_arg (struct smu_context *smu,uint32_t *arg) {struct amdgpu_device *adev = smu->adev; *arg =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_82); -return 0 ; }int smu_v12_0_wait_for_response (struct smu_context *smu)
@@ -98,7 +88,7 @@ smu_v12_0_send_msg_with_param(struct smu_context *smu,WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_82, param); -smu_v12_0_send_msg_without_waiting (smu, (uint16_t )index); +WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_66, (uint16_t )index); ret =smu_v12_0_wait_for_response (smu);if (ret)
@@ -352,9 +342,7 @@ int smu_v12_0_get_dpm_ultimate_freq(struct smu_context *smu, enum smu_clk_type cpr_err ("Attempt to get max GX frequency from SMC Failed !\n" ); goto failed; } - ret =smu_read_smc_arg (smu, max); -if (ret) - goto failed; +smu_read_smc_arg (smu, max);break ;case SMU_UCLK :case SMU_FCLK :
@@ -383,9 +371,7 @@ int smu_v12_0_get_dpm_ultimate_freq(struct smu_context *smu, enum smu_clk_type cpr_err ("Attempt to get min GX frequency from SMC Failed !\n" ); goto failed; } - ret =smu_read_smc_arg (smu, min); -if (ret) - goto failed; +smu_read_smc_arg (smu, min);break ;case SMU_UCLK :case SMU_FCLK :
Signature · 6 lines
2.24.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
PATCH 2/2 drm/amd/powerplay: pre-check the SMU state before issuing message
Abort the message issuing if the SMU was not in the right state.
--- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 16 ++++++++-------- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +8 -8
@@ -68,15 +68,13 @@ static int smu_v11_0_wait_for_response(struct smu_context *smu)for (i =0 ; i < timeout; i++) { cur_value =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_90);if ((cur_value &MP1_C2PMSG_90__CONTENT_MASK ) !=0 ) -break ; +return cur_value ==0x1 ?0 : -EIO ; +udelay (1 ); }/* timeout means wrong logic */ -if (i == timeout) -return -ETIME ; - -return RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_90) ==0x1 ?0 : -EIO ; +return -ETIME ; }int
@@ -92,9 +90,11 @@ smu_v11_0_send_msg_with_param(struct smu_context *smu,return index; ret =smu_v11_0_wait_for_response (smu); -if (ret) -pr_err ("failed send message: %10s (%d) \tparam: 0x%08x response %#x\n" , -smu_get_message_name (smu, msg), index, param, ret); +if (ret) { +pr_err ("Msg issuing pre-check failed and " +"SMU may be not in the right state!\n" ); +return ret; + }WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_90,0 );
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +8 -8
@@ -56,15 +56,13 @@ int smu_v12_0_wait_for_response(struct smu_context *smu)for (i =0 ; i < adev->usec_timeout; i++) { cur_value =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_90);if ((cur_value &MP1_C2PMSG_90__CONTENT_MASK ) !=0 ) -break ; +return cur_value ==0x1 ?0 : -EIO ; +udelay (1 ); }/* timeout means wrong logic */ -if (i == adev->usec_timeout) -return -ETIME ; - -return RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_90) ==0x1 ?0 : -EIO ; +return -ETIME ; }int
@@ -80,9 +78,11 @@ smu_v12_0_send_msg_with_param(struct smu_context *smu,return index; ret =smu_v12_0_wait_for_response (smu); -if (ret) -pr_err ("Failed to send message 0x%x, response 0x%x, param 0x%x\n" , - index, ret, param); +if (ret) { +pr_err ("Msg issuing pre-check failed and " +"SMU may be not in the right state!\n" ); +return ret; + }WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_90,0 );
Signature · 6 lines
2.24.0 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Re: [PATCH 2/2] drm/amd/powerplay: pre-check the SMU state before issuing message
Hi Evan,
The original design is also aborting sending the message because of a ‘break’ there. Your patch is for code factoring?
Thanks.
Quoted 92 lines · 在 2019年12月4日,下午5:53,Evan Quan <[email protected]> 写道:
[CAUTION: External Email]
Abort the message issuing if the SMU was not in the right state.
Change-Id Ida9f911e051f6e78de4f475956c78637e56e6ea3Signed-off-by Evan Quan <[email protected]>---
drivers/gpu/drm/amd/powerplay/smu_v11_0.c| 16 ++++++++--------drivers/gpu/drm/amd/powerplay/smu_v12_0.c| 16 ++++++++--------2 files changed, 16 insertions(+), 16 deletions(-)drivers/gpu/drm/amd/powerplay/smu_v11_0.c +3
-5@@ -68,15 +68,13 @@ static int smu_v11_0_wait_for_response(struct smu_context *smu)for (i =0 ; i < timeout; i++) { cur_value =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_90);if ((cur_value &MP1_C2PMSG_90__CONTENT_MASK ) !=0 ) -break ; +return cur_value ==0x1 ?0 : -EIO ; +udelay (1 ); }/* timeout means wrong logic */ -if (i == timeout) -return -ETIME ; - -return RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_90) ==0x1 ?0 : -EIO ; +return -ETIME ; }int
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +5
-3@@ -92,9 +90,11 @@ smu_v11_0_send_msg_with_param(struct smu_context *smu,return index; ret =smu_v11_0_wait_for_response (smu); -if (ret) -pr_err ("failed send message: %10s (%d) \tparam: 0x%08x response %#x\n" , -smu_get_message_name (smu, msg), index, param, ret); +if (ret) { +pr_err ("Msg issuing pre-check failed and " +"SMU may be not in the right state!\n" ); +return ret; + }WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_90,0 );drivers/gpu/drm/amd/powerplay/smu_v12_0.c +3
-5@@ -56,15 +56,13 @@ int smu_v12_0_wait_for_response(struct smu_context *smu)for (i =0 ; i < adev->usec_timeout; i++) { cur_value =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_90);if ((cur_value &MP1_C2PMSG_90__CONTENT_MASK ) !=0 ) -break ; +return cur_value ==0x1 ?0 : -EIO ; +udelay (1 ); }/* timeout means wrong logic */ -if (i == adev->usec_timeout) -return -ETIME ; - -return RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_90) ==0x1 ?0 : -EIO ; +return -ETIME ; }int
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +5
-4@@ -80,9 +78,11 @@ smu_v12_0_send_msg_with_param(struct smu_context *smu,return index; ret =smu_v12_0_wait_for_response (smu); -if (ret) -pr_err ("Failed to send message 0x%x, response 0x%x, param 0x%x\n" , - index, ret, param); +if (ret) { +pr_err ("Msg issuing pre-check failed and " +"SMU may be not in the right state!\n" ); +return ret; + }WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_90,0 ); --2.24.0
Quoted 4 lines
_______________________________________________
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%7CKenneth.Feng%40amd.com%7C1383f2661b584e04edf908d7789feaf5%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637110500551036438&sdata=QQRY8dsiT%2BPio5I%2B%2F3ErqLnYQLxt6hcyXHedU79muTI%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
RE: [PATCH 2/2] drm/amd/powerplay: pre-check the SMU state before issuing message
The abort operation is added in smu_v11_0_send_msg_with_param. And for smu_v11_0_wait_for_response, yes, it's only code factoring.
Quoted 122 lines
-----Original Message-----
From: Feng, Kenneth <[email protected]>
Sent: Wednesday, December 4, 2019 6:14 PM
To: Quan, Evan <[email protected]>
Cc: [email protected]
Subject: Re: [PATCH 2/2] drm/amd/powerplay: pre-check the SMU state before issuing messageHi Evan,
The original design is also aborting sending the message because of a ‘break’ there.
Your patch is for code factoring?
Thanks.Quoted 1 line
在 2019年12月4日,下午5:53,Evan Quan <[email protected]> 写
道:
drivers/gpu/drm/amd/powerplay/smu_v11_0.c static int smu_v11_0_wait_for_response(struct
Quoted 18 lines
[CAUTION: External Email]
Abort the message issuing if the SMU was not in the right state.
Change-Id Ida9f911e051f6e78de4f475956c78637e56e6ea3Signed-off-by Evan Quan <[email protected]>---
drivers/gpu/drm/amd/powerplay/smu_v11_0.c| 16 ++++++++--------drivers/gpu/drm/amd/powerplay/smu_v12_0.c| 16 ++++++++--------2 files changed, 16 insertions(+), 16 deletions(-)drivers/gpu/drm/amd/powerplay/smu_v11_0.c +0
-0@@ -68,15 +68,13 @@ static int smu_v11_0_wait_for_response(struct
smu_context*smu)Quoted 4 lines
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +0
-1for (i =0 ; i < timeout; i++) { cur_value =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_90);if ((cur_value &MP1_C2PMSG_90__CONTENT_MASK ) !=0 ) -break ;drivers/gpu/drm/amd/powerplay/smu_v11_0.c static int smu_v11_0_wait_for_response(struct smu_context *smu)
Quoted 10 lines
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +2
-4+return cur_value ==0x1 ?0 : -EIO ; +udelay (1 ); }/* timeout means wrong logic */ -if (i == timeout) -return -ETIME ; - - return RREG32_SOC15(MP1, 0, mmMP1_SMN_C2PMSG_90) == 0x1 ? 0 :
-EIO;drivers/gpu/drm/amd/powerplay/smu_v11_0.c smu_v11_0_send_msg_with_param(struct
Quoted 5 lines
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +1
-0+return -ETIME ; }int
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +0
-0@@ -92,9 +90,11 @@ smu_v11_0_send_msg_with_param(struct
smu_context*smu,drivers/gpu/drm/amd/powerplay/smu_v11_0.c smu_v11_0_send_msg_with_param(struct smu_context *smu,
Quoted 5 lines
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +0
-2return index; ret =smu_v11_0_wait_for_response (smu); -if (ret) - pr_err("failed send message: %10s (%d) \tparam: 0x%08xresponse %#x\n",
drivers/gpu/drm/amd/powerplay/smu_v12_0.c int smu_v12_0_wait_for_response(struct
Quoted 15 lines
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +5
-1- smu_get_message_name(smu, msg), index, param, ret); +if (ret) { +pr_err ("Msg issuing pre-check failed and " +"SMU may be not in the right state!\n" ); +return ret; + }WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_90,0 );drivers/gpu/drm/amd/powerplay/smu_v12_0.c +0
-0@@ -56,15 +56,13 @@ int smu_v12_0_wait_for_response(struct
smu_context*smu)Quoted 4 lines
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +0
-1for (i =0 ; i < adev->usec_timeout; i++) { cur_value =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_90);if ((cur_value &MP1_C2PMSG_90__CONTENT_MASK ) !=0 ) -break ;drivers/gpu/drm/amd/powerplay/smu_v12_0.c int smu_v12_0_wait_for_response(struct smu_context *smu)
Quoted 10 lines
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +2
-4+return cur_value ==0x1 ?0 : -EIO ; +udelay (1 ); }/* timeout means wrong logic */ -if (i == adev->usec_timeout) -return -ETIME ; - - return RREG32_SOC15(MP1, 0, mmMP1_SMN_C2PMSG_90) == 0x1 ? 0 :
-EIO;drivers/gpu/drm/amd/powerplay/smu_v12_0.c smu_v12_0_send_msg_with_param(struct
Quoted 5 lines
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +1
-0+return -ETIME ; }int
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +0
-0@@ -80,9 +78,11 @@ smu_v12_0_send_msg_with_param(struct
smu_context*smu,drivers/gpu/drm/amd/powerplay/smu_v12_0.c smu_v12_0_send_msg_with_param(struct smu_context *smu,
Quoted 5 lines
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +0
-2return index; ret =smu_v12_0_wait_for_response (smu); -if (ret) - pr_err("Failed to send message 0x%x, response 0x%x, param0x%x\n",
Quoted 12 lines
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +5
-2- index, ret, param); +if (ret) { +pr_err ("Msg issuing pre-check failed and " +"SMU may be not in the right state!\n" ); +return ret; + }WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_90,0 ); --2.24.0
Quoted 5 lines
_______________________________________________
amd-gfx mailing list
[email protected]
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
s.freedesktop.org%2Fmailman%2Flistinfo%2Famd-
Quoted 8 lines
gfx&data=02%7C01%7CKe
Quoted 1 line
nneth.Feng%40amd.com%7C1383f2661b584e04edf908d7789feaf5%7C3dd8961 fe488
Quoted 1 line
4e608e11a82d994e183d%7C0%7C0%7C637110500551036438&sdata=QQ RY8dsiT%
Quoted 1 line
2BPio5I%2B%2F3ErqLnYQLxt6hcyXHedU79muTI%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Feng, Kenneth
Reviewed-by Kenneth FengRe: [PATCH 2/2] drm/amd/powerplay: pre-check the SMU state before issuing message
Got it. Thanks.
在 2019年12月4日,下午6:23,Quan, Evan <[email protected]<mailto:[email protected]>> 写道:
The abort operation is added in smu_v11_0_send_msg_with_param. And for smu_v11_0_wait_for_response, yes, it's only code factoring.
-----Original Message-----
From: Feng, Kenneth <[email protected]<mailto:[email protected]>>
Sent: Wednesday, December 4, 2019 6:14 PM
To: Quan, Evan <[email protected]<mailto:[email protected]>>
Cc: [email protected]<mailto:[email protected]>
Subject: Re: [PATCH 2/2] drm/amd/powerplay: pre-check the SMU state before issuing message
Hi Evan,
The original design is also aborting sending the message because of a ‘break’ there.
Your patch is for code factoring?
Thanks.
在 2019年12月4日,下午5:53,Evan Quan <[email protected]<mailto:[email protected]>> 写 道:
[CAUTION: External Email]
Abort the message issuing if the SMU was not in the right state.
---drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 16 ++++++++-------- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 16 ++++++++--------
2 files changed, 16 insertions(+), 16 deletions(-)
(quoted diff) +0 -0
b/drivers/gpu/drm/amd/powerplay/smu_v11_0.c
index 325ec4864f90..d84c7f5fb01a 100644
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +0 -0
@@ -68,15 +68,13 @@ static int smu_v11_0_wait_for_response(struct
smu_context *smu)
for (i = 0; i < timeout; i++) {
cur_value = RREG32_SOC15(MP1, 0, mmMP1_SMN_C2PMSG_90);
if ((cur_value & MP1_C2PMSG_90__CONTENT_MASK) != 0)
- break;
+ return cur_value == 0x1 ? 0 : -EIO;
+
udelay(1);
}
/* timeout means wrong logic */- if (i == timeout)
- return -ETIME;
-
- return RREG32_SOC15(MP1, 0, mmMP1_SMN_C2PMSG_90) == 0x1 ? 0 :-EIO;
+ return -ETIME;
}
int
@@ -92,9 +90,11 @@ smu_v11_0_send_msg_with_param(struct smu_context *smu,
return index;
ret = smu_v11_0_wait_for_response(smu);- if (ret)
- pr_err("failed send message: %10s (%d) \tparam: 0x%08x
response %#x\n",
- smu_get_message_name(smu, msg), index, param, ret);
+ if (ret) {
+ pr_err("Msg issuing pre-check failed and "
+ "SMU may be not in the right state!\n");
+ return ret;
+ }
WREG32_SOC15(MP1, 0, mmMP1_SMN_C2PMSG_90, 0);
(quoted diff) +0 -0
b/drivers/gpu/drm/amd/powerplay/smu_v12_0.c
index 7f5f7e12a41e..a638326ba1b7 100644
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +0 -0
@@ -56,15 +56,13 @@ int smu_v12_0_wait_for_response(struct
smu_context *smu)
for (i = 0; i < adev->usec_timeout; i++) {
cur_value = RREG32_SOC15(MP1, 0, mmMP1_SMN_C2PMSG_90);
if ((cur_value & MP1_C2PMSG_90__CONTENT_MASK) != 0)
- break;
+ return cur_value == 0x1 ? 0 : -EIO;
+
udelay(1);
}
/* timeout means wrong logic */- if (i == adev->usec_timeout)
- return -ETIME;
-
- return RREG32_SOC15(MP1, 0, mmMP1_SMN_C2PMSG_90) == 0x1 ? 0 :-EIO;
+ return -ETIME;
}
int
@@ -80,9 +78,11 @@ smu_v12_0_send_msg_with_param(struct smu_context *smu,
return index;
ret = smu_v12_0_wait_for_response(smu);- if (ret)
- pr_err("Failed to send message 0x%x, response 0x%x, param
0x%x\n",
- index, ret, param);
+ if (ret) {
+ pr_err("Msg issuing pre-check failed and "
+ "SMU may be not in the right state!\n");
+ return ret;
+ }
WREG32_SOC15(MP1, 0, mmMP1_SMN_C2PMSG_90, 0);
--
2.24.0
_______________________________________________
amd-gfx mailing list [email protected]<mailto:[email protected]>
https://nam11.safelinks.protection.outlook.com/?url=https%3A%2F%2Flist
s.freedesktop.org%2Fmailman%2Flistinfo%2Famd- gfx&data=02%7C01%7CKe
nneth.Feng%40amd.com<http://40amd.com>%7C1383f2661b584e04edf908d7789feaf5%7C3dd8961 fe488
4e608e11a82d994e183d%7C0%7C0%7C637110500551036438&sdata=QQ RY8dsiT% 2BPio5I%2B%2F3ErqLnYQLxt6hcyXHedU79muTI%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx
[AMD Official Use Only - Internal Distribution Only]
this change doesn't make sense, and if you really think the return value is useless. It is more reasonable to accept parameters with return value, not parameter. I think these two patches make the code look worse, unless there's a bug in it.
add @Huang, Ray<mailto:[email protected]> double check.
Best Regards,
Kevin
________________________________
From: amd-gfx <[email protected]> on behalf of Evan Quan <[email protected]>
Sent: Wednesday, December 4, 2019 5:53 PM
To: [email protected] <[email protected]>
Cc: Quan, Evan <[email protected]>
Subject: [PATCH 1/2] drm/amd/powerplay: drop unnecessary API wrapper and return value
Some minor cosmetic fixes.
--- drivers/gpu/drm/amd/powerplay/amdgpu_smu.c | 12 ++---- .../gpu/drm/amd/powerplay/inc/amdgpu_smu.h | 2 +- drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h | 2 +- drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h | 2 +- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 39 +++++-------------- drivers/gpu/drm/amd/powerplay/smu_v12_0.c | 22 ++--------- 6 files changed, 19 insertions(+), 60 deletions(-)
drivers/gpu/drm/amd/powerplay/amdgpu_smu.c +3 -9
@@ -198,9 +198,7 @@ int smu_get_smc_version(struct smu_context *smu, uint32_t *if_version, uint32_tif (ret)return ret; - ret =smu_read_smc_arg (smu, if_version); -if (ret) -return ret; +smu_read_smc_arg (smu, if_version); }if (smu_version) {
@@ -208,9 +206,7 @@ int smu_get_smc_version(struct smu_context *smu, uint32_t *if_version, uint32_tif (ret)return ret; - ret =smu_read_smc_arg (smu, smu_version); -if (ret) -return ret; +smu_read_smc_arg (smu, smu_version); }return ret;
@@ -339,9 +335,7 @@ int smu_get_dpm_freq_by_index(struct smu_context *smu, enum smu_clk_type clk_typif (ret)return ret; - ret =smu_read_smc_arg (smu, ¶m); -if (ret) -return ret; +smu_read_smc_arg (smu, ¶m);/* BIT31: 0 - Fine grained DPM, 1 - Dicrete DPM * now, we un-support it */
drivers/gpu/drm/amd/powerplay/inc/amdgpu_smu.h +1 -1
@@ -502,7 +502,7 @@ struct pptable_funcs {int (*system_features_control)(struct smu_context *smu,bool en);int (*send_smc_msg_with_param)(struct smu_context *smu,enum smu_message_type msg,uint32_t param); -int (*read_smc_arg)(struct smu_context *smu,uint32_t *arg); +void (*read_smc_arg)(struct smu_context *smu,uint32_t *arg);int (*init_display_count)(struct smu_context *smu,uint32_t count);int (*set_allowed_mask)(struct smu_context *smu);int (*get_enabled_mask)(struct smu_context *smu,uint32_t *feature_mask,uint32_t num);
drivers/gpu/drm/amd/powerplay/inc/smu_v11_0.h +1 -1
@@ -183,7 +183,7 @@ smu_v11_0_send_msg_with_param(struct smu_context *smu,enum smu_message_type msg, uint32_t param); -int smu_v11_0_read_arg (struct smu_context *smu,uint32_t *arg); +void smu_v11_0_read_arg (struct smu_context *smu,uint32_t *arg);int smu_v11_0_init_display_count (struct smu_context *smu,uint32_t count);
drivers/gpu/drm/amd/powerplay/inc/smu_v12_0.h +1 -1
@@ -40,7 +40,7 @@ struct smu_12_0_cmn2aisc_mapping {int smu_v12_0_send_msg_without_waiting (struct smu_context *smu,uint16_t msg); -int smu_v12_0_read_arg (struct smu_context *smu,uint32_t *arg); +void smu_v12_0_read_arg (struct smu_context *smu,uint32_t *arg);int smu_v12_0_wait_for_response (struct smu_context *smu);
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +9 -30
@@ -53,20 +53,11 @@ MODULE_FIRMWARE("amdgpu/navi12_smc.bin");#define SMU11_VOLTAGE_SCALE 4 -static int smu_v11_0_send_msg_without_waiting (struct smu_context *smu, -uint16_t msg) -{ -struct amdgpu_device *adev = smu->adev; -WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_66, msg); -return 0 ; -} - -int smu_v11_0_read_arg (struct smu_context *smu,uint32_t *arg) +void smu_v11_0_read_arg (struct smu_context *smu,uint32_t *arg) {struct amdgpu_device *adev = smu->adev; *arg =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_82); -return 0 ; }static int smu_v11_0_wait_for_response (struct smu_context *smu)
@@ -109,7 +100,7 @@ smu_v11_0_send_msg_with_param(struct smu_context *smu,WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_82, param); -smu_v11_0_send_msg_without_waiting (smu, (uint16_t )index); +WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_66, (uint16_t )index); ret =smu_v11_0_wait_for_response (smu);if (ret)
@@ -843,16 +834,12 @@ int smu_v11_0_get_enabled_mask(struct smu_context *smu, ret =smu_send_smc_msg (smu, SMU_MSG_GetEnabledSmuFeaturesHigh);if (ret)return ret; - ret =smu_read_smc_arg (smu, &feature_mask_high); -if (ret) -return ret; +smu_read_smc_arg (smu, &feature_mask_high); ret =smu_send_smc_msg (smu, SMU_MSG_GetEnabledSmuFeaturesLow);if (ret)return ret; - ret =smu_read_smc_arg (smu, &feature_mask_low); -if (ret) -return ret; +smu_read_smc_arg (smu, &feature_mask_low); feature_mask[0 ] = feature_mask_low; feature_mask[1 ] = feature_mask_high;
@@ -924,9 +911,7 @@ smu_v11_0_get_max_sustainable_clock(struct smu_context *smu, uint32_t *clock,return ret; } - ret =smu_read_smc_arg (smu, clock); -if (ret) -return ret; +smu_read_smc_arg (smu, clock);if (*clock !=0 )return 0 ;
@@ -939,7 +924,7 @@ smu_v11_0_get_max_sustainable_clock(struct smu_context *smu, uint32_t *clock,return ret; } - ret =smu_read_smc_arg (smu, clock); +smu_read_smc_arg (smu, clock);return ret; }
@@ -1107,9 +1092,7 @@ int smu_v11_0_get_current_clk_freq(struct smu_context *smu,if (ret)return ret; - ret =smu_read_smc_arg (smu, &freq); -if (ret) -return ret; +smu_read_smc_arg (smu, &freq); } freq *=100 ;
@@ -1749,18 +1732,14 @@ int smu_v11_0_get_dpm_ultimate_freq(struct smu_context *smu, enum smu_clk_type c ret =smu_send_smc_msg_with_param (smu, SMU_MSG_GetMaxDpmFreq, param);if (ret) goto failed; - ret =smu_read_smc_arg (smu, max); -if (ret) - goto failed; +smu_read_smc_arg (smu, max); }if (min) { ret =smu_send_smc_msg_with_param (smu, SMU_MSG_GetMinDpmFreq, param);if (ret) goto failed; - ret =smu_read_smc_arg (smu, min); -if (ret) - goto failed; +smu_read_smc_arg (smu, min); } failed:
drivers/gpu/drm/amd/powerplay/smu_v12_0.c +4 -18
@@ -41,21 +41,11 @@#define SMUIO_GFX_MISC_CNTL__PWR_GFXOFF_STATUS_MASK 0x00000006L#define SMUIO_GFX_MISC_CNTL__PWR_GFXOFF_STATUS__SHIFT 0x1 -int smu_v12_0_send_msg_without_waiting (struct smu_context *smu, -uint16_t msg) -{ -struct amdgpu_device *adev = smu->adev; - -WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_66, msg); -return 0 ; -} - -int smu_v12_0_read_arg (struct smu_context *smu,uint32_t *arg) +void smu_v12_0_read_arg (struct smu_context *smu,uint32_t *arg) {struct amdgpu_device *adev = smu->adev; *arg =RREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_82); -return 0 ; }int smu_v12_0_wait_for_response (struct smu_context *smu)
@@ -98,7 +88,7 @@ smu_v12_0_send_msg_with_param(struct smu_context *smu,WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_82, param); -smu_v12_0_send_msg_without_waiting (smu, (uint16_t )index); +WREG32_SOC15 (MP1 ,0 , mmMP1_SMN_C2PMSG_66, (uint16_t )index); ret =smu_v12_0_wait_for_response (smu);if (ret)
@@ -352,9 +342,7 @@ int smu_v12_0_get_dpm_ultimate_freq(struct smu_context *smu, enum smu_clk_type cpr_err ("Attempt to get max GX frequency from SMC Failed !\n" ); goto failed; } - ret =smu_read_smc_arg (smu, max); -if (ret) - goto failed; +smu_read_smc_arg (smu, max);break ;case SMU_UCLK :case SMU_FCLK :
@@ -383,9 +371,7 @@ int smu_v12_0_get_dpm_ultimate_freq(struct smu_context *smu, enum smu_clk_type cpr_err ("Attempt to get min GX frequency from SMC Failed !\n" ); goto failed; } - ret =smu_read_smc_arg (smu, min); -if (ret) - goto failed; +smu_read_smc_arg (smu, min);break ;case SMU_UCLK :case SMU_FCLK :
--
2.24.0
_______________________________________________
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%7CKevin1.Wang%40amd.com%7Cb2381beaed6e4f83074608d7789fe6ef%7C3dd8961fe4884e608e11a82d994e183d%7C0%7C0%7C637110500489978071&sdata=U15cqXp2n00LRZDeu2482cwoZmEIrXWHCgF4NFap%2BkQ%3D&reserved=0
_______________________________________________
amd-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/amd-gfx