Re: [PATCH] platform/x86: amd-pmc: Fix the build error when CONFIG_DEBUG_FS is disable

Hans de Goede
2021-10-11T13:29:55Z

Hi Sanket,

On 10/8/21 10:34 AM, Sanket Goswami wrote:
> It was reported that when CONFIG_DEBUG_FS is disabled, amd-pmc driver
> ended up in build failure.
>
> Re-order the routine to solve the problem.
>
> Fixes: b4a53d6f61eb ("platform/x86: amd-pmc: Export Idlemask values
> based on the APU")
>
> Reported-by: Nathan Chancellor <nathan@kernel.org>
> Signed-off-by: Sanket Goswami <Sanket.Goswami@amd.com>

Thank you for your pathc, but this is already fixed by the following (identical)
commit in my for-next branch:

https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git/commit/?h=for-next&id=40635cd32f0d83573a558dc30e9ba3469e769249

Regards,

Hans

> ---
> drivers/platform/x86/amd-pmc.c | 86 +++++++++++++++++-----------------
> 1 file changed, 43 insertions(+), 43 deletions(-)
>
> diff --git a/drivers/platform/x86/amd-pmc.c b/drivers/platform/x86/amd-pmc.c
> index 91c1f1c6c929..88cded2fe680 100644
> --- a/drivers/platform/x86/amd-pmc.c
> +++ b/drivers/platform/x86/amd-pmc.c
> @@ -155,6 +155,31 @@ struct smu_metrics {
> u64 timecondition_notmet_totaltime[SOC_SUBSYSTEM_IP_MAX];
> } __packed;
>
> +static int amd_pmc_idlemask_read(struct amd_pmc_dev *pdev, struct device *dev,
> + struct seq_file *s)
> +{
> + u32 val;
> +
> + switch (pdev->cpu_id) {
> + case AMD_CPU_ID_CZN:
> + val = amd_pmc_reg_read(pdev, AMD_PMC_SCRATCH_REG_CZN);
> + break;
> + case AMD_CPU_ID_YC:
> + val = amd_pmc_reg_read(pdev, AMD_PMC_SCRATCH_REG_YC);
> + break;
> + default:
> + return -EINVAL;
> + }
> +
> + if (dev)
> + dev_dbg(pdev->dev, "SMU idlemask s0i3: 0x%x\n", val);
> +
> + if (s)
> + seq_printf(s, "SMU idlemask : 0x%x\n", val);
> +
> + return 0;
> +}
> +
> #ifdef CONFIG_DEBUG_FS
> static int smu_fw_info_show(struct seq_file *s, void *unused)
> {
> @@ -210,49 +235,6 @@ 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->major = (val >> 16) & GENMASK(15, 0);
> - dev->minor = (val >> 8) & GENMASK(7, 0);
> - dev->rev = (val >> 0) & GENMASK(7, 0);
> -
> - dev_dbg(dev->dev, "SMU version is %u.%u.%u\n", dev->major, dev->minor, dev->rev);
> -
> - return 0;
> -}
> -
> -static int amd_pmc_idlemask_read(struct amd_pmc_dev *pdev, struct device *dev,
> - struct seq_file *s)
> -{
> - u32 val;
> -
> - switch (pdev->cpu_id) {
> - case AMD_CPU_ID_CZN:
> - val = amd_pmc_reg_read(pdev, AMD_PMC_SCRATCH_REG_CZN);
> - break;
> - case AMD_CPU_ID_YC:
> - val = amd_pmc_reg_read(pdev, AMD_PMC_SCRATCH_REG_YC);
> - break;
> - default:
> - return -EINVAL;
> - }
> -
> - if (dev)
> - dev_dbg(pdev->dev, "SMU idlemask s0i3: 0x%x\n", val);
> -
> - if (s)
> - seq_printf(s, "SMU idlemask : 0x%x\n", val);
> -
> - return 0;
> -}
> -
> static int amd_pmc_idlemask_show(struct seq_file *s, void *unused)
> {
> struct amd_pmc_dev *dev = s->private;
> @@ -295,6 +277,24 @@ static inline void amd_pmc_dbgfs_unregister(struct amd_pmc_dev *dev)
> }
> #endif /* CONFIG_DEBUG_FS */
>
> +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->major = (val >> 16) & GENMASK(15, 0);
> + dev->minor = (val >> 8) & GENMASK(7, 0);
> + dev->rev = (val >> 0) & GENMASK(7, 0);
> +
> + dev_dbg(dev->dev, "SMU version is %u.%u.%u\n", dev->major, dev->minor, dev->rev);
> +
> + return 0;
> +}
> +
> static int amd_pmc_setup_smu_logging(struct amd_pmc_dev *dev)
> {
> u32 phys_addr_low, phys_addr_hi;
>