linux-kernel - Re: [PATCH v2] Input: gpio_keys: Add level trigger support for GPIO keys

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

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <20180219181159.tzbhhvbvpc236qma@rob-hp-laptop>
Date:   Mon, 19 Feb 2018 12:11:59 -0600
From:   Rob Herring <robh@...nel.org>
To:     Baolin Wang <baolin.wang@...aro.org>
Cc:     dmitry.torokhov@...il.com, mark.rutland@....com,
        gregkh@...uxfoundation.org, lumotuwe@...il.com,
        arvind.yadav.cs@...il.com, josephl@...dia.com,
        kstewart@...uxfoundation.org, pombredanne@...b.com,
        tglx@...utronix.de, linux-input@...r.kernel.org,
        devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
        broonie@...nel.org, linus.walleij@...aro.org
Subject: Re: [PATCH v2] Input: gpio_keys: Add level trigger support for GPIO
 keys

On Sun, Feb 11, 2018 at 02:55:04PM +0800, Baolin Wang wrote:
> On some platforms (such as Spreadtrum platform), the GPIO keys can only
> be triggered by level type. So this patch introduces one property to
> indicate if the GPIO trigger type is level trigger or edge trigger.

If the parent interrupt controller only supports a certain trigger, then 
it should ignore setting the trigger type.

> 
> Signed-off-by: Baolin Wang <baolin.wang@...aro.org>
> ---
> Changes since v1:
>  - Diable the GPIO irq until reversing the GPIO level type.
> ---
>  .../devicetree/bindings/input/gpio-keys.txt        |    2 ++
>  drivers/input/keyboard/gpio_keys.c                 |   26 +++++++++++++++++++-
>  include/linux/gpio_keys.h                          |    1 +
>  3 files changed, 28 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/input/gpio-keys.txt b/Documentation/devicetree/bindings/input/gpio-keys.txt
> index a949404..e3104bd 100644
> --- a/Documentation/devicetree/bindings/input/gpio-keys.txt
> +++ b/Documentation/devicetree/bindings/input/gpio-keys.txt
> @@ -29,6 +29,8 @@ Optional subnode-properties:
>  	- linux,can-disable: Boolean, indicates that button is connected
>  	  to dedicated (not shared) interrupt which can be disabled to
>  	  suppress events from the button.
> +	- gpio-key,level-trigger: Boolean, indicates that button's interrupt
> +	  type is level trigger. Otherwise it is edge trigger as default.

No. Just use 'interrupts' instead of 'gpios' and specify the trigger 
type. Or put both if you need to read the state.

>  
>  Example nodes:
>  
> diff --git a/drivers/input/keyboard/gpio_keys.c b/drivers/input/keyboard/gpio_keys.c
> index 87e613d..218698a 100644
> --- a/drivers/input/keyboard/gpio_keys.c
> +++ b/drivers/input/keyboard/gpio_keys.c
> @@ -385,6 +385,20 @@ static void gpio_keys_gpio_work_func(struct work_struct *work)
>  	struct gpio_button_data *bdata =
>  		container_of(work, struct gpio_button_data, work.work);
>  
> +	if (bdata->button->level_trigger) {
> +		unsigned int trigger =
> +			irq_get_trigger_type(bdata->irq) & ~IRQF_TRIGGER_MASK;
> +		int state = gpiod_get_raw_value_cansleep(bdata->gpiod);
> +
> +		if (state)
> +			trigger |= IRQF_TRIGGER_LOW;
> +		else
> +			trigger |= IRQF_TRIGGER_HIGH;
> +
> +		irq_set_irq_type(bdata->irq, trigger);
> +		enable_irq(bdata->irq);
> +	}
> +
>  	gpio_keys_gpio_report_event(bdata);
>  
>  	if (bdata->button->wakeup)
> @@ -397,6 +411,9 @@ static irqreturn_t gpio_keys_gpio_isr(int irq, void *dev_id)
>  
>  	BUG_ON(irq != bdata->irq);
>  
> +	if (bdata->button->level_trigger)
> +		disable_irq_nosync(bdata->irq);
> +
>  	if (bdata->button->wakeup) {
>  		const struct gpio_keys_button *button = bdata->button;
>  
> @@ -566,7 +583,11 @@ static int gpio_keys_setup_key(struct platform_device *pdev,
>  		INIT_DELAYED_WORK(&bdata->work, gpio_keys_gpio_work_func);
>  
>  		isr = gpio_keys_gpio_isr;
> -		irqflags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING;
> +		if (button->level_trigger)
> +			irqflags = gpiod_is_active_low(bdata->gpiod) ?
> +				IRQF_TRIGGER_LOW : IRQF_TRIGGER_HIGH;
> +		else
> +			irqflags = IRQF_TRIGGER_RISING | IRQF_TRIGGER_FALLING;
>  
>  	} else {
>  		if (!button->irq) {
> @@ -721,6 +742,9 @@ static void gpio_keys_close(struct input_dev *input)
>  		button->can_disable =
>  			fwnode_property_read_bool(child, "linux,can-disable");
>  
> +		button->level_trigger =
> +			fwnode_property_read_bool(child, "gpio-key,level-trigger");
> +
>  		if (fwnode_property_read_u32(child, "debounce-interval",
>  					 &button->debounce_interval))
>  			button->debounce_interval = 5;
> diff --git a/include/linux/gpio_keys.h b/include/linux/gpio_keys.h
> index d06bf77..5095645 100644
> --- a/include/linux/gpio_keys.h
> +++ b/include/linux/gpio_keys.h
> @@ -28,6 +28,7 @@ struct gpio_keys_button {
>  	int wakeup;
>  	int debounce_interval;
>  	bool can_disable;
> +	bool level_trigger;
>  	int value;
>  	unsigned int irq;
>  };
> -- 
> 1.7.9.5
>