Skip to content

Commit 1d7e8cf

Browse files
spandruvadagregkh
authored andcommitted
iio: hid-sensor-trigger: Fix the race with user space powering up sensors
commit f1664eaacec31035450132c46ed2915fd2b2049a upstream. It has been reported for a while that with iio-sensor-proxy service the rotation only works after one suspend/resume cycle. This required a wait in the systemd unit file to avoid race. I found a Yoga 900 where I could reproduce this. The problem scenerio is: - During sensor driver init, enable run time PM and also set a auto-suspend for 3 seconds. This result in one runtime resume. But there is a check to avoid a powerup in this sequence, but rpm is active - User space iio-sensor-proxy tries to power up the sensor. Since rpm is active it will simply return. But sensors were not actually powered up in the prior sequence, so actaully the sensors will not work - After 3 seconds the auto suspend kicks If we add a wait in systemd service file to fire iio-sensor-proxy after 3 seconds, then now everything will work as the runtime resume will actually powerup the sensor as this is a user request. To avoid this: - Remove the check to match user requested state, this will cause a brief powerup, but if the iio-sensor-proxy starts immediately it will still work as the sensors are ON. - Also move the autosuspend delay to place when user requested turn off of sensors, like after user finished raw read or buffer disable Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> Tested-by: Bastien Nocera <hadess@hadess.net> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent d2c072c commit 1d7e8cf

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/iio/common/hid-sensors/hid-sensor-trigger.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ static int _hid_sensor_power_state(struct hid_sensor_common *st, bool state)
3636
s32 poll_value = 0;
3737

3838
if (state) {
39-
if (!atomic_read(&st->user_requested_state))
40-
return 0;
4139
if (sensor_hub_device_open(st->hsdev))
4240
return -EIO;
4341

@@ -84,6 +82,9 @@ static int _hid_sensor_power_state(struct hid_sensor_common *st, bool state)
8482
&report_val);
8583
}
8684

85+
pr_debug("HID_SENSOR %s set power_state %d report_state %d\n",
86+
st->pdev->name, state_val, report_val);
87+
8788
sensor_hub_get_feature(st->hsdev, st->power_state.report_id,
8889
st->power_state.index,
8990
sizeof(state_val), &state_val);
@@ -107,6 +108,7 @@ int hid_sensor_power_state(struct hid_sensor_common *st, bool state)
107108
ret = pm_runtime_get_sync(&st->pdev->dev);
108109
else {
109110
pm_runtime_mark_last_busy(&st->pdev->dev);
111+
pm_runtime_use_autosuspend(&st->pdev->dev);
110112
ret = pm_runtime_put_autosuspend(&st->pdev->dev);
111113
}
112114
if (ret < 0) {
@@ -175,8 +177,6 @@ int hid_sensor_setup_trigger(struct iio_dev *indio_dev, const char *name,
175177
/* Default to 3 seconds, but can be changed from sysfs */
176178
pm_runtime_set_autosuspend_delay(&attrb->pdev->dev,
177179
3000);
178-
pm_runtime_use_autosuspend(&attrb->pdev->dev);
179-
180180
return ret;
181181
error_unreg_trigger:
182182
iio_trigger_unregister(trig);

0 commit comments

Comments
 (0)