Commit 9af48b26 authored by Nathan Chancellor's avatar Nathan Chancellor Committed by Hans de Goede
Browse files

platform/x86/amd: pmc: Fix build without debugfs 



Without CONFIG_DEBUG_FS, the following build error occurs:

  drivers/platform/x86/amd/pmc.c:984:17: error: use of undeclared identifier 'pmc_groups'; did you mean 'set_groups'?
                  .dev_groups = pmc_groups,
                                ^~~~~~~~~~
                                set_groups
  ./include/linux/cred.h:65:13: note: 'set_groups' declared here
  extern void set_groups(struct cred *, struct group_info *);
              ^
  drivers/platform/x86/amd/pmc.c:984:17: error: incompatible pointer types initializing 'const struct attribute_group **' with an expression of type 'void (struct cred *, struct group_info *)' [-Werror,-Wincompatible-pointer-types]
                  .dev_groups = pmc_groups,
                                ^~~~~~~~~~
  2 errors generated.

pmc_groups was only defined inside a CONFIG_DEBUG_FS block but
commit 7f1ea75d ("platform/x86/amd: pmc: Add sysfs files for SMU")
intended for these sysfs files to be available outside of debugfs.
Shuffle the necessary functions out of the CONFIG_DEBUG_FS block so that
the file always builds.

Fixes: 7f1ea75d ("platform/x86/amd: pmc: Add sysfs files for SMU")
Signed-off-by: default avatarNathan Chancellor <nathan@kernel.org>
Reviewed-by: default avatarMario Limonciello <mario.limonciello@amd.com>
Link: https://lore.kernel.org/r/20220922153100.324922-1-nathan@kernel.org


Reviewed-by: default avatarHans de Goede <hdegoede@redhat.com>
Signed-off-by: default avatarHans de Goede <hdegoede@redhat.com>
parent 401199ff

drivers/platform/x86/amd/pmc.c

+58 −58
Original line number Diff line number Diff line
@@ -371,6 +371,64 @@ static void amd_pmc_validate_deepest(struct amd_pmc_dev *pdev) 
}

#endif



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 ssize_t smu_fw_version_show(struct device *d, struct device_attribute *attr,

				   char *buf)

{

	struct amd_pmc_dev *dev = dev_get_drvdata(d);



	if (!dev->major) {

		int rc = amd_pmc_get_smu_version(dev);



		if (rc)

			return rc;

	}

	return sysfs_emit(buf, "%u.%u.%u\n", dev->major, dev->minor, dev->rev);

}



static ssize_t smu_program_show(struct device *d, struct device_attribute *attr,

				   char *buf)

{

	struct amd_pmc_dev *dev = dev_get_drvdata(d);



	if (!dev->major) {

		int rc = amd_pmc_get_smu_version(dev);



		if (rc)

			return rc;

	}

	return sysfs_emit(buf, "%u\n", dev->smu_program);

}



static DEVICE_ATTR_RO(smu_fw_version);

static DEVICE_ATTR_RO(smu_program);



static struct attribute *pmc_attrs[] = {

	&dev_attr_smu_fw_version.attr,

	&dev_attr_smu_program.attr,

	NULL,

};

ATTRIBUTE_GROUPS(pmc);



#ifdef CONFIG_DEBUG_FS

static int smu_fw_info_show(struct seq_file *s, void *unused)

{
@@ -437,64 +495,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->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 ssize_t smu_fw_version_show(struct device *d, struct device_attribute *attr,

				   char *buf)

{

	struct amd_pmc_dev *dev = dev_get_drvdata(d);



	if (!dev->major) {

		int rc = amd_pmc_get_smu_version(dev);



		if (rc)

			return rc;

	}

	return sysfs_emit(buf, "%u.%u.%u\n", dev->major, dev->minor, dev->rev);

}



static ssize_t smu_program_show(struct device *d, struct device_attribute *attr,

				   char *buf)

{

	struct amd_pmc_dev *dev = dev_get_drvdata(d);



	if (!dev->major) {

		int rc = amd_pmc_get_smu_version(dev);



		if (rc)

			return rc;

	}

	return sysfs_emit(buf, "%u\n", dev->smu_program);

}



static DEVICE_ATTR_RO(smu_fw_version);

static DEVICE_ATTR_RO(smu_program);



static struct attribute *pmc_attrs[] = {

	&dev_attr_smu_fw_version.attr,

	&dev_attr_smu_program.attr,

	NULL,

};

ATTRIBUTE_GROUPS(pmc);



static int amd_pmc_idlemask_show(struct seq_file *s, void *unused)

{

	struct amd_pmc_dev *dev = s->private;