android/android_kernel_samsung_sm8650
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gpiolib: acpi: Take into account debounce settings

Browse Source 
We didn't take into account the debounce settings supplied by ACPI.
This change is targeting the mentioned gap.

Reported-by: Coiby Xu <coiby.xu@gmail.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
This commit is contained in:
Andy Shevchenko 2020-11-09 22:53:26 +02:00
parent 32fa65527c
commit 8dcb7a15a5
2 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
drivers/gpio/gpiolib-acpi.c
View File

@ -299,6 +299,10 @@ static acpi_status acpi_gpiochip_alloc_event(struct acpi_resource *ares,
return AE_OK; return AE_OK;
} }
ret = gpio_set_debounce_timeout(desc, agpio->debounce_timeout);
if (ret)
goto fail_free_desc;
ret = gpiochip_lock_as_irq(chip, pin); ret = gpiochip_lock_as_irq(chip, pin);
if (ret) { if (ret) {
dev_err(chip->parent, dev_err(chip->parent,
@ -664,6 +668,7 @@ static int acpi_populate_gpio_lookup(struct acpi_resource *ares, void *data)
lookup->desc = acpi_get_gpiod(agpio->resource_source.string_ptr, lookup->desc = acpi_get_gpiod(agpio->resource_source.string_ptr,
agpio->pin_table[pin_index]); agpio->pin_table[pin_index]);
lookup->info.pin_config = agpio->pin_config; lookup->info.pin_config = agpio->pin_config;
lookup->info.debounce = agpio->debounce_timeout;
lookup->info.gpioint = gpioint; lookup->info.gpioint = gpioint;
/* /*
@ -961,6 +966,10 @@ int acpi_dev_gpio_irq_get(struct acpi_device *adev, int index)
if (ret < 0) if (ret < 0)
return ret; return ret;
ret = gpio_set_debounce_timeout(desc, info.debounce);
if (ret)
return ret;
irq_flags = acpi_dev_get_irq_type(info.triggering, irq_flags = acpi_dev_get_irq_type(info.triggering,
info.polarity); info.polarity);
@ -1048,6 +1057,7 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address,
if (!found) { if (!found) {
enum gpiod_flags flags = acpi_gpio_to_gpiod_flags(agpio); enum gpiod_flags flags = acpi_gpio_to_gpiod_flags(agpio);
const char *label = "ACPI:OpRegion"; const char *label = "ACPI:OpRegion";
int ret;
desc = gpiochip_request_own_desc(chip, pin, label, desc = gpiochip_request_own_desc(chip, pin, label,
GPIO_ACTIVE_HIGH, GPIO_ACTIVE_HIGH,
@ -1058,6 +1068,14 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address,
goto out; goto out;
} }
ret = gpio_set_debounce_timeout(desc, agpio->debounce_timeout);
if (ret) {
gpiochip_free_own_desc(desc);
mutex_unlock(&achip->conn_lock);
status = AE_ERROR;
goto out;
}
conn = kzalloc(sizeof(*conn), GFP_KERNEL); conn = kzalloc(sizeof(*conn), GFP_KERNEL);
if (!conn) { if (!conn) {
status = AE_NO_MEMORY; status = AE_NO_MEMORY;

2
drivers/gpio/gpiolib-acpi.h
View File

@ -18,6 +18,7 @@ struct acpi_device;
* @pin_config: pin bias as provided by ACPI * @pin_config: pin bias as provided by ACPI
* @polarity: interrupt polarity as provided by ACPI * @polarity: interrupt polarity as provided by ACPI
* @triggering: triggering type as provided by ACPI * @triggering: triggering type as provided by ACPI
* @debounce: debounce timeout as provided by ACPI
* @quirks: Linux specific quirks as provided by struct acpi_gpio_mapping * @quirks: Linux specific quirks as provided by struct acpi_gpio_mapping
*/ */
struct acpi_gpio_info { struct acpi_gpio_info {
@ -27,6 +28,7 @@ struct acpi_gpio_info {
int pin_config; int pin_config;
int polarity; int polarity;
int triggering; int triggering;
unsigned int debounce;
unsigned int quirks; unsigned int quirks;
}; };