| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20141230005114.GI9565@dtor-ws>
Date: Mon, 29 Dec 2014 16:51:14 -0800
From: Dmitry Torokhov <dmitry.torokhov@...il.com>
To: Dudley Du <dudl@...ress.com>
Cc: jmmahler@...il.com, rydberg@...omail.se, bleung@...gle.com,
linux-input@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v16 03/12] input: cyapa: add power management interfaces
support for the device
Hi Dudley,
On Thu, Dec 18, 2014 at 06:00:47PM +0800, Dudley Du wrote:
> Add suspend_scanrate_ms power management interfaces in device's
> power group, so users or applications can control the power management
> strategy of trackpad device as their requirements.
> TEST=test on Chromebooks.
>
> Signed-off-by: Dudley Du <dudl@...ress.com>
> ---
> drivers/input/mouse/cyapa.c | 111 ++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 111 insertions(+)
>
> diff --git a/drivers/input/mouse/cyapa.c b/drivers/input/mouse/cyapa.c
> index d4560a3..73f6817 100644
> --- a/drivers/input/mouse/cyapa.c
> +++ b/drivers/input/mouse/cyapa.c
> @@ -575,6 +575,96 @@ out:
> return IRQ_HANDLED;
> }
>
> +/*
> + **************************************************************
> + * sysfs interface
> + **************************************************************
> +*/
> +#ifdef CONFIG_PM_SLEEP
> +static ssize_t cyapa_show_suspend_scanrate(struct device *dev,
> + struct device_attribute *attr,
> + char *buf)
> +{
> + struct cyapa *cyapa = dev_get_drvdata(dev);
> + u8 pwr_cmd = cyapa->suspend_power_mode;
> + u16 sleep_time;
> + int len;
> + int error;
> +
> + error = mutex_lock_interruptible(&cyapa->state_sync_lock);
> + if (error)
> + return error;
> + pwr_cmd = cyapa->suspend_power_mode;
> + sleep_time = cyapa->suspend_sleep_time;
> + mutex_unlock(&cyapa->state_sync_lock);
> +
> + if (pwr_cmd == PWR_MODE_BTN_ONLY) {
> + len = scnprintf(buf, PAGE_SIZE, "%s\n", BTN_ONLY_MODE_NAME);
> + } else if (pwr_cmd == PWR_MODE_OFF) {
> + len = scnprintf(buf, PAGE_SIZE, "%s\n", OFF_MODE_NAME);
> + } else {
> + if (cyapa->gen == CYAPA_GEN3)
> + sleep_time = cyapa_pwr_cmd_to_sleep_time(pwr_cmd);
> + len = scnprintf(buf, PAGE_SIZE, "%u\n", sleep_time);
> + }
> +
> + return len;
> +}
> +
> +static ssize_t cyapa_update_suspend_scanrate(struct device *dev,
> + struct device_attribute *attr,
> + const char *buf, size_t count)
> +{
> + struct cyapa *cyapa = dev_get_drvdata(dev);
> + u16 sleep_time;
> + int error;
> +
> + error = mutex_lock_interruptible(&cyapa->state_sync_lock);
> + if (error)
> + return error;
> +
> + if (sysfs_streq(buf, BTN_ONLY_MODE_NAME)) {
> + cyapa->suspend_power_mode = PWR_MODE_BTN_ONLY;
> + } else if (sysfs_streq(buf, OFF_MODE_NAME)) {
> + cyapa->suspend_power_mode = PWR_MODE_OFF;
> + } else if (!kstrtou16(buf, 10, &sleep_time)) {
> + cyapa->suspend_sleep_time = max_t(u16, sleep_time, 1000);
> + cyapa->suspend_power_mode =
> + cyapa_sleep_time_to_pwr_cmd(cyapa->suspend_sleep_time);
> + } else {
> + count = 0;
> + }
> +
> + mutex_unlock(&cyapa->state_sync_lock);
> +
> + if (!count)
> + dev_err(dev, "invalid suspend scanrate ms parameters\n");
I'd rather we just return -EINVAL and not display the message so as to
not fill the logs.
> + return count ? count : -EINVAL;
> +}
> +
> +static DEVICE_ATTR(suspend_scanrate_ms, S_IRUGO|S_IWUSR,
> + cyapa_show_suspend_scanrate,
> + cyapa_update_suspend_scanrate);
> +
> +static struct attribute *cyapa_power_wakeup_entries[] = {
> + &dev_attr_suspend_scanrate_ms.attr,
> + NULL,
> +};
> +
> +static const struct attribute_group cyapa_power_wakeup_group = {
> + .name = power_group_name,
> + .attrs = cyapa_power_wakeup_entries,
> +};
> +
> +static void cyapa_remove_power_wakeup_group(void *data)
> +{
> + struct cyapa *cyapa = data;
> +
> + sysfs_unmerge_group(&cyapa->client->dev.kobj,
> + &cyapa_power_wakeup_group);
> +}
> +#endif /* CONFIG_PM_SLEEP */
> +
> static int cyapa_probe(struct i2c_client *client,
> const struct i2c_device_id *dev_id)
> {
> @@ -614,6 +704,27 @@ static int cyapa_probe(struct i2c_client *client,
> return error;
> }
>
> +#ifdef CONFIG_PM_SLEEP
> + if (device_can_wakeup(dev)) {
> + error = sysfs_merge_group(&client->dev.kobj,
> + &cyapa_power_wakeup_group);
> + if (error) {
> + dev_err(dev, "failed to add power wakeup group: %d\n",
> + error);
> + return error;
> + }
> +
> + error = devm_add_action(dev,
> + cyapa_remove_power_wakeup_group, cyapa);
> + if (error) {
> + cyapa_remove_power_wakeup_group(cyapa);
> + dev_err(dev, "failed to add power cleanup action: %d\n",
> + error);
> + return error;
> + }
> + }
> +#endif /* CONFIG_PM_SLEEP */
Please split out this code into cyapa_prepare_wakeup_controls() and
provide a stub for !CONFIG_PM_SLEEP. We are trying to avoid #ifdefs in
the middle of fucntion body.
Thanks!
> +
> error = devm_request_threaded_irq(dev, client->irq,
> NULL, cyapa_irq,
> IRQF_TRIGGER_FALLING | IRQF_ONESHOT,
> --
> 1.9.1
>
--
Dmitry
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists