diff options
| author | qipeng.zha <qipeng.zha@intel.com> | 2015-03-11 01:15:38 +0800 |
|---|---|---|
| committer | Linus Walleij <linus.walleij@linaro.org> | 2015-03-19 09:22:53 +0100 |
| commit | 4de60970abf9f49737f51ec6e7a1e3bcf6d36742 (patch) | |
| tree | 5dc0acbc100f760505980951f3a90d6fc5f6cba8 | |
| parent | 32c006a99799f6f3c759b77ba761c3a5981e34eb (diff) | |
| download | op-kernel-dev-4de60970abf9f49737f51ec6e7a1e3bcf6d36742.zip op-kernel-dev-4de60970abf9f49737f51ec6e7a1e3bcf6d36742.tar.gz | |
gpiolib: translate pin number in GPIO ACPI callbacks
If GPIO driver use pin mapping, need to translate pin number
between ACPI table and GPIO driver.
This issue is found on one platform with Cherryview gpio
controller, kernel is hang when executed _PS0 method of
one ACPI device, since without this translation, it access
invalid gpiodesc array.
Verified it works again with this patch.
Signed-off-by: qipeng.zha <qipeng.zha@intel.com>
Acked-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
| -rw-r--r-- | drivers/gpio/gpiolib-acpi.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/drivers/gpio/gpiolib-acpi.c b/drivers/gpio/gpiolib-acpi.c index c0929d9..df990f2 100644 --- a/drivers/gpio/gpiolib-acpi.c +++ b/drivers/gpio/gpiolib-acpi.c @@ -201,6 +201,10 @@ static acpi_status acpi_gpiochip_request_interrupt(struct acpi_resource *ares, if (!handler) return AE_BAD_PARAMETER; + pin = acpi_gpiochip_pin_to_gpio_offset(chip, pin); + if (pin < 0) + return AE_BAD_PARAMETER; + desc = gpiochip_request_own_desc(chip, pin, "ACPI:Event"); if (IS_ERR(desc)) { dev_err(chip->dev, "Failed to request GPIO\n"); @@ -551,6 +555,12 @@ acpi_gpio_adr_space_handler(u32 function, acpi_physical_address address, struct gpio_desc *desc; bool found; + pin = acpi_gpiochip_pin_to_gpio_offset(chip, pin); + if (pin < 0) { + status = AE_BAD_PARAMETER; + goto out; + } + mutex_lock(&achip->conn_lock); found = false; |
