Skip to contentSkip to conversation

hwmon: return EINVAL if the GPU is powered down for sensors reads

PATCH In review Karol Herbst 2 participants 2 messages Jun 18, 2019 – Jun 22, 2019 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 hwmon: return EINVAL if the GPU is powered down for sensors reads

fixes bogus values userspace gets from hwmon while the GPU is powered down

---
 drm/nouveau/nouveau_hwmon.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drm/nouveau/nouveau_hwmon.c +10 -0
index 618d8b780..d445c6f3f 100644
@@ -426,6 +426,8 @@ nouveau_temp_read(struct device *dev, u32 attr, int channel, long *val)
 
 	switch (attr) {
 	case hwmon_temp_input:
+		if (drm_dev->switch_power_state != DRM_SWITCH_POWER_ON)
+			return -EINVAL;
 		ret = nvkm_therm_temp_get(therm);
 		*val = ret < 0 ? ret : (ret * 1000);
 		break;
@@ -472,6 +474,8 @@ nouveau_fan_read(struct device *dev, u32 attr, int channel, long *val)
 
 	switch (attr) {
 	case hwmon_fan_input:
+		if (drm_dev->switch_power_state != DRM_SWITCH_POWER_ON)
+			return -EINVAL;
 		*val = nvkm_therm_fan_sense(therm);
 		break;
 	default:
@@ -494,6 +498,8 @@ nouveau_in_read(struct device *dev, u32 attr, int channel, long *val)
 
 	switch (attr) {
 	case hwmon_in_input:
+		if (drm_dev->switch_power_state != DRM_SWITCH_POWER_ON)
+			return -EINVAL;
 		ret = nvkm_volt_get(volt);
 		*val = ret < 0 ? ret : (ret / 1000);
 		break;
@@ -525,6 +531,8 @@ nouveau_pwm_read(struct device *dev, u32 attr, int channel, long *val)
 		*val = therm->attr_get(therm, NVKM_THERM_ATTR_FAN_MODE);
 		break;
 	case hwmon_pwm_input:
+		if (drm_dev->switch_power_state != DRM_SWITCH_POWER_ON)
+			return -EINVAL;
 		*val = therm->fan_get(therm);
 		break;
 	default:
@@ -546,6 +554,8 @@ nouveau_power_read(struct device *dev, u32 attr, int channel, long *val)
 
 	switch (attr) {
 	case hwmon_power_input:
+		if (drm_dev->switch_power_state != DRM_SWITCH_POWER_ON)
+			return -EINVAL;
 		*val = nvkm_iccsense_read_all(iccsense);
 		break;
 	case hwmon_power_max:
Signature · 6 lines
2.21.0

_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau

A message that is not in the archive (sent off-list or not yet received): 20190618110133.9526-1-kherbst-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org

Reviewed-by
#2 lore raw
Quoted 4 lines · Karol Herbst

fixes bogus values userspace gets from hwmon while the GPU is powered down

Looks good to me and successfully tested on my GP107M with runtime power management fixes, so

Quoted 61 lines
---
 drm/nouveau/nouveau_hwmon.c | 10 ++++++++++
 1 file changed, 10 insertions(+)
drm/nouveau/nouveau_hwmon.c +2 -0
index 618d8b780..d445c6f3f 100644
@@ -426,6 +426,8 @@ nouveau_temp_read(struct device *dev, u32 attr, int
 channel, long *val)
 
        switch (attr) {
        case hwmon_temp_input:
+               if (drm_dev->switch_power_state != DRM_SWITCH_POWER_ON)
+                       return -EINVAL;
                ret = nvkm_therm_temp_get(therm);
                *val = ret < 0 ? ret : (ret * 1000);
                break;
drm/nouveau/nouveau_hwmon.c +2 -0
@@ -472,6 +474,8 @@ nouveau_fan_read(struct device *dev, u32 attr, int
 channel, long *val)
 
        switch (attr) {
        case hwmon_fan_input:
+               if (drm_dev->switch_power_state != DRM_SWITCH_POWER_ON)
+                       return -EINVAL;
                *val = nvkm_therm_fan_sense(therm);
                break;

default:

drm/nouveau/nouveau_hwmon.c +2 -0
@@ -494,6 +498,8 @@ nouveau_in_read(struct device *dev, u32 attr, int
 channel, long *val)
 
        switch (attr) {
        case hwmon_in_input:
+               if (drm_dev->switch_power_state != DRM_SWITCH_POWER_ON)
+                       return -EINVAL;
                ret = nvkm_volt_get(volt);
                *val = ret < 0 ? ret : (ret / 1000);
                break;
drm/nouveau/nouveau_hwmon.c +2 -0
@@ -525,6 +531,8 @@ nouveau_pwm_read(struct device *dev, u32 attr, int
 channel, long *val)
                *val = therm->attr_get(therm, NVKM_THERM_ATTR_FAN_MODE);
                break;
        case hwmon_pwm_input:
+               if (drm_dev->switch_power_state != DRM_SWITCH_POWER_ON)
+                       return -EINVAL;
                *val = therm->fan_get(therm);
                break;

default:

drm/nouveau/nouveau_hwmon.c +2 -0
@@ -546,6 +554,8 @@ nouveau_power_read(struct device *dev, u32 attr, int
 channel, long *val)
 
        switch (attr) {
        case hwmon_power_input:
+               if (drm_dev->switch_power_state != DRM_SWITCH_POWER_ON)
+                       return -EINVAL;
                *val = nvkm_iccsense_read_all(iccsense);
                break;

case hwmon_power_max:
--
2.21.0

Quoted 4 lines

_______________________________________________
Nouveau mailing list [email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau

_______________________________________________
Nouveau mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/nouveau