search for: temp1_input

https://bugs.freedesktop.org/show_bug.cgi?id=66022 Priority: medium Bug ID: 66022 Assignee: nouveau at lists.freedesktop.org Summary: pwm1[_enable] faults after hibernate/restore related to automatic (or otherwise) fan management QA Contact: xorg-team at lists.x.org Severity: normal Classification: Unclassified

...cd3 100644 --- a/drivers/gpu/drm/nouveau/nouveau_hwmon.c +++ b/drivers/gpu/drm/nouveau/nouveau_hwmon.c @@ -51,7 +51,7 @@ nouveau_hwmon_show_temp(struct device *d, struct device_attribute *a, char *buf) return snprintf(buf, PAGE_SIZE, "%d\n", temp * 1000); } -static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, nouveau_hwmon_show_temp, +static SENSOR_DEVICE_ATTR(temp1_input, 0444, nouveau_hwmon_show_temp, NULL, 0); static ssize_t @@ -60,7 +60,7 @@ nouveau_hwmon_show_temp1_auto_point1_pwm(struct device *d, { return snprintf(buf, PAGE_SIZE, "%d\n", 100); } -static SENSOR_...

...+ amdgpu_get_pp_od_clk_voltage, + amdgpu_set_pp_od_clk_voltage); static ssize_t amdgpu_hwmon_show_temp(struct device *dev, struct device_attribute *attr, @@ -1320,22 +1320,22 @@ static ssize_t amdgpu_hwmon_set_power_cap(struct device *dev, * */ -static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, amdgpu_hwmon_show_temp, NULL, 0); -static SENSOR_DEVICE_ATTR(temp1_crit, S_IRUGO, amdgpu_hwmon_show_temp_thresh, NULL, 0); -static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IRUGO, amdgpu_hwmon_show_temp_thresh, NULL, 1); -static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO | S_IWUSR, amdgpu_hwmon_get_pwm...

...pu_set_pp_od_clk_voltage); > > static ssize_t amdgpu_hwmon_show_temp(struct device *dev, > struct device_attribute *attr, > @@ -1320,22 +1320,22 @@ static ssize_t amdgpu_hwmon_set_power_cap(struct device *dev, > * > */ > > -static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, amdgpu_hwmon_show_temp, NULL, 0); > -static SENSOR_DEVICE_ATTR(temp1_crit, S_IRUGO, amdgpu_hwmon_show_temp_thresh, NULL, 0); > -static SENSOR_DEVICE_ATTR(temp1_crit_hyst, S_IRUGO, amdgpu_hwmon_show_temp_thresh, NULL, 1); > -static SENSOR_DEVICE_ATTR(pwm1, S_IRUGO | S_IWUSR, amdgp...

...[<c022989b>] > kmap_atomic_prot+0x1b/0x100 > Jan 6 20:06:22 eser kernel: [19365.562709] *pde = 00000000 > Jan 6 20:06:22 eser kernel: [19365.562726] Oops: 0000 [#1] PREEMPT SMP > Jan 6 20:06:22 eser kernel: [19365.562752] last sysfs file: > /sys/devices/platform/coretemp.0/temp1_input > Jan 6 20:06:22 eser kernel: [19365.562777] Modules linked in: isofs usblp > usb_storage uas nls_utf8 udf crc_itu_t fuse ipt_MASQUERADE xt_pkttype xt_TCPMSS > xt_tcpudp ipt_LOG xt_limit iptable_nat nf_nat snd_pcm_oss snd_mixer_oss snd_seq > snd_seq_device xt_NOTRACK ipt_REJECT xt_stat...

...s/class/hwmon/hwmon0/pwm1_enable echo 30 > /sys/class/hwmon/hwmon0/pwm1 pwm1=30 pwm1_enable=1 pwm1_max=100 pwm1_min=0 temp1_auto_point1_pwm=100 temp1_auto_point1_temp=90000 temp1_auto_point1_temp_hyst=3000 temp1_crit=115000 temp1_crit_hyst=2000 temp1_emergency=135000 temp1_emergency_hyst=5000 temp1_input=41000 temp1_max=95000 temp1_max_hyst=3000 update_rate=1000 and then do hibernate/restore, I get this: pwm1=100 pwm1_enable=1 pwm1_max=100 pwm1_min=0 temp1_auto_point1_pwm=100 temp1_auto_point1_temp=90000 temp1_auto_point1_temp_hyst=3000 temp1_crit=115000 temp1_crit_hyst=2000 temp1_emergency=13500...

...f, "%u\n", dev_priv->get_gpu_temperature(drm_dev) * + 1000); +} + +static ssize_t nouveau_thermal_hwmon_show_name(struct device *dev, + struct device_attribute *devattr, + char *buf) +{ + return sprintf(buf, "nouveau\n"); +} + +SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, nouveau_thermal_hwmon_show, NULL, 0); +SENSOR_DEVICE_ATTR(name, S_IRUGO, nouveau_thermal_hwmon_show_name, NULL, 0); + +static struct attribute *hwmon_attributes[] = { + &sensor_dev_attr_temp1_input.dev_attr.attr, + &sensor_dev_attr_name.dev_attr.attr, + NULL, +}; + +static struct...

