platform/x86: amd-pmc: Shuffle location of amd_pmc_get_smu_version()
PATCH 1/1 platform/x86: amd-pmc: Shuffle location of amd_pmc_get_smu_version()
When CONFIG_DEBUG_FS is disabled, amd_pmc_get_smu_version() is unused:
drivers/platform/x86/amd-pmc.c:196:12: warning: unused function 'amd_pmc_get_smu_version' [-Wunused-function] static int amd_pmc_get_smu_version(struct amd_pmc_dev *dev)
^
1 warning generated.
Eliminate the warning by moving amd_pmc_get_smu_version() to the CONFIG_DEBUG_FS block where it is used.
--- drivers/platform/x86/amd-pmc.c | 40 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-)
drivers/platform/x86/amd-pmc.c +20 -20
@@ -193,26 +193,6 @@ struct smu_metrics {u64 timecondition_notmet_totaltime[SOC_SUBSYSTEM_IP_MAX ]; } __packed; -static int amd_pmc_get_smu_version (struct amd_pmc_dev *dev) -{ -int rc; -u32 val; - - rc =amd_pmc_send_cmd (dev,0 , &val,SMU_MSG_GETSMUVERSION ,1 ); -if (rc) -return rc; - - dev->smu_program = (val >>24 ) &GENMASK (7 ,0 ); - dev->major = (val >>16 ) &GENMASK (7 ,0 ); - dev->minor = (val >>8 ) &GENMASK (7 ,0 ); - dev->rev = (val >>0 ) &GENMASK (7 ,0 ); - -dev_dbg (dev->dev,"SMU program %u version is %u.%u.%u\n" , - dev->smu_program, dev->major, dev->minor, dev->rev); - -return 0 ; -} -static int amd_pmc_stb_debugfs_open (struct inode *inode,struct file *filp) {struct amd_pmc_dev *dev = filp->f_inode->i_private;
@@ -417,6 +397,26 @@ static int s0ix_stats_show(struct seq_file *s, void *unused) }DEFINE_SHOW_ATTRIBUTE (s0ix_stats); +static int amd_pmc_get_smu_version (struct amd_pmc_dev *dev) +{ +int rc; +u32 val; + + rc =amd_pmc_send_cmd (dev,0 , &val,SMU_MSG_GETSMUVERSION ,1 ); +if (rc) +return rc; + + dev->smu_program = (val >>24 ) &GENMASK (7 ,0 ); + dev->major = (val >>16 ) &GENMASK (7 ,0 ); + dev->minor = (val >>8 ) &GENMASK (7 ,0 ); + dev->rev = (val >>0 ) &GENMASK (7 ,0 ); + +dev_dbg (dev->dev,"SMU program %u version is %u.%u.%u\n" , + dev->smu_program, dev->major, dev->minor, dev->rev); + +return 0 ; +} +static int amd_pmc_idlemask_show (struct seq_file *s,void *unused) {struct amd_pmc_dev *dev = s->private;
base-commit: b0c07116c894325d40a218f558047f925e4b3bdb
Signature · 1 line
2.36.0
[Public]
Quoted 17 lines
-----Original Message-----
From: Nathan Chancellor <[email protected]>
Sent: Monday, April 18, 2022 16:38
To: S-k, Shyam-sundar <[email protected]>; Limonciello, Mario <[email protected]>; Hans de Goede <[email protected]>; Mark Gross <[email protected]>
Cc: [email protected]; [email protected]; [email protected]; Nathan Chancellor <[email protected]>
Subject: [PATCH] platform/x86: amd-pmc: Shuffle location ofamd_pmc_get_smu_version()When
CONFIG_DEBUG_FSis disabled,amd_pmc_get_smu_version()is unused:
drivers/platform/x86/amd-pmc.c:196:12: warning: unused function
'amd_pmc_get_smu_version' [-Wunused-function]
static intamd_pmc_get_smu_version(struct amd_pmc_dev *dev)^
Quoted 8 lines
1 warning generated.
Eliminate the warning by moving
amd_pmc_get_smu_version()to theCONFIG_DEBUG_FSblock where it is used.Fixes b0c07116c894 ("platform/x86: amd-pmc: Avoid reading SMU version atprobe time")
Signed-off-by Nathan Chancellor <[email protected]>
Quoted 69 lines
--- drivers/platform/x86/amd-pmc.c | 40 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-)drivers/platform/x86/amd-pmc.c +0
-20@@ -193,26 +193,6 @@ struct smu_metrics {u64 timecondition_notmet_totaltime[SOC_SUBSYSTEM_IP_MAX ]; } __packed; -static int amd_pmc_get_smu_version (struct amd_pmc_dev *dev) -{ -int rc; -u32 val; - - rc =amd_pmc_send_cmd (dev,0 , &val,SMU_MSG_GETSMUVERSION , 1); -if (rc) -return rc; - - dev->smu_program = (val >>24 ) &GENMASK (7 ,0 ); - dev->major = (val >>16 ) &GENMASK (7 ,0 ); - dev->minor = (val >>8 ) &GENMASK (7 ,0 ); - dev->rev = (val >>0 ) &GENMASK (7 ,0 ); - -dev_dbg (dev->dev,"SMU program %u version is %u.%u.%u\n" , - dev->smu_program, dev->major, dev->minor, dev->rev); - -return 0 ; -} -static int amd_pmc_stb_debugfs_open (struct inode *inode,struct file *filp) {drivers/platform/x86/amd-pmc.c +20
-0struct amd_pmc_dev *dev = filp->f_inode->i_private;@@ -417,6 +397,26 @@ static int s0ix_stats_show(struct seq_file *s, void *unused) }DEFINE_SHOW_ATTRIBUTE (s0ix_stats); +static int amd_pmc_get_smu_version (struct amd_pmc_dev *dev) +{ +int rc; +u32 val; + + rc =amd_pmc_send_cmd (dev,0 , &val,SMU_MSG_GETSMUVERSION ,1 ); +if (rc) +return rc; + + dev->smu_program = (val >>24 ) &GENMASK (7 ,0 ); + dev->major = (val >>16 ) &GENMASK (7 ,0 ); + dev->minor = (val >>8 ) &GENMASK (7 ,0 ); + dev->rev = (val >>0 ) &GENMASK (7 ,0 ); + +dev_dbg (dev->dev,"SMU program %u version is %u.%u.%u\n" , + dev->smu_program, dev->major, dev->minor, dev->rev); + +return 0 ; +} +static int amd_pmc_idlemask_show (struct seq_file *s,void *unused){
structamd_pmc_dev*dev =s->private;base-commit:
b0c07116c894325d40a218f558047f925e4b3bdb--
2.36.0
Hi,
Quoted 4 lines · Nathan Chancellor
When
CONFIG_DEBUG_FSis disabled,amd_pmc_get_smu_version()is unused:
drivers/platform/x86/amd-pmc.c:196:12: warning: unused function 'amd_pmc_get_smu_version' [-Wunused-function] static intamd_pmc_get_smu_version(struct amd_pmc_dev *dev)
Quoted 8 lines
^1 warning generated.
Eliminate the warning by moving
amd_pmc_get_smu_version()to theCONFIG_DEBUG_FSblock where it is used.Fixes b0c07116c894 ("platform/x86: amd-pmc: Avoid reading SMU version at probe time")Signed-off-by Nathan Chancellor <[email protected]>
Thank you for your patch, I've applied this patch to my review-hans branch:
https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/log/?h=review-hans
Note it will show up in my review-hans branch once I've pushed my local branch there, which might take a while.
Once I've run some tests on this branch the patches there will be added to the platform-drivers-x86/for-next branch and eventually will be included in the pdx86 pull-request to Linus for the next merge-window.
Regards,
Hans
Quoted 64 lines
--- drivers/platform/x86/amd-pmc.c | 40 +++++++++++++++++----------------- 1 file changed, 20 insertions(+), 20 deletions(-)drivers/platform/x86/amd-pmc.c +20
-20@@ -193,26 +193,6 @@ struct smu_metrics {u64 timecondition_notmet_totaltime[SOC_SUBSYSTEM_IP_MAX ]; } __packed; -static int amd_pmc_get_smu_version (struct amd_pmc_dev *dev) -{ -int rc; -u32 val; - - rc =amd_pmc_send_cmd (dev,0 , &val,SMU_MSG_GETSMUVERSION ,1 ); -if (rc) -return rc; - - dev->smu_program = (val >>24 ) &GENMASK (7 ,0 ); - dev->major = (val >>16 ) &GENMASK (7 ,0 ); - dev->minor = (val >>8 ) &GENMASK (7 ,0 ); - dev->rev = (val >>0 ) &GENMASK (7 ,0 ); - -dev_dbg (dev->dev,"SMU program %u version is %u.%u.%u\n" , - dev->smu_program, dev->major, dev->minor, dev->rev); - -return 0 ; -} -static int amd_pmc_stb_debugfs_open (struct inode *inode,struct file *filp) {struct amd_pmc_dev *dev = filp->f_inode->i_private;@@ -417,6 +397,26 @@ static int s0ix_stats_show(struct seq_file *s, void *unused) }DEFINE_SHOW_ATTRIBUTE (s0ix_stats); +static int amd_pmc_get_smu_version (struct amd_pmc_dev *dev) +{ +int rc; +u32 val; + + rc =amd_pmc_send_cmd (dev,0 , &val,SMU_MSG_GETSMUVERSION ,1 ); +if (rc) +return rc; + + dev->smu_program = (val >>24 ) &GENMASK (7 ,0 ); + dev->major = (val >>16 ) &GENMASK (7 ,0 ); + dev->minor = (val >>8 ) &GENMASK (7 ,0 ); + dev->rev = (val >>0 ) &GENMASK (7 ,0 ); + +dev_dbg (dev->dev,"SMU program %u version is %u.%u.%u\n" , + dev->smu_program, dev->major, dev->minor, dev->rev); + +return 0 ; +} +static int amd_pmc_idlemask_show (struct seq_file *s,void *unused) {struct amd_pmc_dev *dev = s->private;base-commit:
b0c07116c894325d40a218f558047f925e4b3bdb