drm/amdgpu/pm: Fix uninitialized variable agc_btc_response
Subsystems (3)
PATCH 1/2 drm/amdgpu/pm: Fix uninitialized variable agc_btc_response
Assign an default value to agc_btc_response in failed case
--- drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +7 -2
@@ -2350,15 +2350,20 @@ static int vega10_acg_enable(struct pp_hwmgr *hwmgr) {struct vega10_hwmgr *data = hwmgr->backend;uint32_t agc_btc_response; +int ret;if (data->smu_features[GNLD_ACG ].supported) {if (0 ==vega10_enable_smc_features (hwmgr, true, data->smu_features[GNLD_DPM_PREFETCHER ].smu_feature_bitmap)) data->smu_features[GNLD_DPM_PREFETCHER ].enabled = true; -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_InitializeAcg,NULL ); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_InitializeAcg,NULL ); +if (ret) +return ret; -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_RunAcgBtc, &agc_btc_response); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_RunAcgBtc, &agc_btc_response); +if (ret) + agc_btc_response =0 ;if (1 == agc_btc_response) {if (1 == data->acg_loop_state)
Signature · 1 line
2.34.1
PATCH 2/2 drm/amdgpu/pm: Fix uninitialized variable warning
Check return value of smum_send_msg_to_smc to fix
uninitialized variable varning
--- .../drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 21 ++++++++++++++----- .../drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 8 +++++-- .../drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 6 ++++-- .../drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 6 ++++-- 4 files changed, 30 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c +16 -5
@@ -1554,7 +1554,10 @@ static int smu10_set_fine_grain_clk_vol(struct pp_hwmgr *hwmgr, }if (input[0 ] ==0 ) { -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); +if (ret) +return ret; +if (input[1 ] < min_freq) {pr_err ("Fine grain setting minimum sclk (%ld) MHz is less than the minimum allowed (%d) MHz\n" , input[1 ], min_freq);
@@ -1562,7 +1565,10 @@ static int smu10_set_fine_grain_clk_vol(struct pp_hwmgr *hwmgr, } smu10_data->gfx_actual_soft_min_freq = input[1 ]; }else if (input[0 ] ==1 ) { -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); +if (ret) +return ret; +if (input[1 ] > max_freq) {pr_err ("Fine grain setting maximum sclk (%ld) MHz is greater than the maximum allowed (%d) MHz\n" , input[1 ], max_freq);
@@ -1577,10 +1583,15 @@ static int smu10_set_fine_grain_clk_vol(struct pp_hwmgr *hwmgr,pr_err ("Input parameter number not correct\n" );return -EINVAL ; } -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); - + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); +if (ret) +return ret; smu10_data->gfx_actual_soft_min_freq = min_freq; + + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); +if (ret) +return ret; + smu10_data->gfx_actual_soft_max_freq = max_freq; }else if (type ==PP_OD_COMMIT_DPM_TABLE ) {if (size !=0 ) {
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +6 -2
@@ -2486,9 +2486,13 @@ static int vega10_populate_and_upload_avfs_fuse_override(struct pp_hwmgr *hwmgr)struct vega10_hwmgr *data = hwmgr->backend;AvfsFuseOverride_t *avfs_fuse_table = &(data->smc_state_table.avfs_fuse_override_table); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); + result =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); +if (result) +return result; -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); + result =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); +if (result) +return result; serial_number = ((uint64_t )bottom32 <<32 ) | top32;
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c +4 -2
@@ -364,8 +364,10 @@ static void vega12_init_dpm_defaults(struct pp_hwmgr *hwmgr) }/* Get the SN to turn into a Unique ID */ -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32)) +return ; +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32)) +return ; adev->unique_id = ((uint64_t )bottom32 <<32 ) | top32; }
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +4 -2
@@ -404,8 +404,10 @@ static void vega20_init_dpm_defaults(struct pp_hwmgr *hwmgr) }/* Get the SN to turn into a Unique ID */ -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32)) +return ; +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32)) +return ; adev->unique_id = ((uint64_t )bottom32 <<32 ) | top32; }
Signature · 1 line
2.34.1
Re: [PATCH 2/2] drm/amdgpu/pm: Fix uninitialized variable warning
Quoted 103 lines · Ma Jun
Check return value of
smum_send_msg_to_smcto fix
uninitialized variable varningSigned-off-by Ma Jun <[email protected]>--- .../drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 21 ++++++++++++++----- .../drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 8 +++++-- .../drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 6 ++++-- .../drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 6 ++++-- 4 files changed, 30 insertions(+), 11 deletions(-)drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c +16
-5@@ -1554,7 +1554,10 @@ static int smu10_set_fine_grain_clk_vol(struct pp_hwmgr *hwmgr, }if (input[0 ] ==0 ) { -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); +if (ret) +return ret; +if (input[1 ] < min_freq) {pr_err ("Fine grain setting minimum sclk (%ld) MHz is less than the minimum allowed (%d) MHz\n" , input[1 ], min_freq);@@ -1562,7 +1565,10 @@ static int smu10_set_fine_grain_clk_vol(struct pp_hwmgr *hwmgr, } smu10_data->gfx_actual_soft_min_freq = input[1 ]; }else if (input[0 ] ==1 ) { -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); +if (ret) +return ret; +if (input[1 ] > max_freq) {pr_err ("Fine grain setting maximum sclk (%ld) MHz is greater than the maximum allowed (%d) MHz\n" , input[1 ], max_freq);@@ -1577,10 +1583,15 @@ static int smu10_set_fine_grain_clk_vol(struct pp_hwmgr *hwmgr,pr_err ("Input parameter number not correct\n" );return -EINVAL ; } -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); - + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); +if (ret) +return ret; smu10_data->gfx_actual_soft_min_freq = min_freq; + + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); +if (ret) +return ret; + smu10_data->gfx_actual_soft_max_freq = max_freq; }else if (type ==PP_OD_COMMIT_DPM_TABLE ) {if (size !=0 ) {drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +6
-2@@ -2486,9 +2486,13 @@ static int vega10_populate_and_upload_avfs_fuse_override(struct pp_hwmgr *hwmgr)struct vega10_hwmgr *data = hwmgr->backend;AvfsFuseOverride_t *avfs_fuse_table = &(data->smc_state_table.avfs_fuse_override_table); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); + result =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); +if (result) +return result; -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); + result =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); +if (result) +return result; serial_number = ((uint64_t )bottom32 <<32 ) | top32;drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c +4
-2@@ -364,8 +364,10 @@ static void vega12_init_dpm_defaults(struct pp_hwmgr *hwmgr) }/* Get the SN to turn into a Unique ID */ -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32)) +return ; +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32)) +return ; adev->unique_id = ((uint64_t )bottom32 <<32 ) | top32; }drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +0
-0@@ -404,8 +404,10 @@ static void vega20_init_dpm_defaults(struct pp_hwmgr *hwmgr) }
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c static void vega20_init_dpm_defaults(struct pp_hwmgr *hwmgr) · line 413
Quoted 10 lines
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +4
-2/* Get the SN to turn into a Unique ID */ -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32)) +return ; +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32)) +return ; adev->unique_id = ((uint64_t )bottom32 <<32 ) | top32; }
Please align with Tim on the powerplay changes. E.g., See this patch:
drm/amd/pm: fix uninitialized variable warnings for vega10_hwmgr I'd like to have consistent function signatures for these functions.
Alex
Quoted 3 lines
--
2.34.1
Re: [PATCH 2/2] drm/amdgpu/pm: Fix uninitialized variable warning
Quoted 112 lines · Alex Deucher
Quoted 111 lines · Ma Jun
Check return value of
smum_send_msg_to_smcto fix
uninitialized variable varningSigned-off-by Ma Jun <[email protected]>--- .../drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 21 ++++++++++++++----- .../drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 8 +++++-- .../drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 6 ++++-- .../drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 6 ++++-- 4 files changed, 30 insertions(+), 11 deletions(-)drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c +16
-5@@ -1554,7 +1554,10 @@ static int smu10_set_fine_grain_clk_vol(struct pp_hwmgr *hwmgr, }if (input[0 ] ==0 ) { -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); +if (ret) +return ret; +if (input[1 ] < min_freq) {pr_err ("Fine grain setting minimum sclk (%ld) MHz is less than the minimum allowed (%d) MHz\n" , input[1 ], min_freq);@@ -1562,7 +1565,10 @@ static int smu10_set_fine_grain_clk_vol(struct pp_hwmgr *hwmgr, } smu10_data->gfx_actual_soft_min_freq = input[1 ]; }else if (input[0 ] ==1 ) { -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); +if (ret) +return ret; +if (input[1 ] > max_freq) {pr_err ("Fine grain setting maximum sclk (%ld) MHz is greater than the maximum allowed (%d) MHz\n" , input[1 ], max_freq);@@ -1577,10 +1583,15 @@ static int smu10_set_fine_grain_clk_vol(struct pp_hwmgr *hwmgr,pr_err ("Input parameter number not correct\n" );return -EINVAL ; } -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); - + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); +if (ret) +return ret; smu10_data->gfx_actual_soft_min_freq = min_freq; + + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); +if (ret) +return ret; + smu10_data->gfx_actual_soft_max_freq = max_freq; }else if (type ==PP_OD_COMMIT_DPM_TABLE ) {if (size !=0 ) {drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +6
-2@@ -2486,9 +2486,13 @@ static int vega10_populate_and_upload_avfs_fuse_override(struct pp_hwmgr *hwmgr)struct vega10_hwmgr *data = hwmgr->backend;AvfsFuseOverride_t *avfs_fuse_table = &(data->smc_state_table.avfs_fuse_override_table); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); + result =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); +if (result) +return result; -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); + result =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); +if (result) +return result; serial_number = ((uint64_t )bottom32 <<32 ) | top32;drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c +4
-2@@ -364,8 +364,10 @@ static void vega12_init_dpm_defaults(struct pp_hwmgr *hwmgr) }/* Get the SN to turn into a Unique ID */ -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32)) +return ; +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32)) +return ; adev->unique_id = ((uint64_t )bottom32 <<32 ) | top32; }drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +4
-2@@ -404,8 +404,10 @@ static void vega20_init_dpm_defaults(struct pp_hwmgr *hwmgr) }/* Get the SN to turn into a Unique ID */ -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32)) +return ; +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32)) +return ;
Quoted 6 lines
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c static void vega20_init_dpm_defaults(struct pp_hwmgr *hwmgr) · line 413
Quoted 2 lines
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +0
-0adev->unique_id = ((uint64_t )bottom32 <<32 ) | top32; }Please align with Tim on the powerplay changes. E.g., See this patch:
drm/amd/pm: fix uninitialized variable warnings forvega10_hwmgrI'd like to have consistent function signatures for these functions.
Ok, I will update this in next version
Regards,
Ma Jun
Quoted 6 lines
Alex
Quoted 3 lines
--
2.34.1
RE: [PATCH 2/2] drm/amdgpu/pm: Fix uninitialized variable warning
In reply to Ma Jun[AMD Official Use Only - General]
Series is.
Best Regards,
Kevin
-----Original Message-----
From: Ma, Jun <[email protected]>
Sent: Sunday, April 28, 2024 5:55 PM
To: [email protected]
Cc: Feng, Kenneth <[email protected]>; Deucher, Alexander <[email protected]>; Wang, Yang(Kevin) <[email protected]>; Koenig, Christian <[email protected]>; Ma, Jun <[email protected]>
Subject: [PATCH 2/2] drm/amdgpu/pm: Fix uninitialized variable warning
Check return value of smum_send_msg_to_smc to fix uninitialized variable varning
--- .../drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 21 ++++++++++++++----- .../drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 8 +++++-- .../drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 6 ++++-- .../drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 6 ++++-- 4 files changed, 30 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c +16 -5
@@ -1554,7 +1554,10 @@ static int smu10_set_fine_grain_clk_vol(struct pp_hwmgr *hwmgr, }if (input[0 ] ==0 ) { -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); +if (ret) +return ret; +if (input[1 ] < min_freq) {pr_err ("Fine grain setting minimum sclk (%ld) MHz is less than the minimum allowed (%d) MHz\n" , input[1 ], min_freq);
@@ -1562,7 +1565,10 @@ static int smu10_set_fine_grain_clk_vol(struct pp_hwmgr *hwmgr, } smu10_data->gfx_actual_soft_min_freq = input[1 ]; }else if (input[0 ] ==1 ) { -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); +if (ret) +return ret; +if (input[1 ] > max_freq) {pr_err ("Fine grain setting maximum sclk (%ld) MHz is greater than the maximum allowed (%d) MHz\n" , input[1 ], max_freq);
@@ -1577,10 +1583,15 @@ static int smu10_set_fine_grain_clk_vol(struct pp_hwmgr *hwmgr,pr_err ("Input parameter number not correct\n" );return -EINVAL ; } -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); - + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); +if (ret) +return ret; smu10_data->gfx_actual_soft_min_freq = min_freq; + + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); +if (ret) +return ret; + smu10_data->gfx_actual_soft_max_freq = max_freq; }else if (type ==PP_OD_COMMIT_DPM_TABLE ) {if (size !=0 ) {
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +6 -2
@@ -2486,9 +2486,13 @@ static int vega10_populate_and_upload_avfs_fuse_override(struct pp_hwmgr *hwmgr)struct vega10_hwmgr *data = hwmgr->backend;AvfsFuseOverride_t *avfs_fuse_table = &(data->smc_state_table.avfs_fuse_override_table); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); + result =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); +if (result) +return result; -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); + result =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); +if (result) +return result; serial_number = ((uint64_t )bottom32 <<32 ) | top32;
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c +4 -2
@@ -364,8 +364,10 @@ static void vega12_init_dpm_defaults(struct pp_hwmgr *hwmgr) }/* Get the SN to turn into a Unique ID */ -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32)) +return ; +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32)) +return ; adev->unique_id = ((uint64_t)bottom32 << 32) | top32; } diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c
index f9efb0bad807..3a95f7c4c6e3 100644
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +4 -3
@@ -404,8 +404,10 @@ static void vega20_init_dpm_defaults(struct pp_hwmgr *hwmgr) }/* Get the SN to turn into a Unique ID */ -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32)) +return ; +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32)) +return ; adev->unique_id = ((uint64_t )bottom32 <<32 ) | top32; } --
2.34.1
RE: [PATCH 2/2] drm/amdgpu/pm: Fix uninitialized variable warning
In reply to Ma Jun[AMD Official Use Only - General]
Series is
Best Regards,
Kevin
-----Original Message-----
From: Ma, Jun <[email protected]>
Sent: Sunday, April 28, 2024 5:55 PM
To: [email protected]
Cc: Feng, Kenneth <[email protected]>; Deucher, Alexander <[email protected]>; Wang, Yang(Kevin) <[email protected]>; Koenig, Christian <[email protected]>; Ma, Jun <[email protected]>
Subject: [PATCH 2/2] drm/amdgpu/pm: Fix uninitialized variable warning
Check return value of smum_send_msg_to_smc to fix uninitialized variable varning
--- .../drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 21 ++++++++++++++----- .../drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 8 +++++-- .../drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 6 ++++-- .../drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 6 ++++-- 4 files changed, 30 insertions(+), 11 deletions(-)
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c +16 -5
@@ -1554,7 +1554,10 @@ static int smu10_set_fine_grain_clk_vol(struct pp_hwmgr *hwmgr, }if (input[0 ] ==0 ) { -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); +if (ret) +return ret; +if (input[1 ] < min_freq) {pr_err ("Fine grain setting minimum sclk (%ld) MHz is less than the minimum allowed (%d) MHz\n" , input[1 ], min_freq);
@@ -1562,7 +1565,10 @@ static int smu10_set_fine_grain_clk_vol(struct pp_hwmgr *hwmgr, } smu10_data->gfx_actual_soft_min_freq = input[1 ]; }else if (input[0 ] ==1 ) { -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); +if (ret) +return ret; +if (input[1 ] > max_freq) {pr_err ("Fine grain setting maximum sclk (%ld) MHz is greater than the maximum allowed (%d) MHz\n" , input[1 ], max_freq);
@@ -1577,10 +1583,15 @@ static int smu10_set_fine_grain_clk_vol(struct pp_hwmgr *hwmgr,pr_err ("Input parameter number not correct\n" );return -EINVAL ; } -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); - + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMinGfxclkFrequency, &min_freq); +if (ret) +return ret; smu10_data->gfx_actual_soft_min_freq = min_freq; + + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetMaxGfxclkFrequency, &max_freq); +if (ret) +return ret; + smu10_data->gfx_actual_soft_max_freq = max_freq; }else if (type ==PP_OD_COMMIT_DPM_TABLE ) {if (size !=0 ) {
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +6 -2
@@ -2486,9 +2486,13 @@ static int vega10_populate_and_upload_avfs_fuse_override(struct pp_hwmgr *hwmgr)struct vega10_hwmgr *data = hwmgr->backend;AvfsFuseOverride_t *avfs_fuse_table = &(data->smc_state_table.avfs_fuse_override_table); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); + result =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); +if (result) +return result; -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); + result =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); +if (result) +return result; serial_number = ((uint64_t )bottom32 <<32 ) | top32;
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c +4 -2
@@ -364,8 +364,10 @@ static void vega12_init_dpm_defaults(struct pp_hwmgr *hwmgr) }/* Get the SN to turn into a Unique ID */ -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32)) +return ; +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32)) +return ; adev->unique_id = ((uint64_t)bottom32 << 32) | top32; } diff --git a/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c b/drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c
index f9efb0bad807..3a95f7c4c6e3 100644
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +4 -3
@@ -404,8 +404,10 @@ static void vega20_init_dpm_defaults(struct pp_hwmgr *hwmgr) }/* Get the SN to turn into a Unique ID */ -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32)) +return ; +if (smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32)) +return ; adev->unique_id = ((uint64_t )bottom32 <<32 ) | top32; } --
2.34.1