drm/amd/powerplay: smu_v11_0: fix uninitialized variable use
Subsystems (2)
PATCH 1/2 drm/amd/powerplay: smu_v11_0: fix uninitialized variable use
A mistake in the error handling caused an uninitialized variable to be used:
drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c:1102:10: error: variable 'freq' is used uninitialized whenever '?:' condition is false [-Werror,-Wsometimes-uninitialized]
ret = smu_get_current_clk_freq_by_table(smu, clk_id, &freq);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../powerplay/inc/amdgpu_smu.h:880:3: note: expanded from macro 'smu_get_current_clk_freq_by_table'
((smu)->ppt_funcs->get_current_clk_freq_by_table ? (smu)->ppt_funcs->get_current_clk_freq_by_table((smu), (clk_type), (value)) : 0)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c:1114:2: note: uninitialized use occurs here
freq *= 100;
^~~~
drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c:1102:10: note: remove the '?:' if its condition is always true
ret = smu_get_current_clk_freq_by_table(smu, clk_id, &freq);
^
drivers/gpu/drm/amd/amdgpu/../powerplay/inc/amdgpu_smu.h:880:3: note: expanded from macro 'smu_get_current_clk_freq_by_table'
((smu)->ppt_funcs->get_current_clk_freq_by_table ? (smu)->ppt_funcs->get_current_clk_freq_by_table((smu), (clk_type), (value)) : 0)
^
drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c:1095:15: note: initialize the variable 'freq' to silence this warning
uint32_t freq;
^
= 0Bail out of smu_v11_0_get_current_clk_freq() before we get there.
--- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +4 -2
@@ -1099,9 +1099,11 @@ static int smu_v11_0_get_current_clk_freq(struct smu_context *smu,return -EINVAL ;/* if don't has GetDpmClockFreq Message, try get current clock by SmuMetrics_t */ -if (smu_msg_get_index (smu, SMU_MSG_GetDpmClockFreq) ==0 ) +if (smu_msg_get_index (smu, SMU_MSG_GetDpmClockFreq) ==0 ) { ret =smu_get_current_clk_freq_by_table (smu, clk_id, &freq); -else { +if (ret) +return ret; + }else { ret =smu_send_smc_msg_with_param (smu, SMU_MSG_GetDpmClockFreq, (smu_clk_get_index (smu, clk_id) <<16 ));if (ret)
Signature · 1 line
2.20.0
PATCH 2/2 drm/amd/powerplay: vega20: fix uninitialized variable use
If smu_get_current_rpm() fails, we can't use the output, as that may be uninitialized:
drivers/gpu/drm/amd/amdgpu/../powerplay/vega20_ppt.c:3023:8: error: variable 'current_rpm' is used uninitialized whenever '?:' condition is false [-Werror,-Wsometimes-uninitialized]
ret = smu_get_current_rpm(smu, ¤t_rpm);
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../powerplay/inc/amdgpu_smu.h:735:3: note: expanded from macro 'smu_get_current_rpm'
((smu)->funcs->get_current_rpm ? (smu)->funcs->get_current_rpm((smu), (speed)) : 0)
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../powerplay/vega20_ppt.c:3024:12: note: uninitialized use occurs here
percent = current_rpm * 100 / pptable->FanMaximumRpm;
^~~~~~~~~~~
drivers/gpu/drm/amd/amdgpu/../powerplay/vega20_ppt.c:3023:8: note: remove the '?:' if its condition is always true
ret = smu_get_current_rpm(smu, ¤t_rpm);
^
drivers/gpu/drm/amd/amdgpu/../powerplay/inc/amdgpu_smu.h:735:3: note: expanded from macro 'smu_get_current_rpm'
((smu)->funcs->get_current_rpm ? (smu)->funcs->get_current_rpm((smu), (speed)) : 0)
^
drivers/gpu/drm/amd/amdgpu/../powerplay/vega20_ppt.c:3020:22: note: initialize the variable 'current_rpm' to silence this warning
uint32_t current_rpm;Propagate the error code in that case.
--- drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/powerplay/vega20_ppt.c +4 -1
@@ -3021,10 +3021,13 @@ static int vega20_get_fan_speed_percent(struct smu_context *smu,PPTable_t *pptable = smu->smu_table.driver_pptable; ret =smu_get_current_rpm (smu, ¤t_rpm); +if (ret) +return ret; + percent = current_rpm *100 / pptable->FanMaximumRpm; *speed = percent >100 ?100 : percent; -return ret; +return 0 ; }static int vega20_get_gpu_power (struct smu_context *smu,uint32_t *value)
Signature · 1 line
2.20.0
Alex Deucher
AppliedRe: [PATCH 2/2] drm/amd/powerplay: vega20: fix uninitialized variable use
Quoted 22 lines · Arnd Bergmann
If
smu_get_current_rpm()fails, we can't use the output, as that may be uninitialized:
drivers/gpu/drm/amd/amdgpu/../powerplay/vega20_ppt.c:3023:8: error: variable 'current_rpm' is used uninitialized whenever '?:' condition is false [-Werror,-Wsometimes-uninitialized]ret = smu_get_current_rpm(smu, ¤t_rpm); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/amd/amdgpu/../powerplay/inc/amdgpu_smu.h:735:3: note: expanded from macro 'smu_get_current_rpm' ((smu)->funcs->get_current_rpm ? (smu)->funcs->get_current_rpm((smu), (speed)) : 0) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/amd/amdgpu/../powerplay/vega20_ppt.c:3024:12: note: uninitialized use occurs here percent = current_rpm * 100 / pptable->FanMaximumRpm; ^~~~~~~~~~~ drivers/gpu/drm/amd/amdgpu/../powerplay/vega20_ppt.c:3023:8: note: remove the '?:' if its condition is always true ret = smu_get_current_rpm(smu, ¤t_rpm); ^ drivers/gpu/drm/amd/amdgpu/../powerplay/inc/amdgpu_smu.h:735:3: note: expanded from macro 'smu_get_current_rpm' ((smu)->funcs->get_current_rpm ? (smu)->funcs->get_current_rpm((smu), (speed)) : 0) ^ drivers/gpu/drm/amd/amdgpu/../powerplay/vega20_ppt.c:3020:22: note: initialize the variable 'current_rpm' to silence this warning uint32_t current_rpm;
Quoted 4 lines
Propagate the error code in that case.
Fixes ee0db82027ee ("drm/amd/powerplay: move PPTable_t uses into asic level")Signed-off-by Arnd Bergmann <[email protected]>
Applied. thanks!
Alex
Quoted 30 lines
--- drivers/gpu/drm/amd/powerplay/vega20_ppt.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)drivers/gpu/drm/amd/powerplay/vega20_ppt.c +4
-2@@ -3021,10 +3021,13 @@ static int vega20_get_fan_speed_percent(struct smu_context *smu,PPTable_t *pptable = smu->smu_table.driver_pptable; ret =smu_get_current_rpm (smu, ¤t_rpm); +if (ret) +return ret; + percent = current_rpm *100 / pptable->FanMaximumRpm; *speed = percent >100 ?100 : percent; -return ret; +return 0 ; }static int vega20_get_gpu_power (struct smu_context *smu,uint32_t *value) --2.20.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 36 lines · Arnd Bergmann
A mistake in the error handling caused an uninitialized variable to be used:
drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c:1102:10: error: variable 'freq' is used uninitialized whenever '?:' condition is false [-Werror,-Wsometimes-uninitialized]ret = smu_get_current_clk_freq_by_table(smu, clk_id, &freq); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/amd/amdgpu/../powerplay/inc/amdgpu_smu.h:880:3: note: expanded from macro 'smu_get_current_clk_freq_by_table' ((smu)->ppt_funcs->get_current_clk_freq_by_table ? (smu)->ppt_funcs->get_current_clk_freq_by_table((smu), (clk_type), (value)) : 0) ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c:1114:2: note: uninitialized use occurs here freq *= 100; ^~~~ drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c:1102:10: note: remove the '?:' if its condition is always true ret = smu_get_current_clk_freq_by_table(smu, clk_id, &freq); ^ drivers/gpu/drm/amd/amdgpu/../powerplay/inc/amdgpu_smu.h:880:3: note: expanded from macro 'smu_get_current_clk_freq_by_table' ((smu)->ppt_funcs->get_current_clk_freq_by_table ? (smu)->ppt_funcs->get_current_clk_freq_by_table((smu), (clk_type), (value)) : 0) ^ drivers/gpu/drm/amd/amdgpu/../powerplay/smu_v11_0.c:1095:15: note: initialize the variable 'freq' to silence this warning uint32_t freq; ^ = 0Bail out of
smu_v11_0_get_current_clk_freq()before we get there.Fixes e36182490dec ("drm/amd/powerplay: fix dpm freq unit error (10KHz -> Mhz)")Signed-off-by Arnd Bergmann <[email protected]>--- drivers/gpu/drm/amd/powerplay/smu_v11_0.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)drivers/gpu/drm/amd/powerplay/smu_v11_0.c +0
-0
drivers/gpu/drm/amd/powerplay/smu_v11_0.c static int smu_v11_0_get_current_clk_freq(struct smu_context *smu, · line 1105
Quoted 9 lines
drivers/gpu/drm/amd/powerplay/smu_v11_0.c +3
-2@@ -1099,9 +1099,11 @@ static int smu_v11_0_get_current_clk_freq(struct smu_context *smu,return -EINVAL ;/* if don't has GetDpmClockFreq Message, try get current clock by SmuMetrics_t */ -if (smu_msg_get_index (smu, SMU_MSG_GetDpmClockFreq) ==0 ) +if (smu_msg_get_index (smu, SMU_MSG_GetDpmClockFreq) ==0 ) { ret =smu_get_current_clk_freq_by_table (smu, clk_id, &freq); -else { +if (ret) +return ret;
I am kind of surprised that this fixes the warning. If I am interpreting the warning correctly, it is complaining that the member get_current_clk_freq_by_table could be NULL and not be called to initialize freq and that entire statement will become 0. If that is the case, it seems like this added error handling won't fix that problem, right?
Cheers,
Nathan
Quoted 9 lines · Nathan Chancellor
drivers/gpu/drm/amd/powerplay/smu_v11_0.c static int smu_v11_0_get_current_clk_freq(struct smu_context *smu, · line 1105
Quoted 7 lines · Arnd Bergmann
/* if don't has GetDpmClockFreq Message, try get current clock by SmuMetrics_t */drivers/gpu/drm/amd/powerplay/smu_v11_0.c +3
-2-if (smu_msg_get_index (smu, SMU_MSG_GetDpmClockFreq) ==0 ) +if (smu_msg_get_index (smu, SMU_MSG_GetDpmClockFreq) ==0 ) { ret =smu_get_current_clk_freq_by_table (smu, clk_id, &freq); -else { +if (ret) +return ret;
Quoted 6 lines
I am kind of surprised that this fixes the warning. If I am interpreting the warning correctly, it is complaining that the member
get_current_clk_freq_by_tablecould be NULL and not be called to initialize freq and that entire statement will become 0. If that is the case, it seems like this added error handling won't fix that problem, right?
No, I'm fairly sure this is the right fix. Looking at the whole function:
| static int smu_v11_0_get_current_clk_freq(struct smu_context *smu,
| enum smu_clk_type clk_id,
| uint32_t *value)
|{
| int ret = 0;
| uint32_t freq;
|
| if (clk_id >= SMU_CLK_COUNT || !value)
| return -EINVAL;
|
| /* if don't has GetDpmClockFreq Message, try get currentclock by SmuMetrics_t */
| if (smu_msg_get_index(smu, SMU_MSG_GetDpmClockFreq) == 0) {
| ret = smu_get_current_clk_freq_by_table(smu, clk_id, &freq);
Here &freq may or may not get initialized
| } else {
| ret = smu_send_smc_msg_with_param(smu, SMU_MSG_GetDpmClockFreq,
|
(smu_clk_get_index(smu, clk_id) << 16));
| if (ret)
| return ret;
|
| ret = smu_read_smc_arg(smu, &freq);
| if (ret)
| return ret;Same here, but if it's not initialized, we bail out
| } | | freq *= 100; | *value = freq;
And here it gets assigned to *value
| return ret;
|}
Arnd