diff options
| author | Jeffery Yu <jefferyy@nvidia.com> | 2017-05-16 17:46:48 +0200 |
|---|---|---|
| committer | Benson Leung <bleung@chromium.org> | 2017-06-23 16:12:19 -0700 |
| commit | 995c0ec9a81f9e4e75f280f095534f4ed1a9ea9d (patch) | |
| tree | 4a11cb647115dfe7aa23de36d0a0733139094939 /drivers/platform/chrome/cros_ec_lightbar.c | |
| parent | abbb054d53266bfbd45ca9f2ba6522e3fd5b7f86 (diff) | |
| download | linux-995c0ec9a81f9e4e75f280f095534f4ed1a9ea9d.tar.gz | |
platform/chrome: cros_ec_lightbar - Avoid I2C xfer to EC during suspend
A Mutex lock in cros_ec_cmd_xfer which may be held by frozen Userspace thread during system suspending. So should not call this routine in suspend thread. Signed-off-by: Jeffery Yu <jefferyy@nvidia.com> Signed-off-by: Guenter Roeck <groeck@chromium.org> Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com> Signed-off-by: Benson Leung <bleung@chromium.org>
Diffstat (limited to 'drivers/platform/chrome/cros_ec_lightbar.c')
| -rw-r--r-- | drivers/platform/chrome/cros_ec_lightbar.c | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/drivers/platform/chrome/cros_ec_lightbar.c b/drivers/platform/chrome/cros_ec_lightbar.c index e570c1ef7728..fd2b047a2748 100644 --- a/drivers/platform/chrome/cros_ec_lightbar.c +++ b/drivers/platform/chrome/cros_ec_lightbar.c @@ -43,6 +43,7 @@ static unsigned long lb_interval_jiffies = 50 * HZ / 1000; * If this is true, we won't do anything during suspend/resume. */ static bool userspace_control; +static struct cros_ec_dev *ec_with_lightbar; static ssize_t interval_msec_show(struct device *dev, struct device_attribute *attr, char *buf) @@ -384,6 +385,9 @@ int lb_manual_suspend_ctrl(struct cros_ec_dev *ec, uint8_t enable) struct cros_ec_command *msg; int ret; + if (ec != ec_with_lightbar) + return 0; + msg = alloc_lightbar_cmd_msg(ec); if (!msg) return -ENOMEM; @@ -413,7 +417,7 @@ error: int lb_suspend(struct cros_ec_dev *ec) { - if (userspace_control) + if (userspace_control || ec != ec_with_lightbar) return 0; return lb_send_empty_cmd(ec, LIGHTBAR_CMD_SUSPEND); @@ -421,7 +425,7 @@ int lb_suspend(struct cros_ec_dev *ec) int lb_resume(struct cros_ec_dev *ec) { - if (userspace_control) + if (userspace_control || ec != ec_with_lightbar) return 0; return lb_send_empty_cmd(ec, LIGHTBAR_CMD_RESUME); @@ -606,9 +610,10 @@ static umode_t cros_ec_lightbar_attrs_are_visible(struct kobject *kobj, return 0; /* Only instantiate this stuff if the EC has a lightbar */ - if (ec_has_lightbar(ec)) + if (ec_has_lightbar(ec)) { + ec_with_lightbar = ec; return a->mode; - + } return 0; } |