drm/amd/pm: fix uninitialized variable warning
Subsystems (3)
PATCH v2 2/2 drm/amd/pm: fix uninitialized variable warning
Check the return of function smum_send_msg_to_smc
as it may fail to initialize the variable.
--- .../drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 8 +++++-- .../drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 21 ++++++++++++------- .../drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 19 +++++++++++------ .../amd/pm/powerplay/smumgr/smu10_smumgr.c | 5 ++++- 4 files changed, 37 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c +6 -2
@@ -1310,13 +1310,17 @@ static int smu10_read_sensor(struct pp_hwmgr *hwmgr, int idx,switch (idx) {case AMDGPU_PP_SENSOR_GFX_SCLK : -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetGfxclkFrequency, &sclk); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetGfxclkFrequency, &sclk); +if (ret) +break ;/* in units of 10KHZ */ *((uint32_t *)value) = sclk *100 ; *size =4 ;break ;case AMDGPU_PP_SENSOR_GFX_MCLK : -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetFclkFrequency, &mclk); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetFclkFrequency, &mclk); +if (ret) +break ;/* in units of 10KHZ */ *((uint32_t *)value) = mclk *100 ; *size =4 ;
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +14 -7
@@ -4000,6 +4000,7 @@ static int smu7_read_sensor(struct pp_hwmgr *hwmgr, int idx,uint32_t offset, val_vid;struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr->backend);struct amdgpu_device *adev = hwmgr->adev; +int ret =0 ;/* size must be at least 4 bytes for all sensors */ if (*size <4 )
@@ -4007,12 +4008,16 @@ static int smu7_read_sensor(struct pp_hwmgr *hwmgr, int idx,switch (idx) {case AMDGPU_PP_SENSOR_GFX_SCLK : -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_API_GetSclkFrequency, &sclk); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_API_GetSclkFrequency, &sclk); +if (ret) +return ret; *((uint32_t *)value) = sclk; *size =4 ;return 0 ;case AMDGPU_PP_SENSOR_GFX_MCLK : -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_API_GetMclkFrequency, &mclk); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_API_GetMclkFrequency, &mclk); +if (ret) +return ret; *((uint32_t *)value) = mclk; *size =4 ;return 0 ;
@@ -4965,13 +4970,14 @@ static int smu7_print_clock_levels(struct pp_hwmgr *hwmgr,struct smu7_odn_dpm_table *odn_table = &(data->odn_dpm_table);struct phm_odn_clock_levels *odn_sclk_table = &(odn_table->odn_core_clock_dpm_levels);struct phm_odn_clock_levels *odn_mclk_table = &(odn_table->odn_memory_clock_dpm_levels); -int size =0 ; +int size =0 , ret =0 ;uint32_t i, now, clock, pcie_speed;switch (type) {case PP_SCLK : -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_API_GetSclkFrequency, &clock); - + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_API_GetSclkFrequency, &clock); +if (ret) +return ret;for (i =0 ; i < sclk_table->count; i++) {if (clock > sclk_table->dpm_levels[i].value)continue ;
@@ -4985,8 +4991,9 @@ static int smu7_print_clock_levels(struct pp_hwmgr *hwmgr, (i == now) ? "*" : "");break ;case PP_MCLK : -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_API_GetMclkFrequency, &clock); - + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_API_GetMclkFrequency, &clock); +if (ret) +return ret;for (i =0 ; i < mclk_table->count; i++) {if (clock > mclk_table->dpm_levels[i].value)continue ;
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +13 -6
@@ -2481,10 +2481,12 @@ 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); - -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); - + result =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumTop32, &top32); +if (result) +return result; + result =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_ReadSerialNumBottom32, &bottom32); +if (result) +return result; serial_number = ((uint64_t )bottom32 <<32 ) | top32;if (pp_override_get_default_fuse_value (serial_number, &fuse) ==0 ) {
@@ -3924,11 +3926,16 @@ static int vega10_read_sensor(struct pp_hwmgr *hwmgr, int idx,switch (idx) {case AMDGPU_PP_SENSOR_GFX_SCLK : -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetAverageGfxclkActualFrequency, &sclk_mhz); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetAverageGfxclkActualFrequency, &sclk_mhz); +if (ret) +break ; + *((uint32_t *)value) = sclk_mhz *100 ;break ;case AMDGPU_PP_SENSOR_GFX_MCLK : -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetCurrentUclkIndex, &mclk_idx); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetCurrentUclkIndex, &mclk_idx); +if (ret) +break ;if (mclk_idx < dpm_table->mem_table.count) { *((uint32_t *)value) = dpm_table->mem_table.dpm_levels[mclk_idx].value; *size =4 ;
drivers/gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.c +4 -1
@@ -185,10 +185,13 @@ static int smu10_copy_table_to_smc(struct pp_hwmgr *hwmgr,static int smu10_verify_smc_interface (struct pp_hwmgr *hwmgr) {uint32_t smc_driver_if_version; +int ret =0 ; -smum_send_msg_to_smc (hwmgr, + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetDriverIfVersion, &smc_driver_if_version); +if (ret) +return ret;if ((smc_driver_if_version !=SMU10_DRIVER_IF_VERSION ) && (smc_driver_if_version !=SMU10_DRIVER_IF_VERSION +1 )) {
Signature · 1 line
2.25.1
[Public]
This patch is,
Best Regards,
Tim Huang
Quoted 205 lines
-----Original Message-----
From: Jesse Zhang <[email protected]>
Sent: Sunday, April 28, 2024 2:02 PM
To: [email protected]
Cc: Deucher, Alexander <[email protected]>; Koenig, Christian <[email protected]>; Huang, Tim <[email protected]>; Zhang, Jesse(Jie) <[email protected]>; Zhang, Jesse(Jie) <[email protected]>
Subject: [PATCH 2/2 V2] drm/amd/pm: fix uninitialized variable warningCheck the return of function
smum_send_msg_to_smcas it may fail to initialize the variable.Signed-off-by Jesse Zhang <[email protected]>--- .../drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 8 +++++-- .../drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 21 ++++++++++++----- -- .../drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 19 +++++++++++------ .../amd/pm/powerplay/smumgr/smu10_smumgr.c | 5 ++++- 4 files changed, 37 insertions(+), 16 deletions(-)drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c +3
-2@@ -1310,13 +1310,17 @@ static int smu10_read_sensor(struct pp_hwmgr *hwmgr, int idx, switch (idx) {case AMDGPU_PP_SENSOR_GFX_SCLK : -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetGfxclkFrequency, &sclk); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetGfxclkFrequency, &sclk); +if (ret) +break ;/* in units of 10KHZ */ *((uint32_t *)value) = sclk *100 ; *size =4 ;break ;case AMDGPU_PP_SENSOR_GFX_MCLK : - smum_send_msg_to_smc(hwmgr,
PPSMC_MSG_GetFclkFrequency, &mclk);
+ ret = smum_send_msg_to_smc(hwmgr,PPSMC_MSG_GetFclkFrequency, &mclk);drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c +2
-0+if (ret) +break ;/* in units of 10KHZ */ *((uint32_t *)value) = mclk *100 ; *size =4 ;drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +1
-0@@ -4000,6 +4000,7 @@ static int smu7_read_sensor(struct pp_hwmgr *hwmgr, int idx, uint32_t offset, val_vid;struct smu7_hwmgr *data = (struct smu7_hwmgr *)(hwmgr- >backend);struct amdgpu_device *adev = hwmgr->adev; +int ret =0 ;/* size must be at least 4 bytes for all sensors */ if (*size < 4)drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +3
-2@@ -4007,12 +4008,16 @@ static int smu7_read_sensor(struct pp_hwmgr *hwmgr, int idx, switch (idx) {case AMDGPU_PP_SENSOR_GFX_SCLK : -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_API_GetSclkFrequency, &sclk); + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_API_GetSclkFrequency, &sclk); +if (ret) +return ret; *((uint32_t *)value) = sclk; *size =4 ;return 0 ;case AMDGPU_PP_SENSOR_GFX_MCLK : - smum_send_msg_to_smc(hwmgr,
PPSMC_MSG_API_GetMclkFrequency, &mclk);
+ ret = smum_send_msg_to_smc(hwmgr,PPSMC_MSG_API_GetMclkFrequency, &mclk);drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +4
-3+if (ret) +return ret; *((uint32_t *)value) = mclk; *size =4 ;return 0 ;@@ -4965,13 +4970,14 @@ static int smu7_print_clock_levels(structpp_hwmgr *hwmgr, struct smu7_odn_dpm_table *odn_table = &(data->odn_dpm_table);struct phm_odn_clock_levels *odn_sclk_table = &(odn_table- >odn_core_clock_dpm_levels);struct phm_odn_clock_levels *odn_mclk_table = &(odn_table- >odn_memory_clock_dpm_levels); -int size =0 ; +int size =0 , ret =0 ;uint32_t i, now, clock, pcie_speed;switch (type) {case PP_SCLK : -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_API_GetSclkFrequency, &clock); - + ret = smum_send_msg_to_smc(hwmgr,
PPSMC_MSG_API_GetSclkFrequency, &clock);drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +5
-2+if (ret) +return ret;for (i =0 ; i < sclk_table->count; i++) {if (clock > sclk_table->dpm_levels[i].value)continue ;@@ -4985,8 +4991,9 @@ static int smu7_print_clock_levels(struct pp_hwmgr *hwmgr, (i == now) ? "*" : "");break ;case PP_MCLK : -smum_send_msg_to_smc (hwmgr, PPSMC_MSG_API_GetMclkFrequency, &clock); - + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_API_GetMclkFrequency, &clock); +if (ret) +return ret;for (i = 0; i < mclk_table->count; i++) { if (clock > mclk_table->dpm_levels[i].value) continue;drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +0
-0@@ -2481,10 +2481,12 @@ static int
vega10_populate_and_upload_avfs_fuse_override(struct pp_hwmgr *hwmgr)
structvega10_hwmgr*data =hwmgr->backend;AvfsFuseOverride_t*avfs_fuse_table= &(data-Quoted 1 line
smc_state_table.avfs_fuse_override_table);
- smum_send_msg_to_smc(hwmgr,
PPSMC_MSG_ReadSerialNumTop32, &top32);drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +0
-2- - smum_send_msg_to_smc(hwmgr,
PPSMC_MSG_ReadSerialNumBottom32, &bottom32);drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +1
-1- + result = smum_send_msg_to_smc(hwmgr,
PPSMC_MSG_ReadSerialNumTop32, &top32);drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +3
-0+if (result) +return result; + result = smum_send_msg_to_smc(hwmgr,
PPSMC_MSG_ReadSerialNumBottom32, &bottom32);drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +2
-0+if (result) +return result; serial_number = ((uint64_t )bottom32 <<32 ) | top32;if (pp_override_get_default_fuse_value (serial_number, &fuse) ==0 ){ @@ -3924,11 +3926,16 @@ static int vega10_read_sensor(struct
pp_hwmgr*hwmgr, int idx,switch (idx) { case AMDGPU_PP_SENSOR_GFX_SCLK:- smum_send_msg_to_smc(hwmgr,
PPSMC_MSG_GetAverageGfxclkActualFrequency,&sclk_mhz);
+ ret = smum_send_msg_to_smc(hwmgr,PPSMC_MSG_GetAverageGfxclkActualFrequency,&sclk_mhz);drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +3
-1+if (ret) +break ; + *((uint32_t *)value) = sclk_mhz *100 ;break ;case AMDGPU_PP_SENSOR_GFX_MCLK : - smum_send_msg_to_smc(hwmgr,
PPSMC_MSG_GetCurrentUclkIndex,&mclk_idx);
+ ret = smum_send_msg_to_smc(hwmgr,PPSMC_MSG_GetCurrentUclkIndex,&mclk_idx);drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +2
-0+if (ret) +break ;if (mclk_idx < dpm_table->mem_table.count) { *((uint32_t *)value) = dpm_table-Quoted 1 line
mem_table.dpm_levels[mclk_idx].value;
*size = 4;drivers/gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.c +0
-0@@ -185,10 +185,13 @@ static int smu10_copy_table_to_smc(struct
pp_hwmgr*hwmgr, static int smu10_verify_smc_interface(structpp_hwmgr*hwmgr) { uint32_t smc_driver_if_version;drivers/gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.c +4
-2+int ret =0 ; -smum_send_msg_to_smc (hwmgr, + ret =smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetDriverIfVersion, &smc_driver_if_version); +if (ret) +return ret;if ((smc_driver_if_version !=SMU10_DRIVER_IF_VERSION ) && (smc_driver_if_version !=SMU10_DRIVER_IF_VERSION +1 )) { --2.25.1