lkml.org 
[lkml]   [2017]   [Aug]   [28]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.9 72/84] iio: hid-sensor-trigger: Fix the race with user space powering up sensors
    Date
    4.9-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>

    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>

    ---
    drivers/iio/common/hid-sensors/hid-sensor-trigger.c | 8 ++++----
    1 file changed, 4 insertions(+), 4 deletions(-)

    --- a/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
    +++ b/drivers/iio/common/hid-sensors/hid-sensor-trigger.c
    @@ -36,8 +36,6 @@ static int _hid_sensor_power_state(struc
    s32 poll_value = 0;

    if (state) {
    - if (!atomic_read(&st->user_requested_state))
    - return 0;
    if (sensor_hub_device_open(st->hsdev))
    return -EIO;

    @@ -86,6 +84,9 @@ static int _hid_sensor_power_state(struc
    &report_val);
    }

    + pr_debug("HID_SENSOR %s set power_state %d report_state %d\n",
    + st->pdev->name, state_val, report_val);
    +
    sensor_hub_get_feature(st->hsdev, st->power_state.report_id,
    st->power_state.index,
    sizeof(state_val), &state_val);
    @@ -107,6 +108,7 @@ int hid_sensor_power_state(struct hid_se
    ret = pm_runtime_get_sync(&st->pdev->dev);
    else {
    pm_runtime_mark_last_busy(&st->pdev->dev);
    + pm_runtime_use_autosuspend(&st->pdev->dev);
    ret = pm_runtime_put_autosuspend(&st->pdev->dev);
    }
    if (ret < 0) {
    @@ -201,8 +203,6 @@ int hid_sensor_setup_trigger(struct iio_
    /* Default to 3 seconds, but can be changed from sysfs */
    pm_runtime_set_autosuspend_delay(&attrb->pdev->dev,
    3000);
    - pm_runtime_use_autosuspend(&attrb->pdev->dev);
    -
    return ret;
    error_unreg_trigger:
    iio_trigger_unregister(trig);

    \
     
     \ /
      Last update: 2017-08-28 10:46    [W:3.282 / U:0.384 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site