platform/x86: int3472: discrete: Log a warning if the pin-numbers don't match
authorHans de Goede <hdegoede@redhat.com>
Fri, 16 Jun 2023 17:21:32 +0000 (19:21 +0200)
committerHans de Goede <hdegoede@redhat.com>
Tue, 20 Jun 2023 10:39:34 +0000 (12:39 +0200)
The INT3472 discrete code assumes that the ACPI GPIO resources are
in the same order as the pin-info _DSM entries.

The returned pin-info includes the pin-number in bits 15-8. Add a check
that this matches with the ACPI GPIO resource pin-number in case
the assumption is not true with some ACPI tables.

Reviewed-by: Daniel Scally <dan.scally@ideasonboard.com>
Reviewed-by: Ilpo Järvinen <ilpo.jarvinen@linux.intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://lore.kernel.org/r/20230616172132.37859-7-hdegoede@redhat.com
drivers/platform/x86/intel/int3472/discrete.c

index 557517f..e33c2d7 100644 (file)
@@ -154,8 +154,8 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares,
 {
        struct int3472_discrete_device *int3472 = data;
        struct acpi_resource_gpio *agpio;
+       u8 active_value, pin, type;
        union acpi_object *obj;
-       u8 active_value, type;
        const char *err_msg;
        const char *func;
        u32 polarity;
@@ -183,6 +183,12 @@ static int skl_int3472_handle_gpio_resources(struct acpi_resource *ares,
 
        int3472_get_func_and_polarity(type, &func, &polarity);
 
+       pin = FIELD_GET(INT3472_GPIO_DSM_PIN, obj->integer.value);
+       if (pin != agpio->pin_table[0])
+               dev_warn(int3472->dev, "%s %s pin number mismatch _DSM %d resource %d\n",
+                        func, agpio->resource_source.string_ptr, pin,
+                        agpio->pin_table[0]);
+
        active_value = FIELD_GET(INT3472_GPIO_DSM_SENSOR_ON_VAL, obj->integer.value);
        if (!active_value)
                polarity ^= GPIO_ACTIVE_LOW;