hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

hid-sensor: Fix suspend/resume delay 

By default all the sensors are runtime suspended state (lowest power
state). During Linux suspend process, all the run time suspended
devices are resumed and then suspended. This caused all sensors to
power up and introduced delay in suspend time, when we introduced
runtime PM for HID sensors. The opposite process happens during resume
process.

To fix this, we do powerup process of the sensors only when the request
is issued from user (raw or tiggerred). In this way when runtime,
resume calls for powerup it will simply return as this will not match
user requested state.

Note this is a regression fix as the increase in suspend / resume
times can be substantial (report of 8 seconds on Len's laptop!)

Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Tested-by: Len Brown <len.brown@intel.com>
Cc: <Stable@vger.kernel.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Srinivas Pandruvada 2015-06-01 16:36:27 -07:00 committed by Jonathan Cameron
parent e5d7321862
commit 1e25aa9641
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/iio/common/hid-sensors/hid-sensor-trigger.c
View File

@ -36,6 +36,8 @@ static int _hid_sensor_power_state(struct hid_sensor_common *st, bool state)
s32 poll_value = 0; s32 poll_value = 0;
if (state) { if (state) {
if (!atomic_read(&st->user_requested_state))
return 0;
if (sensor_hub_device_open(st->hsdev)) if (sensor_hub_device_open(st->hsdev))
return -EIO; return -EIO;
@ -52,8 +54,12 @@ static int _hid_sensor_power_state(struct hid_sensor_common *st, bool state)
poll_value = hid_sensor_read_poll_value(st); poll_value = hid_sensor_read_poll_value(st);
} else { } else {
if (!atomic_dec_and_test(&st->data_ready)) int val;
val = atomic_dec_if_positive(&st->data_ready);
if (val < 0)
return 0; return 0;
sensor_hub_device_close(st->hsdev); sensor_hub_device_close(st->hsdev);
state_val = hid_sensor_get_usage_index(st->hsdev, state_val = hid_sensor_get_usage_index(st->hsdev,
st->power_state.report_id, st->power_state.report_id,
@ -92,9 +98,11 @@ EXPORT_SYMBOL(hid_sensor_power_state);
int hid_sensor_power_state(struct hid_sensor_common *st, bool state) int hid_sensor_power_state(struct hid_sensor_common *st, bool state)
{ {
#ifdef CONFIG_PM #ifdef CONFIG_PM
int ret; int ret;
atomic_set(&st->user_requested_state, state);
if (state) if (state)
ret = pm_runtime_get_sync(&st->pdev->dev); ret = pm_runtime_get_sync(&st->pdev->dev);
else { else {
@ -109,6 +117,7 @@ int hid_sensor_power_state(struct hid_sensor_common *st, bool state)
return 0; return 0;
#else #else
atomic_set(&st->user_requested_state, state);
return _hid_sensor_power_state(st, state); return _hid_sensor_power_state(st, state);
#endif #endif
} }

1
include/linux/hid-sensor-hub.h
View File

@ -230,6 +230,7 @@ struct hid_sensor_common {
struct platform_device *pdev; struct platform_device *pdev;
unsigned usage_id; unsigned usage_id;
atomic_t data_ready; atomic_t data_ready;
atomic_t user_requested_state;
struct iio_trigger *trigger; struct iio_trigger *trigger;
struct hid_sensor_hub_attribute_info poll; struct hid_sensor_hub_attribute_info poll;
struct hid_sensor_hub_attribute_info report_state; struct hid_sensor_hub_attribute_info report_state;