...u_drm *drm = nouveau_drm(dev); struct nvkm_therm *therm = nvxx_therm(&drm->client.device); int temp = nvkm_therm_temp_get(therm); if (temp < 0) return temp; - return snprintf(buf, PAGE_SIZE, "%d\n", temp * 1000); + return (temp * 1000); } -static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, nouveau_hwmon_show_temp, - NULL, 0); static ssize_t nouveau_hwmon_show_temp1_auto_point1_pwm(struct device *d, @@ -129,312 +125,100 @@ static SENSOR_DEVICE_ATTR(temp1_auto_point1_temp_hyst, S_IRUGO | S_IWUSR, nouveau_hwmon_temp1_auto_point1_temp_hyst, nouveau_hwmon_...

...u_drm *drm = nouveau_drm(dev); struct nvkm_therm *therm = nvxx_therm(&drm->client.device); int temp = nvkm_therm_temp_get(therm); if (temp < 0) return temp; - return snprintf(buf, PAGE_SIZE, "%d\n", temp * 1000); + return (temp * 1000); } -static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, nouveau_hwmon_show_temp, - NULL, 0); static ssize_t nouveau_hwmon_show_temp1_auto_point1_pwm(struct device *d, @@ -129,311 +125,157 @@ static SENSOR_DEVICE_ATTR(temp1_auto_poi nouveau_hwmon_temp1_auto_point1_temp_hyst, nouveau_hwmon_set_temp1_auto_point1_temp_hyst,...

...u_drm *drm = nouveau_drm(dev); struct nvkm_therm *therm = nvxx_therm(&drm->client.device); int temp = nvkm_therm_temp_get(therm); if (temp < 0) return temp; - return snprintf(buf, PAGE_SIZE, "%d\n", temp * 1000); + return (temp * 1000); } -static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, nouveau_hwmon_show_temp, - NULL, 0); static ssize_t nouveau_hwmon_show_temp1_auto_point1_pwm(struct device *d, @@ -60,7 +56,7 @@ nouveau_hwmon_show_temp1_auto_point1_pwm { return snprintf(buf, PAGE_SIZE, "%d\n", 100); } -static SENSOR_DEVICE_ATTR(temp1_auto_point1...

This v5 drops a check for attr_set. Versions: v1 -> v2: * Keep temp attrs as read only v2 -> v3: * Code fix-ups: struct and string as const and add return within switch due to fallthrough * Add Signed-off-by to all commits v3 -> v4: * Rever const to struct attribute. Kbuild complains. v4 -> v5: * Drops a check for attr_set in

...m->client.device); > int temp = nvkm_therm_temp_get(therm); > > if (temp < 0) > return temp; > > - return snprintf(buf, PAGE_SIZE, "%d\n", temp * 1000); > + return (temp * 1000); > } > -static SENSOR_DEVICE_ATTR(temp1_input, S_IRUGO, nouveau_hwmon_show_temp, > - NULL, 0); > > static ssize_t > nouveau_hwmon_show_temp1_auto_point1_pwm(struct device *d, > @@ -60,7 +56,7 @@ nouveau_hwmon_show_temp1_auto_point1_pwm > { > return snprintf(buf, PA...

...;>> Feb 14 00:39:20 lupus kernel: [ 2951.853242] PGD 0 > >>>> Feb 14 00:39:20 lupus kernel: [ 2951.853251] Oops: 0000 [#1] > PREEMPT SMP > >>>> Feb 14 00:39:20 lupus kernel: [ 2951.853275] last sysfs file: > >>>> /sys/devices/platform/coretemp.3/temp1_input > >>>> Feb 14 00:39:20 lupus kernel: [ 2951.853295] CPU 4 > >>>> Feb 14 00:39:20 lupus kernel: [ 2951.853303] Modules linked in: > radeon > >>>> ttm drm_kms_helper cfbcopyarea cfbimgblt cfbfillrect ipt_REJECT > >>>> ipt_LOG xt_limit xt_...

This v6 fixes some comments pointed out by Martin Peres. Versions: v1 -> v2: * Keep temp attrs as read only v2 -> v3: * Code fix-ups: struct and string as const and add return within switch due to fallthrough * Add Signed-off-by to all commits v3 -> v4: * Rever const to struct attribute. Kbuild complains. v4 -> v5: * Drops a check for

Kbuild sent me an e-mail due to a fixup I introduced in v3. It complains due to an incompatible pointer type and it doesn't build. This version reverts it. Versions: v1 -> v2: * Keep temp attrs as read only v2 -> v3: * Code fix-ups: struct and string as const and add return within switch due to fallthrough * Add Signed-off-by to all commits v3 -> v4:

Hi, this is version v3 with some fix-ups: Versions: v1 -> v2: * Keep temp attrs as read only v2 -> v3: * Code fix-ups: struct and string as const and add return within switch due to fallthrough * Add Signed-off-by to all commits This patchseries replaces the deprecated hwmon_device_register function with the new one hwmon_device_register_with_info. It also does some cleanup. Here

This v8 fixes removes dummy functions which only had a return and moves the code into the switch statements. Versions: v1 -> v2: * Keep temp attrs as read only v2 -> v3: * Code fix-ups: struct and string as const and add return within switch due to fallthrough * Add Signed-off-by to all commits v3 -> v4: * Rever const to struct attribute. Kbuild

This v7 fixes removes dummy functions which only had a return and moves the code into the switch statements. Versions: v1 -> v2: * Keep temp attrs as read only v2 -> v3: * Code fix-ups: struct and string as const and add return within switch due to fallthrough * Add Signed-off-by to all commits v3 -> v4: * Rever const to struct attribute. Kbuild

Hi! This patchseries replaces the deprecated hwmon_device_register function with the new one hwmon_device_register_with_info. It also does some cleanup. Here is the list of patches and what they do: 1/ Adds config structures for all sensors and their possible settings. This patch and the next one are just preparing the code for what it comes. 2/ Now everything goes through