iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i2c: acpi: Use ACPI wake capability bit to set wake_irq

Browse Source 
Device tree already has a mechanism to pass the wake_irq. It does this
by looking for the wakeup-source property and setting the
I2C_CLIENT_WAKE flag. This CL adds the ACPI equivalent. It uses the
ACPI interrupt wake flag to determine if the interrupt can be used to
wake the system. Previously the i2c drivers had to make assumptions and
blindly enable the wake IRQ. This can cause spurious wake events. e.g.,
If there is a device with an Active Low interrupt and the device gets
powered off while suspending, the interrupt line will go low since it's
no longer powered and wakes the system. For this reason we should
respect the board designers wishes and honor the wake bit defined on the
interrupt.

Signed-off-by: Raul E Rangel <rrangel@chromium.org>
Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>
Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Acked-by: Wolfram Sang <wsa@kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Raul E Rangel 2022-09-29 10:19:11 -06:00 committed by Rafael J. Wysocki
parent 5ff811604f
commit b38f2d5d96
3 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/i2c/i2c-core-acpi.c
View File

@ -137,6 +137,11 @@ static const struct acpi_device_id i2c_acpi_ignored_device_ids[] = {
{} {}
}; };
struct i2c_acpi_irq_context {
int irq;
bool wake_capable;
};
static int i2c_acpi_do_lookup(struct acpi_device *adev, static int i2c_acpi_do_lookup(struct acpi_device *adev,
struct i2c_acpi_lookup *lookup) struct i2c_acpi_lookup *lookup)
{ {
@ -168,13 +173,19 @@ static int i2c_acpi_do_lookup(struct acpi_device *adev,
return 0; return 0;
} }
static int i2c_acpi_add_resource(struct acpi_resource *ares, void *data) static int i2c_acpi_add_irq_resource(struct acpi_resource *ares, void *data)
{ {
int *irq = data; struct i2c_acpi_irq_context *irq_ctx = data;
struct resource r; struct resource r;
if (*irq <= 0 && acpi_dev_resource_interrupt(ares, 0, &r)) if (irq_ctx->irq > 0)
*irq = i2c_dev_irq_from_resources(&r, 1); return 1;
if (!acpi_dev_resource_interrupt(ares, 0, &r))
return 1;
irq_ctx->irq = i2c_dev_irq_from_resources(&r, 1);
irq_ctx->wake_capable = r.flags & IORESOURCE_IRQ_WAKECAPABLE;
return 1; /* No need to add resource to the list */ return 1; /* No need to add resource to the list */
} }
@ -182,31 +193,40 @@ static int i2c_acpi_add_resource(struct acpi_resource *ares, void *data)
/** /**
* i2c_acpi_get_irq - get device IRQ number from ACPI * i2c_acpi_get_irq - get device IRQ number from ACPI
* @client: Pointer to the I2C client device * @client: Pointer to the I2C client device
* @wake_capable: Set to true if the IRQ is wake capable
* *
* Find the IRQ number used by a specific client device. * Find the IRQ number used by a specific client device.
* *
* Return: The IRQ number or an error code. * Return: The IRQ number or an error code.
*/ */
int i2c_acpi_get_irq(struct i2c_client *client) int i2c_acpi_get_irq(struct i2c_client *client, bool *wake_capable)
{ {
struct acpi_device *adev = ACPI_COMPANION(&client->dev); struct acpi_device *adev = ACPI_COMPANION(&client->dev);
struct list_head resource_list; struct list_head resource_list;
int irq = -ENOENT; struct i2c_acpi_irq_context irq_ctx = {
.irq = -ENOENT,
};
int ret; int ret;
INIT_LIST_HEAD(&resource_list); INIT_LIST_HEAD(&resource_list);
ret = acpi_dev_get_resources(adev, &resource_list, ret = acpi_dev_get_resources(adev, &resource_list,
i2c_acpi_add_resource, &irq); i2c_acpi_add_irq_resource, &irq_ctx);
if (ret < 0) if (ret < 0)
return ret; return ret;
acpi_dev_free_resource_list(&resource_list); acpi_dev_free_resource_list(&resource_list);
if (irq == -ENOENT) if (irq_ctx.irq == -ENOENT)
irq = acpi_dev_gpio_irq_get(adev, 0); irq_ctx.irq = acpi_dev_gpio_irq_wake_get(adev, 0, &irq_ctx.wake_capable);
return irq; if (irq_ctx.irq < 0)
return irq_ctx.irq;
if (wake_capable)
*wake_capable = irq_ctx.wake_capable;
return irq_ctx.irq;
} }
static int i2c_acpi_get_info(struct acpi_device *adev, static int i2c_acpi_get_info(struct acpi_device *adev,

6
drivers/i2c/i2c-core-base.c
View File

@ -487,7 +487,11 @@ static int i2c_device_probe(struct device *dev)
if (irq == -EINVAL || irq == -ENODATA) if (irq == -EINVAL || irq == -ENODATA)
irq = of_irq_get(dev->of_node, 0); irq = of_irq_get(dev->of_node, 0);
} else if (ACPI_COMPANION(dev)) { } else if (ACPI_COMPANION(dev)) {
irq = i2c_acpi_get_irq(client); bool wake_capable;
irq = i2c_acpi_get_irq(client, &wake_capable);
if (irq > 0 && wake_capable)
client->flags |= I2C_CLIENT_WAKE;
} }
if (irq == -EPROBE_DEFER) { if (irq == -EPROBE_DEFER) {
status = irq; status = irq;

4
drivers/i2c/i2c-core.h
View File

@ -61,11 +61,11 @@ static inline int __i2c_check_suspended(struct i2c_adapter *adap)
#ifdef CONFIG_ACPI #ifdef CONFIG_ACPI
void i2c_acpi_register_devices(struct i2c_adapter *adap); void i2c_acpi_register_devices(struct i2c_adapter *adap);
int i2c_acpi_get_irq(struct i2c_client *client); int i2c_acpi_get_irq(struct i2c_client *client, bool *wake_capable);
#else /* CONFIG_ACPI */ #else /* CONFIG_ACPI */
static inline void i2c_acpi_register_devices(struct i2c_adapter *adap) { } static inline void i2c_acpi_register_devices(struct i2c_adapter *adap) { }
static inline int i2c_acpi_get_irq(struct i2c_client *client) static inline int i2c_acpi_get_irq(struct i2c_client *client, bool *wake_capable)
{ {
return 0; return 0;
} }