Replace usage of sprintf with sysfs_emit in hwmgr powerplay
Subsystems (3)
cover Replace usage of sprintf with sysfs_emit in hwmgr powerplay
=== Description ===
Replace usage of sprintf with sysfs_emit in hwmgr powerplay
=== Test System ===
* DESKTOP(AMD FX-8350 + VEGA10(687F/c3), BIOS: F2)
+ ISO(Ubuntu 20.04.2 LTS)
+ Kernel(5.13.0-gb1d634be9673-fdoagd5f)
=== Patch Summary ===
linux: ([email protected]:agd5f) origin/amd-staging-drm-next @ 2f56b0d631eb
+ 0ede8d563c58 amdgpu/pm: Replace vega10 usage of sprintf with sysfs_emit
+ 1d666a0652a1 amdgpu/pm: Replace vega12,20 usage of sprintf with sysfs_emit
+ 8bad9ffba08b amdgpu/pm: Replace hwmgr smu usage of sprintf with sysfs_emit
+ 773733df2f32 amdgpu/pm: Replace amdgpu_pm usage of sprintf with sysfs_emit
=== General Test for each platform ===
AMDGPU_PCI_ADDR=lspci -nn | grep "VGA\|Display" | cut -d " " -f 1 AMDGPU_HWMON=ls -la /sys/class/hwmon | grep $AMDGPU_PCI_ADDR | awk '{print $9}' HWMON_DIR=/sys/class/hwmon/${AMDGPU_HWMON} LOGFILE=pp_printf.test.log
lspci -nn | grep "VGA\|Display" > $LOGFILE
FILES="pp_dpm_sclkpp_featurespp_power_profile_mode "
for f in $FILES
do
echo === $f === >> $LOGFILE
cat $HWMON_DIR/device/$f >> $LOGFILE
done
cat $LOGFILE
Darren Powell (4):
amdgpu/pm: Replace vega10 usage of sprintf with sysfs_emit amdgpu/pm: Replace vega12,20 usage of sprintf with sysfs_emit amdgpu/pm: Replace hwmgr smu usage of sprintf with sysfs_emit amdgpu/pm: Replace amdgpu_pm usage of sprintf with sysfs_emit
drivers/gpu/drm/amd/pm/amdgpu_pm.c | 16 ++-- .../drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 22 +++--- .../drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 38 +++++----- .../drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 7 +- .../drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 38 +++++----- .../drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 14 ++-- .../drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 74 +++++++++---------- 7 files changed, 105 insertions(+), 104 deletions(-)
base-commit: 2f56b0d631eba0e76cfc789d85cc5632256ad42d
Signature · 1 line
2.32.0
PATCH 1/4 amdgpu/pm: Replace vega10 usage of sprintf with sysfs_emit
initial modification of files
vega10_hwmgr.c
=== Test ===
AMDGPU_PCI_ADDR=lspci -nn | grep "VGA\|Display" | cut -d " " -f 1 AMDGPU_HWMON=ls -la /sys/class/hwmon | grep $AMDGPU_PCI_ADDR | awk '{print $9}' HWMON_DIR=/sys/class/hwmon/${AMDGPU_HWMON} LOGFILE=pp_printf.test.log
lspci -nn | grep "VGA\|Display" > $LOGFILE
FILES="pp_dpm_sclkpp_featurespp_power_profile_mode "
for f in $FILES
do
echo === $f === >> $LOGFILE
cat $HWMON_DIR/device/$f >> $LOGFILE
done
cat $LOGFILE
--- .../drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 38 +++++++++---------- 1 file changed, 19 insertions(+), 19 deletions(-)
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +19 -19
@@ -4553,13 +4553,13 @@ static int vega10_get_ppfeature_status(struct pp_hwmgr *hwmgr, char *buf)"[EnableAllSmuFeatures] Failed to get enabled smc features!" , return ret); - size +=sprintf (buf + size,"Current ppfeatures: 0x%016llx\n" , features_enabled); - size +=sprintf (buf + size,"%-19s %-22s %s\n" , + size +=sysfs_emit_at (buf, size,"Current ppfeatures: 0x%016llx\n" , features_enabled); + size +=sysfs_emit_at (buf, size,"%-19s %-22s %s\n" , output_title[0 ], output_title[1 ], output_title[2 ]);for (i =0 ; i <GNLD_FEATURES_MAX ; i++) { - size +=sprintf (buf + size,"%-19s 0x%016llx %6s\n" , + size +=sysfs_emit_at (buf, size,"%-19s 0x%016llx %6s\n" , ppfeature_name[i],1ULL << i, (features_enabled & (1ULL << i)) ?"Y" :"N" );
@@ -4650,7 +4650,7 @@ static int vega10_print_clock_levels(struct pp_hwmgr *hwmgr,else count = sclk_table->count;for (i =0 ; i < count; i++) - size +=sprintf (buf + size,"%d: %uMhz %s\n" , + size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , i, sclk_table->dpm_levels[i].value /100 , (i == now) ?"*" :"" );break ;
@@ -4661,7 +4661,7 @@ static int vega10_print_clock_levels(struct pp_hwmgr *hwmgr,smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetCurrentUclkIndex, &now);for (i =0 ; i < mclk_table->count; i++) - size +=sprintf (buf + size,"%d: %uMhz %s\n" , + size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , i, mclk_table->dpm_levels[i].value /100 , (i == now) ?"*" :"" );break ;
@@ -4672,7 +4672,7 @@ static int vega10_print_clock_levels(struct pp_hwmgr *hwmgr,smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetCurrentSocclkIndex, &now);for (i =0 ; i < soc_table->count; i++) - size +=sprintf (buf + size,"%d: %uMhz %s\n" , + size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , i, soc_table->dpm_levels[i].value /100 , (i == now) ?"*" :"" );break ;
@@ -4684,7 +4684,7 @@ static int vega10_print_clock_levels(struct pp_hwmgr *hwmgr, PPSMC_MSG_GetClockFreqMHz, CLK_DCEFCLK, &now);for (i =0 ; i < dcef_table->count; i++) - size +=sprintf (buf + size,"%d: %uMhz %s\n" , + size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , i, dcef_table->dpm_levels[i].value /100 , (dcef_table->dpm_levels[i].value /100 == now) ?"*" :"" );
@@ -4698,7 +4698,7 @@ static int vega10_print_clock_levels(struct pp_hwmgr *hwmgr, gen_speed = pptable->PcieGenSpeed[i]; lane_width = pptable->PcieLaneCount[i]; - size +=sprintf (buf + size,"%d: %s %s %s\n" , i, + size +=sysfs_emit_at (buf, size,"%d: %s %s %s\n" , i, (gen_speed ==0 ) ?"2.5GT/s," : (gen_speed ==1 ) ?"5.0GT/s," : (gen_speed == 2) ? "8.0GT/s," :
@@ -4717,34 +4717,34 @@ static int vega10_print_clock_levels(struct pp_hwmgr *hwmgr,case OD_SCLK :if (hwmgr->od_enabled) { - size =sprintf (buf,"%s:\n" ,"OD_SCLK" ); + size =sysfs_emit (buf,"%s:\n" ,"OD_SCLK" ); podn_vdd_dep = &data->odn_dpm_table.vdd_dep_on_sclk;for (i =0 ; i < podn_vdd_dep->count; i++) - size +=sprintf (buf + size,"%d: %10uMhz %10umV\n" , + size +=sysfs_emit_at (buf, size,"%d: %10uMhz %10umV\n" , i, podn_vdd_dep->entries[i].clk /100 , podn_vdd_dep->entries[i].vddc); }break ;case OD_MCLK :if (hwmgr->od_enabled) { - size =sprintf (buf,"%s:\n" ,"OD_MCLK" ); + size =sysfs_emit (buf,"%s:\n" ,"OD_MCLK" ); podn_vdd_dep = &data->odn_dpm_table.vdd_dep_on_mclk;for (i =0 ; i < podn_vdd_dep->count; i++) - size +=sprintf (buf + size,"%d: %10uMhz %10umV\n" , + size +=sysfs_emit_at (buf, size,"%d: %10uMhz %10umV\n" , i, podn_vdd_dep->entries[i].clk/100 , podn_vdd_dep->entries[i].vddc); }break ;case OD_RANGE :if (hwmgr->od_enabled) { - size =sprintf (buf,"%s:\n" ,"OD_RANGE" ); - size +=sprintf (buf + size,"SCLK: %7uMHz %10uMHz\n" , + size =sysfs_emit (buf,"%s:\n" ,"OD_RANGE" ); + size +=sysfs_emit_at (buf, size,"SCLK: %7uMHz %10uMHz\n" , data->golden_dpm_table.gfx_table.dpm_levels[0 ].value/100 , hwmgr->platform_descriptor.overdriveLimit.engineClock/100 ); - size +=sprintf (buf + size,"MCLK: %7uMHz %10uMHz\n" , + size +=sysfs_emit_at (buf, size,"MCLK: %7uMHz %10uMHz\n" , data->golden_dpm_table.mem_table.dpm_levels[0 ].value/100 , hwmgr->platform_descriptor.overdriveLimit.memoryClock/100 ); - size +=sprintf (buf + size,"VDDC: %7umV %11umV\n" , + size +=sysfs_emit_at (buf, size,"VDDC: %7umV %11umV\n" , data->odn_dpm_table.min_vddc, data->odn_dpm_table.max_vddc); }
@@ -5112,15 +5112,15 @@ static int vega10_get_power_profile_mode(struct pp_hwmgr *hwmgr, char *buf)if (!buf)return -EINVAL ; - size +=sprintf (buf + size,"%s %16s %s %s %s %s\n" ,title[0 ], + size +=sysfs_emit_at (buf, size,"%s %16s %s %s %s %s\n" ,title[0 ], title[1 ], title[2 ], title[3 ], title[4 ], title[5 ]);for (i =0 ; i <PP_SMC_POWER_PROFILE_CUSTOM ; i++) - size +=sprintf (buf + size,"%3d %14s%s: %14d %3d %10d %14d\n" , + size +=sysfs_emit_at (buf, size,"%3d %14s%s: %14d %3d %10d %14d\n" , i, profile_name[i], (i == hwmgr->power_profile_mode) ?"*" :" " , profile_mode_setting[i][0 ], profile_mode_setting[i][1 ], profile_mode_setting[i][2 ], profile_mode_setting[i][3 ]); - size +=sprintf (buf + size,"%3d %14s%s: %14d %3d %10d %14d\n" , i, + size +=sysfs_emit_at (buf, size,"%3d %14s%s: %14d %3d %10d %14d\n" , i, profile_name[i], (i == hwmgr->power_profile_mode) ?"*" :" " , data->custom_profile_mode[0 ], data->custom_profile_mode[1 ], data->custom_profile_mode[2 ], data->custom_profile_mode[3 ]);
Signature · 1 line
2.32.0
PATCH 2/4 amdgpu/pm: Replace vega12, 20 usage of sprintf with sysfs_emit
In reply to Darren Powell=== Test ===
AMDGPU_PCI_ADDR=lspci -nn | grep "VGA\|Display" | cut -d " " -f 1 AMDGPU_HWMON=ls -la /sys/class/hwmon | grep $AMDGPU_PCI_ADDR | awk '{print $9}' HWMON_DIR=/sys/class/hwmon/${AMDGPU_HWMON} LOGFILE=pp_printf.test.log
lspci -nn | grep "VGA\|Display" > $LOGFILE
FILES="pp_dpm_sclkpp_featurespp_power_profile_mode "
for f in $FILES
do
echo === $f === >> $LOGFILE
cat $HWMON_DIR/device/$f >> $LOGFILE
done
cat $LOGFILE
--- .../drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 14 ++-- .../drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 74 +++++++++---------- 2 files changed, 44 insertions(+), 44 deletions(-)
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c +7 -7
@@ -2146,13 +2146,13 @@ static int vega12_get_ppfeature_status(struct pp_hwmgr *hwmgr, char *buf)"[EnableAllSmuFeatures] Failed to get enabled smc features!" , return ret); - size +=sprintf (buf + size,"Current ppfeatures: 0x%016llx\n" , features_enabled); - size +=sprintf (buf + size,"%-19s %-22s %s\n" , + size +=sysfs_emit_at (buf, size,"Current ppfeatures: 0x%016llx\n" , features_enabled); + size +=sysfs_emit_at (buf, size,"%-19s %-22s %s\n" , output_title[0 ], output_title[1 ], output_title[2 ]);for (i =0 ; i <GNLD_FEATURES_MAX ; i++) { - size +=sprintf (buf + size,"%-19s 0x%016llx %6s\n" , + size +=sysfs_emit_at (buf, size,"%-19s 0x%016llx %6s\n" , ppfeature_name[i],1ULL << i, (features_enabled & (1ULL << i)) ?"Y" :"N" );
@@ -2256,7 +2256,7 @@ static int vega12_print_clock_levels(struct pp_hwmgr *hwmgr,"Attempt to get gfx clk levels Failed!" , return -1);for (i =0 ; i < clocks.num_levels; i++) - size +=sprintf (buf + size,"%d: %uMhz %s\n" , + size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , i, clocks.data[i].clocks_in_khz /1000 , (clocks.data[i].clocks_in_khz /1000 == now /100 ) ?"*" :"" );break ;
@@ -2272,7 +2272,7 @@ static int vega12_print_clock_levels(struct pp_hwmgr *hwmgr,"Attempt to get memory clk levels Failed!" , return -1);for (i =0 ; i < clocks.num_levels; i++) - size +=sprintf (buf + size,"%d: %uMhz %s\n" , + size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , i, clocks.data[i].clocks_in_khz /1000 , (clocks.data[i].clocks_in_khz /1000 == now /100 ) ?"*" :"" );break ;
@@ -2290,7 +2290,7 @@ static int vega12_print_clock_levels(struct pp_hwmgr *hwmgr,"Attempt to get soc clk levels Failed!" , return -1);for (i =0 ; i < clocks.num_levels; i++) - size +=sprintf (buf + size,"%d: %uMhz %s\n" , + size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , i, clocks.data[i].clocks_in_khz /1000 , (clocks.data[i].clocks_in_khz /1000 == now) ?"*" :"" );break ;
@@ -2308,7 +2308,7 @@ static int vega12_print_clock_levels(struct pp_hwmgr *hwmgr,"Attempt to get dcef clk levels Failed!" , return -1);for (i =0 ; i < clocks.num_levels; i++) - size +=sprintf (buf + size,"%d: %uMhz %s\n" , + size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , i, clocks.data[i].clocks_in_khz /1000 , (clocks.data[i].clocks_in_khz /1000 == now) ?"*" :"" );break ;
drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +37 -37
225 lines not on this page · raw message
Signature · 1 line
2.32.0
PATCH 3/4 amdgpu/pm: Replace hwmgr smu usage of sprintf with sysfs_emit
In reply to Darren Powell replacing printfs with sysfs_emit
minor smu7 change to remove compiler warning comparison of int and uint32_t minor smu8 change to remove compiler warning comparison of int and uint32_t
=== Test ===
AMDGPU_PCI_ADDR=lspci -nn | grep "VGA\|Display" | cut -d " " -f 1 AMDGPU_HWMON=ls -la /sys/class/hwmon | grep $AMDGPU_PCI_ADDR | awk '{print $9}' HWMON_DIR=/sys/class/hwmon/${AMDGPU_HWMON} LOGFILE=pp_printf.test.log
lspci -nn | grep "VGA\|Display" > $LOGFILE
FILES="pp_dpm_sclkpp_power_profile_mode "
for f in $FILES
do
echo === $f === >> $LOGFILE
cat $HWMON_DIR/device/$f >> $LOGFILE
done
cat $LOGFILE
--- .../drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 22 +++++------ .../drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 38 +++++++++---------- .../drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 7 ++-- 3 files changed, 34 insertions(+), 33 deletions(-)
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c +11 -11
@@ -1036,13 +1036,13 @@ static int smu10_print_clock_levels(struct pp_hwmgr *hwmgr,else i =1 ; - size +=sprintf (buf + size,"0: %uMhz %s\n" , + size +=sysfs_emit_at (buf, size,"0: %uMhz %s\n" , data->gfx_min_freq_limit/100 , i ==0 ?"*" :"" ); - size +=sprintf (buf + size,"1: %uMhz %s\n" , + size +=sysfs_emit_at (buf, size,"1: %uMhz %s\n" , i ==1 ? now :SMU10_UMD_PSTATE_GFXCLK , i ==1 ?"*" :"" ); - size +=sprintf (buf + size,"2: %uMhz %s\n" , + size +=sysfs_emit_at (buf, size,"2: %uMhz %s\n" , data->gfx_max_freq_limit/100 , i ==2 ?"*" :"" );break ;
@@ -1050,7 +1050,7 @@ static int smu10_print_clock_levels(struct pp_hwmgr *hwmgr,smum_send_msg_to_smc (hwmgr, PPSMC_MSG_GetFclkFrequency, &now);for (i =0 ; i < mclk_table->count; i++) - size += sprintf(buf + size, "%d: %uMhz %s\n", + size += sysfs_emit_at(buf, size, "%d: %uMhz %s\n", i, mclk_table->entries[i].clk / 100, ((mclk_table->entries[i].clk / 100)
@@ -1065,10 +1065,10 @@ static int smu10_print_clock_levels(struct pp_hwmgr *hwmgr,if (ret)return ret; - size =sprintf (buf,"%s:\n" ,"OD_SCLK" ); - size +=sprintf (buf + size,"0: %10uMhz\n" , + size =sysfs_emit (buf,"%s:\n" ,"OD_SCLK" ); + size +=sysfs_emit_at (buf, size,"0: %10uMhz\n" , (data->gfx_actual_soft_min_freq >0 ) ? data->gfx_actual_soft_min_freq : min_freq); - size +=sprintf (buf + size,"1: %10uMhz\n" , + size +=sysfs_emit_at (buf, size,"1: %10uMhz\n" , (data->gfx_actual_soft_max_freq >0 ) ? data->gfx_actual_soft_max_freq : max_freq); }break ;
@@ -1081,8 +1081,8 @@ static int smu10_print_clock_levels(struct pp_hwmgr *hwmgr,if (ret)return ret; - size =sprintf (buf,"%s:\n" ,"OD_RANGE" ); - size +=sprintf (buf + size,"SCLK: %7uMHz %10uMHz\n" , + size =sysfs_emit (buf,"%s:\n" ,"OD_RANGE" ); + size +=sysfs_emit_at (buf, size,"SCLK: %7uMHz %10uMHz\n" , min_freq, max_freq); }break ;
@@ -1456,11 +1456,11 @@ static int smu10_get_power_profile_mode(struct pp_hwmgr *hwmgr, char *buf)if (!buf)return -EINVAL ; - size +=sprintf (buf + size,"%s %16s %s %s %s %s\n" ,title[0 ], + size +=sysfs_emit_at (buf, size,"%s %16s %s %s %s %s\n" ,title[0 ], title[1 ], title[2 ], title[3 ], title[4 ], title[5 ]);for (i =0 ; i <=PP_SMC_POWER_PROFILE_COMPUTE ; i++) - size +=sprintf (buf + size,"%3d %14s%s: %14d %3d %10d %14d\n" , + size +=sysfs_emit_at (buf, size,"%3d %14s%s: %14d %3d %10d %14d\n" , i, profile_name[i], (i == hwmgr->power_profile_mode) ?"*" :" " , profile_mode_setting[i][0 ], profile_mode_setting[i][1 ], profile_mode_setting[i][2 ], profile_mode_setting[i][3 ]);
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +19 -19
@@ -4896,8 +4896,8 @@ 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 i, now, size =0 ; -uint32_t clock, pcie_speed; +int size =0 ; +uint32_t i, now, clock, pcie_speed;switch (type) {case PP_SCLK :
@@ -4911,7 +4911,7 @@ static int smu7_print_clock_levels(struct pp_hwmgr *hwmgr, now = i;for (i =0 ; i < sclk_table->count; i++) - size +=sprintf (buf + size,"%d: %uMhz %s\n" , + size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , i, sclk_table->dpm_levels[i].value /100 , (i == now) ?"*" :"" );break ;
@@ -4926,7 +4926,7 @@ static int smu7_print_clock_levels(struct pp_hwmgr *hwmgr, now = i;for (i =0 ; i < mclk_table->count; i++) - size +=sprintf (buf + size,"%d: %uMhz %s\n" , + size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , i, mclk_table->dpm_levels[i].value /100 , (i == now) ?"*" :"" );break ;
@@ -4940,7 +4940,7 @@ static int smu7_print_clock_levels(struct pp_hwmgr *hwmgr, now = i;for (i =0 ; i < pcie_table->count; i++) - size += sprintf(buf + size, "%d: %s %s\n", i, + size += sysfs_emit_at(buf, size, "%d: %s %s\n", i, (pcie_table->dpm_levels[i].value == 0) ? "2.5GT/s, x8" : (pcie_table->dpm_levels[i].value == 1) ? "5.0GT/s, x16" : (pcie_table->dpm_levels[i].value == 2) ? "8.0GT/s, x16" : "",
@@ -4948,32 +4948,32 @@ static int smu7_print_clock_levels(struct pp_hwmgr *hwmgr,break ;case OD_SCLK :if (hwmgr->od_enabled) { - size =sprintf (buf,"%s:\n" ,"OD_SCLK" ); + size =sysfs_emit (buf,"%s:\n" ,"OD_SCLK" );for (i =0 ; i < odn_sclk_table->num_of_pl; i++) - size +=sprintf (buf + size,"%d: %10uMHz %10umV\n" , + size +=sysfs_emit_at (buf, size,"%d: %10uMHz %10umV\n" , i, odn_sclk_table->entries[i].clock/100 , odn_sclk_table->entries[i].vddc); }break ;case OD_MCLK :if (hwmgr->od_enabled) { - size =sprintf (buf,"%s:\n" ,"OD_MCLK" ); + size =sysfs_emit (buf,"%s:\n" ,"OD_MCLK" );for (i =0 ; i < odn_mclk_table->num_of_pl; i++) - size +=sprintf (buf + size,"%d: %10uMHz %10umV\n" , + size +=sysfs_emit_at (buf, size,"%d: %10uMHz %10umV\n" , i, odn_mclk_table->entries[i].clock/100 , odn_mclk_table->entries[i].vddc); }break ;case OD_RANGE :if (hwmgr->od_enabled) { - size =sprintf (buf,"%s:\n" ,"OD_RANGE" ); - size +=sprintf (buf + size,"SCLK: %7uMHz %10uMHz\n" , + size =sysfs_emit (buf,"%s:\n" ,"OD_RANGE" ); + size +=sysfs_emit_at (buf, size,"SCLK: %7uMHz %10uMHz\n" , data->golden_dpm_table.sclk_table.dpm_levels[0 ].value/100 , hwmgr->platform_descriptor.overdriveLimit.engineClock/100 ); - size +=sprintf (buf + size,"MCLK: %7uMHz %10uMHz\n" , + size +=sysfs_emit_at (buf, size,"MCLK: %7uMHz %10uMHz\n" , data->golden_dpm_table.mclk_table.dpm_levels[0 ].value/100 , hwmgr->platform_descriptor.overdriveLimit.memoryClock/100 ); - size +=sprintf (buf + size,"VDDC: %7umV %11umV\n" , + size +=sysfs_emit_at (buf, size,"VDDC: %7umV %11umV\n" , data->odn_dpm_table.min_vddc, data->odn_dpm_table.max_vddc); }
@@ -5503,7 +5503,7 @@ static int smu7_get_power_profile_mode(struct pp_hwmgr *hwmgr, char *buf)if (!buf)return -EINVAL ; - size +=sprintf (buf + size,"%s %16s %16s %16s %16s %16s %16s %16s\n" , + size +=sysfs_emit_at (buf, size,"%s %16s %16s %16s %16s %16s %16s %16s\n" , title[0 ], title[1 ], title[2 ], title[3 ], title[4 ], title[5 ], title[6 ], title[7 ]);
@@ -5511,7 +5511,7 @@ static int smu7_get_power_profile_mode(struct pp_hwmgr *hwmgr, char *buf)for (i =0 ; i < len; i++) {if (i == hwmgr->power_profile_mode) { - size += sprintf(buf + size, "%3d %14s %s: %8d %16d %16d %16d %16d %16d\n", + size += sysfs_emit_at(buf, size, "%3d %14s %s: %8d %16d %16d %16d %16d %16d\n", i, profile_name[i], "*", data->current_profile_setting.sclk_up_hyst, data->current_profile_setting.sclk_down_hyst,
@@ -5522,21 +5522,21 @@ static int smu7_get_power_profile_mode(struct pp_hwmgr *hwmgr, char *buf)continue ; }if (smu7_profiling[i].bupdate_sclk) - size +=sprintf (buf + size,"%3d %16s: %8d %16d %16d " , + size +=sysfs_emit_at (buf, size,"%3d %16s: %8d %16d %16d " , i, profile_name[i], smu7_profiling[i].sclk_up_hyst, smu7_profiling[i].sclk_down_hyst, smu7_profiling[i].sclk_activity);else - size +=sprintf (buf + size,"%3d %16s: %8s %16s %16s " , + size +=sysfs_emit_at (buf, size,"%3d %16s: %8s %16s %16s " , i, profile_name[i],"-" ,"-" ,"-" );if (smu7_profiling[i].bupdate_mclk) - size +=sprintf (buf + size,"%16d %16d %16d\n" , + size +=sysfs_emit_at (buf, size,"%16d %16d %16d\n" , smu7_profiling[i].mclk_up_hyst, smu7_profiling[i].mclk_down_hyst, smu7_profiling[i].mclk_activity);else - size +=sprintf (buf + size,"%16s %16s %16s\n" , + size +=sysfs_emit_at (buf, size,"%16s %16s %16s\n" ,"-" ,"-" ,"-" ); }
drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c +4 -3
@@ -1547,7 +1547,8 @@ static int smu8_print_clock_levels(struct pp_hwmgr *hwmgr,struct smu8_hwmgr *data = hwmgr->backend;struct phm_clock_voltage_dependency_table *sclk_table = hwmgr->dyn_state.vddc_dependency_on_sclk; -int i, now, size =0 ; +uint32_t i, now; +int size =0 ;switch (type) {case PP_SCLK :
@@ -1558,7 +1559,7 @@ static int smu8_print_clock_levels(struct pp_hwmgr *hwmgr, CURR_SCLK_INDEX);for (i =0 ; i < sclk_table->count; i++) - size +=sprintf (buf + size,"%d: %uMhz %s\n" , + size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" , i, sclk_table->entries[i].clk /100 , (i == now) ?"*" :"" );break ;
@@ -1570,7 +1571,7 @@ static int smu8_print_clock_levels(struct pp_hwmgr *hwmgr, CURR_MCLK_INDEX);for (i =SMU8_NUM_NBPMEMORYCLOCK ; i >0 ; i--) - size +=sprintf (buf + size,"%d: %uMhz %s\n" , + size +=sysfs_emit_at (buf, size,"%d: %uMhz %s\n" ,SMU8_NUM_NBPMEMORYCLOCK -i, data->sys_info.nbp_memory_clock[i-1 ] /100 , (SMU8_NUM_NBPMEMORYCLOCK -i == now) ?"*" :"" );break ;
Signature · 1 line
2.32.0
PATCH 4/4 amdgpu/pm: Replace amdgpu_pm usage of sprintf with sysfs_emit
In reply to Darren Powell replacing printfs with sysfs_emit
=== Test ===
AMDGPU_PCI_ADDR=lspci -nn | grep "VGA\|Display" | cut -d " " -f 1 AMDGPU_HWMON=ls -la /sys/class/hwmon | grep $AMDGPU_PCI_ADDR | awk '{print $9}' HWMON_DIR=/sys/class/hwmon/${AMDGPU_HWMON} LOGFILE=pp_printf.test.log
lspci -nn | grep "VGA\|Display" > $LOGFILE
FILES="pwm1_enablepwm1_minpwm1_max
pwm1fan1_inputfan1_targetfan1_enablepower1_cap_min "
for f in $FILES
do
echo === $f === >> $LOGFILE
cat $HWMON_DIR/device/$f >> $LOGFILE
done
cat $LOGFILE
--- drivers/gpu/drm/amd/pm/amdgpu_pm.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
drivers/gpu/drm/amd/pm/amdgpu_pm.c +8 -8
@@ -2379,7 +2379,7 @@ static ssize_t amdgpu_hwmon_get_pwm1_enable(struct device *dev,pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); -return sprintf (buf,"%u\n" , pwm_mode); +return sysfs_emit (buf,"%u\n" , pwm_mode); } static ssize_t amdgpu_hwmon_set_pwm1_enable(struct device *dev,
@@ -2424,14 +2424,14 @@ static ssize_t amdgpu_hwmon_get_pwm1_min(struct device *dev,struct device_attribute *attr, char *buf) { - return sprintf(buf, "%i\n", 0); + return sysfs_emit(buf, "%i\n", 0); }static ssize_t amdgpu_hwmon_get_pwm1_max (struct device *dev,struct device_attribute *attr,char *buf) { -return sprintf (buf,"%i\n" ,255 ); +return sysfs_emit (buf,"%i\n" ,255 ); } static ssize_t amdgpu_hwmon_set_pwm1(struct device *dev,
@@ -2517,7 +2517,7 @@ static ssize_t amdgpu_hwmon_get_pwm1(struct device *dev, speed = (speed *255 ) /100 ; -return sprintf (buf,"%i\n" , speed); +return sysfs_emit (buf,"%i\n" , speed); } static ssize_t amdgpu_hwmon_get_fan1_input(struct device *dev,
@@ -2550,7 +2550,7 @@ static ssize_t amdgpu_hwmon_get_fan1_input(struct device *dev,if (err)return err; -return sprintf (buf,"%i\n" , speed); +return sysfs_emit (buf,"%i\n" , speed); } static ssize_t amdgpu_hwmon_get_fan1_min(struct device *dev,
@@ -2647,7 +2647,7 @@ static ssize_t amdgpu_hwmon_get_fan1_target(struct device *dev,if (err)return err; -return sprintf (buf,"%i\n" , rpm); +return sysfs_emit (buf,"%i\n" , rpm); } static ssize_t amdgpu_hwmon_set_fan1_target(struct device *dev,
@@ -2729,7 +2729,7 @@ static ssize_t amdgpu_hwmon_get_fan1_enable(struct device *dev,pm_runtime_mark_last_busy (adev_to_drm (adev)->dev);pm_runtime_put_autosuspend (adev_to_drm (adev)->dev); -return sprintf (buf,"%i\n" , pwm_mode ==AMD_FAN_CTRL_AUTO ?0 :1 ); +return sysfs_emit (buf,"%i\n" , pwm_mode ==AMD_FAN_CTRL_AUTO ?0 :1 ); } static ssize_t amdgpu_hwmon_set_fan1_enable(struct device *dev,
@@ -2899,7 +2899,7 @@ static ssize_t amdgpu_hwmon_show_power_cap_min(struct device *dev,struct device_attribute *attr, char *buf) { - return sprintf(buf, "%i\n", 0); + return sysfs_emit(buf, "%i\n", 0); }
Signature · 1 line
2.32.0
Quoted 37 lines · Darren Powell
=== Description ===
Replace usage of sprintf withsysfs_emitin hwmgr powerplay=== Test System ===
*DESKTOP(AMD FX-8350 + VEGA10(687F/c3), BIOS: F2)
+ ISO(Ubuntu 20.04.2 LTS)
+ Kernel(5.13.0-gb1d634be9673-fdoagd5f)=== Patch Summary ===
linux: ([email protected]:agd5f) origin/amd-staging-drm-next @2f56b0d631eb
+0ede8d563c58amdgpu/pm: Replace vega10 usage of sprintf withsysfs_emit
+1d666a0652a1amdgpu/pm: Replace vega12,20 usage of sprintf withsysfs_emit
+8bad9ffba08bamdgpu/pm: Replace hwmgr smu usage of sprintf withsysfs_emit
+773733df2f32amdgpu/pm: Replaceamdgpu_pmusage of sprintf withsysfs_emit=== General Test for each platform ===
AMDGPU_PCI_ADDR=lspci -nn | grep "VGA\|Display" | cut -d " " -f 1AMDGPU_HWMON=ls -la /sys/class/hwmon | grep $AMDGPU_PCI_ADDR | awk '{print $9}'HWMON_DIR=/sys/class/hwmon/${AMDGPU_HWMON} LOGFILE=pp_printf.test.loglspci -nn | grep "VGA\|Display" > $LOGFILE
FILES="pp_dpm_sclkpp_featurespp_power_profile_mode"for f in $FILES
do
echo === $f === >> $LOGFILE
cat $HWMON_DIR/device/$f >> $LOGFILE
done
cat $LOGFILE
Quoted 5 lines
Darren Powell (4):
amdgpu/pm: Replace vega10 usage of sprintf withsysfs_emitamdgpu/pm: Replace vega12,20 usage of sprintf withsysfs_emitamdgpu/pm: Replace hwmgr smu usage of sprintf withsysfs_emitamdgpu/pm: Replaceamdgpu_pmusage of sprintf withsysfs_emit
Series is:
Quoted 15 lines
drivers/gpu/drm/amd/pm/amdgpu_pm.c | 16 ++-- .../drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 22 +++--- .../drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 38 +++++----- .../drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 7 +- .../drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 38 +++++----- .../drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 14 ++-- .../drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 74 +++++++++---------- 7 files changed, 105 insertions(+), 104 deletions(-)base-commit:
2f56b0d631eba0e76cfc789d85cc5632256ad42d--
2.32.0