Commit 96ac487c authored by Asad Kamal's avatar Asad Kamal Committed by Alex Deucher
Browse files

drm/amd/pm: Add board voltage node to hwmon 



Add and expose board voltage node as vddboard to hwmon for smu_v13_0_6

v2: Replace ip check with supported sensor attribute(Lijo)

Signed-off-by: default avatarAsad Kamal <asad.kamal@amd.com>
Reviewed-by: default avatarLijo Lazar <lijo.lazar@amd.com>
Reviewed-by: default avatarHawking Zhang <Hawking.Zhang@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent ad7c088e

drivers/gpu/drm/amd/include/kgd_pp_interface.h

+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ enum amd_pp_sensors { 
	AMDGPU_PP_SENSOR_CPU_CLK,

	AMDGPU_PP_SENSOR_VDDNB,

	AMDGPU_PP_SENSOR_VDDGFX,

	AMDGPU_PP_SENSOR_VDDBOARD,

	AMDGPU_PP_SENSOR_UVD_VCLK,

	AMDGPU_PP_SENSOR_UVD_DCLK,

	AMDGPU_PP_SENSOR_VCE_ECCLK,

drivers/gpu/drm/amd/pm/amdgpu_pm.c

+34 −0
Original line number Diff line number Diff line
@@ -2944,6 +2944,23 @@ static ssize_t amdgpu_hwmon_show_vddgfx(struct device *dev, 
	return sysfs_emit(buf, "%d\n", vddgfx);

}



static ssize_t amdgpu_hwmon_show_vddboard(struct device *dev,

					  struct device_attribute *attr,

					  char *buf)

{

	struct amdgpu_device *adev = dev_get_drvdata(dev);

	u32 vddboard;

	int r;



	/* get the voltage */

	r = amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VDDBOARD,

					    (void *)&vddboard);

	if (r)

		return r;



	return sysfs_emit(buf, "%d\n", vddboard);

}



static ssize_t amdgpu_hwmon_show_vddgfx_label(struct device *dev,

					      struct device_attribute *attr,

					      char *buf)
@@ -2951,6 +2968,12 @@ static ssize_t amdgpu_hwmon_show_vddgfx_label(struct device *dev, 
	return sysfs_emit(buf, "vddgfx\n");

}



static ssize_t amdgpu_hwmon_show_vddboard_label(struct device *dev,

						struct device_attribute *attr,

						char *buf)

{

	return sysfs_emit(buf, "vddboard\n");

}

static ssize_t amdgpu_hwmon_show_vddnb(struct device *dev,

				       struct device_attribute *attr,

				       char *buf)
@@ -3294,6 +3317,8 @@ static SENSOR_DEVICE_ATTR(in0_input, S_IRUGO, amdgpu_hwmon_show_vddgfx, NULL, 0) 
static SENSOR_DEVICE_ATTR(in0_label, S_IRUGO, amdgpu_hwmon_show_vddgfx_label, NULL, 0);

static SENSOR_DEVICE_ATTR(in1_input, S_IRUGO, amdgpu_hwmon_show_vddnb, NULL, 0);

static SENSOR_DEVICE_ATTR(in1_label, S_IRUGO, amdgpu_hwmon_show_vddnb_label, NULL, 0);

static SENSOR_DEVICE_ATTR(in2_input, S_IRUGO, amdgpu_hwmon_show_vddboard, NULL, 0);

static SENSOR_DEVICE_ATTR(in2_label, S_IRUGO, amdgpu_hwmon_show_vddboard_label, NULL, 0);

static SENSOR_DEVICE_ATTR(power1_average, S_IRUGO, amdgpu_hwmon_show_power_avg, NULL, 0);

static SENSOR_DEVICE_ATTR(power1_input, S_IRUGO, amdgpu_hwmon_show_power_input, NULL, 0);

static SENSOR_DEVICE_ATTR(power1_cap_max, S_IRUGO, amdgpu_hwmon_show_power_cap_max, NULL, 0);
@@ -3341,6 +3366,8 @@ static struct attribute *hwmon_attributes[] = { 
	&sensor_dev_attr_in0_label.dev_attr.attr,

	&sensor_dev_attr_in1_input.dev_attr.attr,

	&sensor_dev_attr_in1_label.dev_attr.attr,

	&sensor_dev_attr_in2_input.dev_attr.attr,

	&sensor_dev_attr_in2_label.dev_attr.attr,

	&sensor_dev_attr_power1_average.dev_attr.attr,

	&sensor_dev_attr_power1_input.dev_attr.attr,

	&sensor_dev_attr_power1_cap_max.dev_attr.attr,
@@ -3492,6 +3519,13 @@ static umode_t hwmon_attributes_visible(struct kobject *kobj, 
	     attr == &sensor_dev_attr_in1_label.dev_attr.attr))

		return 0;



	/* only few boards support vddboard */

	if ((attr == &sensor_dev_attr_in2_input.dev_attr.attr ||

	     attr == &sensor_dev_attr_in2_label.dev_attr.attr) &&

	     amdgpu_hwmon_get_sensor_generic(adev, AMDGPU_PP_SENSOR_VDDBOARD,

					     (void *)&tmp) == -EOPNOTSUPP)

		return 0;



	/* no mclk on APUs other than gc 9,4,3*/

	if (((adev->flags & AMD_IS_APU) && (gc_ver != IP_VERSION(9, 4, 3))) &&

	    (attr == &sensor_dev_attr_freq2_input.dev_attr.attr ||

drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c

+10 −0
Original line number Diff line number Diff line
@@ -1652,6 +1652,7 @@ static int smu_v13_0_6_read_sensor(struct smu_context *smu, 
				   enum amd_pp_sensors sensor, void *data,

				   uint32_t *size)

{

	struct smu_13_0_dpm_context *dpm_context = smu->smu_dpm.dpm_context;

	int ret = 0;



	if (amdgpu_ras_intr_triggered())
@@ -1696,6 +1697,15 @@ static int smu_v13_0_6_read_sensor(struct smu_context *smu, 
		ret = smu_v13_0_get_gfx_vdd(smu, (uint32_t *)data);

		*size = 4;

		break;

	case AMDGPU_PP_SENSOR_VDDBOARD:

		if (smu_v13_0_6_cap_supported(smu, SMU_CAP(BOARD_VOLTAGE))) {

			*(uint32_t *)data = dpm_context->board_volt;

			*size = 4;

			break;

		} else {

			ret = -EOPNOTSUPP;

			break;

		}

	case AMDGPU_PP_SENSOR_GPU_AVG_POWER:

	default:

		ret = -EOPNOTSUPP;