[PATCH v8 0/2] i2c: designware: fix WACF2200 touchscreen probe ordering

[PATCH v8 0/2] i2c: designware: fix WACF2200 touchscreen probe ordering

[Hardik Prakash]

This series fixes the non-functional WACF2200 touchscreen on Lenovo
Yoga 7 14AGP11 by:

1. Reverting the earlier DMI-specific GPIO IRQ quirk (patch 1 of the
   original series, already in Torvalds' tree) which is no longer
   needed.

2. Adding a generic probe deferral in i2c-designware that walks ACPI
   child devices, finds GpioInt resources, and defers probe until the
   referenced GPIO controllers are fully bound.

Testing confirms patch 2 alone is sufficient — the existing
amd_gpio_irq_enable() flow works correctly once probe ordering is
fixed, making the manual IRQ restoration in the reverted patch
unnecessary.

The probe ordering race was confirmed via dynamic debug tracing:

  0.285952  amd_gpio_probe: registering gpiochip  <- GPIO chip visible
  0.287121  amd_gpio_probe: requesting parent IRQ <- probe still running
  0.301454  AMDI0010:02 dw_i2c_plat_probe: start  <- races here
  2.348157  lost arbitration

Tested on Lenovo Yoga 7 14AGP11 (83TD), Fedora 44, kernel 7.1.0-rc5+.

v8:
 - Add revert of now-unnecessary patch 1 (Mario Limonciello)
 - Collect Acked-by (Bartosz Golaszewski) and Reviewed-by (Mario Limonciello)

v7:
 - Fix unused 'ret' variable in check_child_gpioint() (kernel test robot)
 - Replace BugLink: with Link: (Bartosz Golaszewski)
 - Add Reported-by and Closes tags for kernel test robot warning

v6:
 - Replace DMI-specific deferral with generic GpioInt dependency check
   walking ACPI child devices (suggested by Mario Limonciello)

v5:
 - Add blank line before #include <linux/acpi.h> (Bartosz Golaszewski)
 - Use scoped_guard(device, gpio_dev) (Bartosz Golaszewski)

v4:
 - Rebase onto Linus Walleij's tree
 - Use --base so series is correctly 1/1 (Andy Shevchenko)

v3:
 - Fix variable declaration style (Andy Shevchenko)
 - Add BugLink tag (Andy Shevchenko)
 - CC AMD engineers (Andy Shevchenko)

v2:
 - Replace custom HID/UID lookup with acpi_dev_get_first_match_dev()
 - Use device_is_bound() under device_lock() with explanatory comments
 - Add Assisted-by tags per coding-assistants.rst

Kernel bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=221494
Related: https://bugzilla.kernel.org/show_bug.cgi?id=221454

Hardik Prakash (2):
  Revert "pinctrl-amd: enable IRQ for WACF2200 touchscreen on Lenovo
    Yoga 7 14AGP11"
  i2c: designware: defer probe if child GpioInt controllers are not
    bound

 drivers/i2c/busses/i2c-designware-platdrv.c | 156 ++++++++++++++++++++
 drivers/pinctrl/pinctrl-amd.c               |  35 -----
 2 files changed, 156 insertions(+), 35 deletions(-)

base-commit: 8fde5d1d47f6

[PATCH v8 1/2] Revert "pinctrl-amd: enable IRQ for WACF2200 touchscreen on Lenovo Yoga 7 14AGP11"

[Hardik Prakash]

This reverts commit 3812a9e84265a5cdd90d29fe8d97a023e91fb945.

The probe ordering fix in the following patch ensures amd_gpio_probe()
completes before i2c-designware probes AMDI0010:02, allowing the
existing amd_gpio_irq_enable() flow to work correctly. The manual IRQ
restoration added by this patch is therefore no longer needed.

Link: https://bugzilla.kernel.org/show_bug.cgi?id=221494
Signed-off-by: Hardik Prakash <hardikprakash.official@gmail.com>
---
 drivers/pinctrl/pinctrl-amd.c | 35 -----------------------------------
 1 file changed, 35 deletions(-)

diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
index 64315b0edf2a..e3128b0045d2 100644
--- a/drivers/pinctrl/pinctrl-amd.c
+++ b/drivers/pinctrl/pinctrl-amd.c
@@ -26,7 +26,6 @@
 #include <linux/interrupt.h>
 #include <linux/bitops.h>
 #include <linux/pinctrl/pinconf.h>
-#include <linux/dmi.h>
 #include <linux/pinctrl/pinconf-generic.h>
 #include <linux/pinctrl/pinmux.h>
 #include <linux/string_choices.h>
@@ -40,39 +39,6 @@
 static struct amd_gpio *pinctrl_dev;
 #endif
 
-static const struct dmi_system_id amd_gpio_quirk_yoga7_14agp11[] = {
-	{
-		.matches = {
-			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
-			DMI_MATCH(DMI_PRODUCT_NAME, "83TD"),
-			DMI_MATCH(DMI_BOARD_NAME, "LNVNB161216"),
-		},
-	},
-	{ }
-};
-
-static void amd_gpio_apply_quirks(struct amd_gpio *gpio_dev)
-{
-	const unsigned int pin = 157; /* WACF2200 GpioInt per ACPI _CRS */
-	unsigned long flags;
-	u32 reg;
-
-	if (!dmi_check_system(amd_gpio_quirk_yoga7_14agp11))
-		return;
-	if (pin >= gpio_dev->gc.ngpio)
-		return;
-
-	raw_spin_lock_irqsave(&gpio_dev->lock, flags);
-	reg = readl(gpio_dev->base + pin * 4);
-	reg |= BIT(INTERRUPT_ENABLE_OFF) | BIT(INTERRUPT_MASK_OFF);
-	writel(reg, gpio_dev->base + pin * 4);
-	raw_spin_unlock_irqrestore(&gpio_dev->lock, flags);
-
-	dev_info(&gpio_dev->pdev->dev,
-		 "Enabled IRQ for GPIO %u (Yoga 7 14AGP11 touchscreen)\n",
-		 pin);
-}
-
 static int amd_gpio_get_direction(struct gpio_chip *gc, unsigned offset)
 {
 	unsigned long flags;
@@ -1253,7 +1219,6 @@ static int amd_gpio_probe(struct platform_device *pdev)
 
 	/* Disable and mask interrupts */
 	amd_gpio_irq_init(gpio_dev);
-	amd_gpio_apply_quirks(gpio_dev);
 
 	girq = &gpio_dev->gc.irq;
 	gpio_irq_chip_set_chip(girq, &amd_gpio_irqchip);
-- 
2.54.0

[PATCH v8 2/2] i2c: designware: defer probe if child GpioInt controllers are not bound

[Hardik Prakash]

I2C controllers may have child devices with GpioInt resources that
depend on GPIO controllers to be fully initialized. If the I2C
controller probes and enumerates children before the referenced GPIO
controller has completed probe, GPIO interrupts may not be properly
configured, leading to device failures.

On Lenovo Yoga 7 14AGP11, the WACF2200 touchscreen (child of
AMDI0010:02) has a GpioInt resource pointing to GPIO 157 on the
pinctrl-amd controller (AMDI0030:00). When i2c-designware probes
AMDI0010:02 before pinctrl-amd finishes initializing, I2C transactions
occur before the GPIO IRQ quirk in amd_gpio_probe() has run, causing:

  i2c_designware AMDI0010:02: i2c_dw_handle_tx_abort: lost arbitration

Add a generic dependency check in i2c-designware that walks ACPI child
devices, identifies any GpioInt resources, resolves the referenced GPIO
controllers, and defers probe if those controllers are not yet bound.

This ensures GPIO controllers complete initialization (including IRQ
setup and quirks) before I2C child enumeration begins, fixing the race
without device-specific quirks or DMI matching.

The probe ordering race was confirmed via dynamic debug tracing:

  0.285952  amd_gpio_probe: registering gpiochip  <- GPIO chip visible
  0.287121  amd_gpio_probe: requesting parent IRQ <- probe still running
  0.301454  AMDI0010:02 dw_i2c_plat_probe: start  <- races here
  2.348157  lost arbitration

Suggested-by: Mario Limonciello <mario.limonciello@amd.com>
Signed-off-by: Hardik Prakash <hardikprakash.official@gmail.com>
Acked-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
Assisted-by: Claude:claude-sonnet-4-6
Assisted-by: GPT-Codex:gpt-5.2-codex
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202605240959.Kcf1lIg4-lkp@intel.com/
Link: https://bugzilla.kernel.org/show_bug.cgi?id=221494
---
 drivers/i2c/busses/i2c-designware-platdrv.c | 156 ++++++++++++++++++++
 1 file changed, 156 insertions(+)

diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
index 3351c4a9ef11..1c01b0460385 100644
--- a/drivers/i2c/busses/i2c-designware-platdrv.c
+++ b/drivers/i2c/busses/i2c-designware-platdrv.c
@@ -8,6 +8,8 @@
  * Copyright (C) 2007 MontaVista Software Inc.
  * Copyright (C) 2009 Provigent Ltd.
  */
+
+#include <linux/acpi.h>
 #include <linux/clk-provider.h>
 #include <linux/clk.h>
 #include <linux/delay.h>
@@ -130,6 +132,152 @@ static int i2c_dw_probe_lock_support(struct dw_i2c_dev *dev)
 	return 0;
 }
 
+#ifdef CONFIG_ACPI
+struct gpio_dep_ctx {
+	struct list_head gpio_controllers;
+	int ret;
+};
+
+struct gpio_controller_ref {
+	struct list_head node;
+	char *path;
+};
+
+static int check_gpioint_resource(struct acpi_resource *ares, void *data)
+{
+	struct gpio_dep_ctx *ctx = data;
+	struct acpi_resource_gpio *agpio;
+	struct gpio_controller_ref *ref, *tmp;
+	bool found = false;
+
+	if (ares->type != ACPI_RESOURCE_TYPE_GPIO)
+		return 1;
+
+	agpio = &ares->data.gpio;
+	if (agpio->connection_type != ACPI_RESOURCE_GPIO_TYPE_INT)
+		return 1;
+
+	/* Check if we've already tracked this GPIO controller */
+	list_for_each_entry(tmp, &ctx->gpio_controllers, node) {
+		if (!strcmp(tmp->path, agpio->resource_source.string_ptr)) {
+			found = true;
+			break;
+		}
+	}
+
+	if (!found) {
+		ref = kzalloc(sizeof(*ref), GFP_KERNEL);
+		if (!ref) {
+			ctx->ret = -ENOMEM;
+			return 0;
+		}
+
+		ref->path = kstrdup(agpio->resource_source.string_ptr, GFP_KERNEL);
+		if (!ref->path) {
+			kfree(ref);
+			ctx->ret = -ENOMEM;
+			return 0;
+		}
+
+		list_add_tail(&ref->node, &ctx->gpio_controllers);
+	}
+
+	return 1;
+}
+
+static int check_child_gpioint(struct acpi_device *adev, void *data)
+{
+	struct gpio_dep_ctx *ctx = data;
+	struct list_head res_list;
+
+	INIT_LIST_HEAD(&res_list);
+
+	acpi_dev_get_resources(adev, &res_list, check_gpioint_resource, ctx);
+	acpi_dev_free_resource_list(&res_list);
+
+	if (ctx->ret < 0)
+		return ctx->ret;
+
+	return 0;
+}
+
+static int i2c_dw_check_gpio_dependencies(struct device *dev)
+{
+	struct acpi_device *adev = ACPI_COMPANION(dev);
+	struct gpio_dep_ctx ctx = { .ret = 0 };
+	struct gpio_controller_ref *ref, *tmp;
+	int ret = 0;
+
+	if (!adev)
+		return 0;
+
+	INIT_LIST_HEAD(&ctx.gpio_controllers);
+
+	/* Walk all child devices and collect GpioInt controller references */
+	ret = acpi_dev_for_each_child(adev, check_child_gpioint, &ctx);
+	if (ret < 0 || ctx.ret < 0) {
+		ret = ctx.ret ?: ret;
+		goto cleanup;
+	}
+
+	/* For each GPIO controller, check if its parent device is bound */
+	list_for_each_entry(ref, &ctx.gpio_controllers, node) {
+		acpi_handle handle;
+		acpi_status status;
+		struct acpi_device *gpio_adev;
+		struct device *gpio_dev;
+		bool bound;
+
+		status = acpi_get_handle(NULL, ref->path, &handle);
+		if (ACPI_FAILURE(status))
+			continue;
+
+		gpio_adev = acpi_fetch_acpi_dev(handle);
+		if (!gpio_adev)
+			continue;
+
+		gpio_dev = acpi_get_first_physical_node(gpio_adev);
+		acpi_dev_put(gpio_adev);
+
+		if (!gpio_dev) {
+			ret = -EPROBE_DEFER;
+			goto cleanup;
+		}
+
+		/*
+		 * Check if the GPIO controller's device is bound. If not,
+		 * defer probe to ensure GPIO initialization (including IRQ
+		 * setup and quirks) is complete before we enumerate I2C
+		 * child devices.
+		 */
+		scoped_guard(device, gpio_dev) {
+			bound = device_is_bound(gpio_dev);
+		}
+		if (!bound) {
+			put_device(gpio_dev);
+			ret = -EPROBE_DEFER;
+			goto cleanup;
+		}
+
+		put_device(gpio_dev);
+	}
+
+cleanup:
+	list_for_each_entry_safe(ref, tmp, &ctx.gpio_controllers, node) {
+		list_del(&ref->node);
+		kfree(ref->path);
+		kfree(ref);
+	}
+
+	return ret;
+}
+#else
+static int i2c_dw_check_gpio_dependencies(struct device *dev)
+{
+	return 0;
+}
+#endif /* CONFIG_ACPI */
+
 static int dw_i2c_plat_probe(struct platform_device *pdev)
 {
 	u32 flags = (uintptr_t)device_get_match_data(&pdev->dev);
@@ -138,6 +286,14 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
 	struct dw_i2c_dev *dev;
 	int irq, ret;
 
+	/*
+	 * Check if any child devices have GpioInt resources, and if so,
+	 * defer probe until those GPIO controllers are fully bound.
+	 */
+	ret = i2c_dw_check_gpio_dependencies(device);
+	if (ret)
+		return ret;
+
 	irq = platform_get_irq_optional(pdev, 0);
 	if (irq == -ENXIO)
 		flags |= ACCESS_POLLING;
-- 
2.54.0

Re: [PATCH v8 1/2] Revert "pinctrl-amd: enable IRQ for WACF2200 touchscreen on Lenovo Yoga 7 14AGP11"

[Mario Limonciello]

On 5/29/26 12:08, Hardik Prakash wrote:
> This reverts commit 3812a9e84265a5cdd90d29fe8d97a023e91fb945.
> 
> The probe ordering fix in the following patch ensures amd_gpio_probe()
> completes before i2c-designware probes AMDI0010:02, allowing the
> existing amd_gpio_irq_enable() flow to work correctly. The manual IRQ
> restoration added by this patch is therefore no longer needed.
> 
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=221494
> Signed-off-by: Hardik Prakash <hardikprakash.official@gmail.com>

Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>

So that this reverts in older kernels probably want this:

Fixes: 3812a9e84265a ("pinctrl-amd: enable IRQ for WACF2200 touchscreen 
on Lenovo Yoga 7 14AGP11")

> ---
>   drivers/pinctrl/pinctrl-amd.c | 35 -----------------------------------
>   1 file changed, 35 deletions(-)
> 
> diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
> index 64315b0edf2a..e3128b0045d2 100644
> --- a/drivers/pinctrl/pinctrl-amd.c
> +++ b/drivers/pinctrl/pinctrl-amd.c
> @@ -26,7 +26,6 @@
>   #include <linux/interrupt.h>
>   #include <linux/bitops.h>
>   #include <linux/pinctrl/pinconf.h>
> -#include <linux/dmi.h>
>   #include <linux/pinctrl/pinconf-generic.h>
>   #include <linux/pinctrl/pinmux.h>
>   #include <linux/string_choices.h>
> @@ -40,39 +39,6 @@
>   static struct amd_gpio *pinctrl_dev;
>   #endif
>   
> -static const struct dmi_system_id amd_gpio_quirk_yoga7_14agp11[] = {
> -	{
> -		.matches = {
> -			DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> -			DMI_MATCH(DMI_PRODUCT_NAME, "83TD"),
> -			DMI_MATCH(DMI_BOARD_NAME, "LNVNB161216"),
> -		},
> -	},
> -	{ }
> -};
> -
> -static void amd_gpio_apply_quirks(struct amd_gpio *gpio_dev)
> -{
> -	const unsigned int pin = 157; /* WACF2200 GpioInt per ACPI _CRS */
> -	unsigned long flags;
> -	u32 reg;
> -
> -	if (!dmi_check_system(amd_gpio_quirk_yoga7_14agp11))
> -		return;
> -	if (pin >= gpio_dev->gc.ngpio)
> -		return;
> -
> -	raw_spin_lock_irqsave(&gpio_dev->lock, flags);
> -	reg = readl(gpio_dev->base + pin * 4);
> -	reg |= BIT(INTERRUPT_ENABLE_OFF) | BIT(INTERRUPT_MASK_OFF);
> -	writel(reg, gpio_dev->base + pin * 4);
> -	raw_spin_unlock_irqrestore(&gpio_dev->lock, flags);
> -
> -	dev_info(&gpio_dev->pdev->dev,
> -		 "Enabled IRQ for GPIO %u (Yoga 7 14AGP11 touchscreen)\n",
> -		 pin);
> -}
> -
>   static int amd_gpio_get_direction(struct gpio_chip *gc, unsigned offset)
>   {
>   	unsigned long flags;
> @@ -1253,7 +1219,6 @@ static int amd_gpio_probe(struct platform_device *pdev)
>   
>   	/* Disable and mask interrupts */
>   	amd_gpio_irq_init(gpio_dev);
> -	amd_gpio_apply_quirks(gpio_dev);
>   
>   	girq = &gpio_dev->gc.irq;
>   	gpio_irq_chip_set_chip(girq, &amd_gpio_irqchip);

Re: [PATCH v8 2/2] i2c: designware: defer probe if child GpioInt controllers are not bound

[Mario Limonciello]

On 5/29/26 12:08, Hardik Prakash wrote:
> I2C controllers may have child devices with GpioInt resources that
> depend on GPIO controllers to be fully initialized. If the I2C
> controller probes and enumerates children before the referenced GPIO
> controller has completed probe, GPIO interrupts may not be properly
> configured, leading to device failures.
> 
> On Lenovo Yoga 7 14AGP11, the WACF2200 touchscreen (child of
> AMDI0010:02) has a GpioInt resource pointing to GPIO 157 on the
> pinctrl-amd controller (AMDI0030:00). When i2c-designware probes
> AMDI0010:02 before pinctrl-amd finishes initializing, I2C transactions
> occur before the GPIO IRQ quirk in amd_gpio_probe() has run, causing:
> 
>    i2c_designware AMDI0010:02: i2c_dw_handle_tx_abort: lost arbitration
> 
> Add a generic dependency check in i2c-designware that walks ACPI child
> devices, identifies any GpioInt resources, resolves the referenced GPIO
> controllers, and defers probe if those controllers are not yet bound.
> 
> This ensures GPIO controllers complete initialization (including IRQ
> setup and quirks) before I2C child enumeration begins, fixing the race
> without device-specific quirks or DMI matching.
> 
> The probe ordering race was confirmed via dynamic debug tracing:
> 
>    0.285952  amd_gpio_probe: registering gpiochip  <- GPIO chip visible
>    0.287121  amd_gpio_probe: requesting parent IRQ <- probe still running
>    0.301454  AMDI0010:02 dw_i2c_plat_probe: start  <- races here
>    2.348157  lost arbitration
> 
> Suggested-by: Mario Limonciello <mario.limonciello@amd.com>
> Signed-off-by: Hardik Prakash <hardikprakash.official@gmail.com>
> Acked-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
> Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
> Assisted-by: Claude:claude-sonnet-4-6
> Assisted-by: GPT-Codex:gpt-5.2-codex
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202605240959.Kcf1lIg4-lkp@intel.com/
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=221494

Fixes: 3812a9e84265a ("pinctrl-amd: enable IRQ for WACF2200 touchscreen 
on Lenovo Yoga 7 14AGP11")

> ---
>   drivers/i2c/busses/i2c-designware-platdrv.c | 156 ++++++++++++++++++++
>   1 file changed, 156 insertions(+)
> 
> diff --git a/drivers/i2c/busses/i2c-designware-platdrv.c b/drivers/i2c/busses/i2c-designware-platdrv.c
> index 3351c4a9ef11..1c01b0460385 100644
> --- a/drivers/i2c/busses/i2c-designware-platdrv.c
> +++ b/drivers/i2c/busses/i2c-designware-platdrv.c
> @@ -8,6 +8,8 @@
>    * Copyright (C) 2007 MontaVista Software Inc.
>    * Copyright (C) 2009 Provigent Ltd.
>    */
> +
> +#include <linux/acpi.h>
>   #include <linux/clk-provider.h>
>   #include <linux/clk.h>
>   #include <linux/delay.h>
> @@ -130,6 +132,152 @@ static int i2c_dw_probe_lock_support(struct dw_i2c_dev *dev)
>   	return 0;
>   }
>   
> +#ifdef CONFIG_ACPI
> +struct gpio_dep_ctx {
> +	struct list_head gpio_controllers;
> +	int ret;
> +};
> +
> +struct gpio_controller_ref {
> +	struct list_head node;
> +	char *path;
> +};
> +
> +static int check_gpioint_resource(struct acpi_resource *ares, void *data)
> +{
> +	struct gpio_dep_ctx *ctx = data;
> +	struct acpi_resource_gpio *agpio;
> +	struct gpio_controller_ref *ref, *tmp;
> +	bool found = false;
> +
> +	if (ares->type != ACPI_RESOURCE_TYPE_GPIO)
> +		return 1;
> +
> +	agpio = &ares->data.gpio;
> +	if (agpio->connection_type != ACPI_RESOURCE_GPIO_TYPE_INT)
> +		return 1;
> +
> +	/* Check if we've already tracked this GPIO controller */
> +	list_for_each_entry(tmp, &ctx->gpio_controllers, node) {
> +		if (!strcmp(tmp->path, agpio->resource_source.string_ptr)) {
> +			found = true;
> +			break;
> +		}
> +	}
> +
> +	if (!found) {
> +		ref = kzalloc(sizeof(*ref), GFP_KERNEL);
> +		if (!ref) {
> +			ctx->ret = -ENOMEM;
> +			return 0;
> +		}
> +
> +		ref->path = kstrdup(agpio->resource_source.string_ptr, GFP_KERNEL);
> +		if (!ref->path) {
> +			kfree(ref);
> +			ctx->ret = -ENOMEM;
> +			return 0;
> +		}
> +
> +		list_add_tail(&ref->node, &ctx->gpio_controllers);
> +	}
> +
> +	return 1;
> +}
> +
> +static int check_child_gpioint(struct acpi_device *adev, void *data)
> +{
> +	struct gpio_dep_ctx *ctx = data;
> +	struct list_head res_list;
> +
> +	INIT_LIST_HEAD(&res_list);
> +
> +	acpi_dev_get_resources(adev, &res_list, check_gpioint_resource, ctx);
> +	acpi_dev_free_resource_list(&res_list);
> +
> +	if (ctx->ret < 0)
> +		return ctx->ret;
> +
> +	return 0;
> +}
> +
> +static int i2c_dw_check_gpio_dependencies(struct device *dev)
> +{
> +	struct acpi_device *adev = ACPI_COMPANION(dev);
> +	struct gpio_dep_ctx ctx = { .ret = 0 };
> +	struct gpio_controller_ref *ref, *tmp;
> +	int ret = 0;
> +
> +	if (!adev)
> +		return 0;
> +
> +	INIT_LIST_HEAD(&ctx.gpio_controllers);
> +
> +	/* Walk all child devices and collect GpioInt controller references */
> +	ret = acpi_dev_for_each_child(adev, check_child_gpioint, &ctx);
> +	if (ret < 0 || ctx.ret < 0) {
> +		ret = ctx.ret ?: ret;
> +		goto cleanup;
> +	}
> +
> +	/* For each GPIO controller, check if its parent device is bound */
> +	list_for_each_entry(ref, &ctx.gpio_controllers, node) {
> +		acpi_handle handle;
> +		acpi_status status;
> +		struct acpi_device *gpio_adev;
> +		struct device *gpio_dev;
> +		bool bound;
> +
> +		status = acpi_get_handle(NULL, ref->path, &handle);
> +		if (ACPI_FAILURE(status))
> +			continue;
> +
> +		gpio_adev = acpi_fetch_acpi_dev(handle);
> +		if (!gpio_adev)
> +			continue;
> +
> +		gpio_dev = acpi_get_first_physical_node(gpio_adev);
> +		acpi_dev_put(gpio_adev);
> +
> +		if (!gpio_dev) {
> +			ret = -EPROBE_DEFER;
> +			goto cleanup;
> +		}
> +
> +		/*
> +		 * Check if the GPIO controller's device is bound. If not,
> +		 * defer probe to ensure GPIO initialization (including IRQ
> +		 * setup and quirks) is complete before we enumerate I2C
> +		 * child devices.
> +		 */
> +		scoped_guard(device, gpio_dev) {
> +			bound = device_is_bound(gpio_dev);
> +		}
> +		if (!bound) {
> +			put_device(gpio_dev);
> +			ret = -EPROBE_DEFER;
> +			goto cleanup;
> +		}
> +
> +		put_device(gpio_dev);
> +	}
> +
> +cleanup:
> +	list_for_each_entry_safe(ref, tmp, &ctx.gpio_controllers, node) {
> +		list_del(&ref->node);
> +		kfree(ref->path);
> +		kfree(ref);
> +	}
> +
> +	return ret;
> +}
> +#else
> +static int i2c_dw_check_gpio_dependencies(struct device *dev)
> +{
> +	return 0;
> +}
> +#endif /* CONFIG_ACPI */
> +
>   static int dw_i2c_plat_probe(struct platform_device *pdev)
>   {
>   	u32 flags = (uintptr_t)device_get_match_data(&pdev->dev);
> @@ -138,6 +286,14 @@ static int dw_i2c_plat_probe(struct platform_device *pdev)
>   	struct dw_i2c_dev *dev;
>   	int irq, ret;
>   
> +	/*
> +	 * Check if any child devices have GpioInt resources, and if so,
> +	 * defer probe until those GPIO controllers are fully bound.
> +	 */
> +	ret = i2c_dw_check_gpio_dependencies(device);
> +	if (ret)
> +		return ret;
> +
>   	irq = platform_get_irq_optional(pdev, 0);
>   	if (irq == -ENXIO)
>   		flags |= ACCESS_POLLING;

Re: [PATCH v8 0/2] i2c: designware: fix WACF2200 touchscreen probe ordering

[Mario Limonciello]

On 5/29/26 12:08, Hardik Prakash wrote:
> This series fixes the non-functional WACF2200 touchscreen on Lenovo
> Yoga 7 14AGP11 by:
> 
> 1. Reverting the earlier DMI-specific GPIO IRQ quirk (patch 1 of the
>     original series, already in Torvalds' tree) which is no longer
>     needed.
> 
> 2. Adding a generic probe deferral in i2c-designware that walks ACPI
>     child devices, finds GpioInt resources, and defers probe until the
>     referenced GPIO controllers are fully bound.
> 
> Testing confirms patch 2 alone is sufficient — the existing
> amd_gpio_irq_enable() flow works correctly once probe ordering is
> fixed, making the manual IRQ restoration in the reverted patch
> unnecessary.
> 
> The probe ordering race was confirmed via dynamic debug tracing:
> 
>    0.285952  amd_gpio_probe: registering gpiochip  <- GPIO chip visible
>    0.287121  amd_gpio_probe: requesting parent IRQ <- probe still running
>    0.301454  AMDI0010:02 dw_i2c_plat_probe: start  <- races here
>    2.348157  lost arbitration
> 
> Tested on Lenovo Yoga 7 14AGP11 (83TD), Fedora 44, kernel 7.1.0-rc5+.
> 
> v8:
>   - Add revert of now-unnecessary patch 1 (Mario Limonciello)
>   - Collect Acked-by (Bartosz Golaszewski) and Reviewed-by (Mario Limonciello)
> 
> v7:
>   - Fix unused 'ret' variable in check_child_gpioint() (kernel test robot)
>   - Replace BugLink: with Link: (Bartosz Golaszewski)
>   - Add Reported-by and Closes tags for kernel test robot warning
> 
> v6:
>   - Replace DMI-specific deferral with generic GpioInt dependency check
>     walking ACPI child devices (suggested by Mario Limonciello)
> 
> v5:
>   - Add blank line before #include <linux/acpi.h> (Bartosz Golaszewski)
>   - Use scoped_guard(device, gpio_dev) (Bartosz Golaszewski)
> 
> v4:
>   - Rebase onto Linus Walleij's tree
>   - Use --base so series is correctly 1/1 (Andy Shevchenko)
> 
> v3:
>   - Fix variable declaration style (Andy Shevchenko)
>   - Add BugLink tag (Andy Shevchenko)
>   - CC AMD engineers (Andy Shevchenko)
> 
> v2:
>   - Replace custom HID/UID lookup with acpi_dev_get_first_match_dev()
>   - Use device_is_bound() under device_lock() with explanatory comments
>   - Add Assisted-by tags per coding-assistants.rst
> 
> Kernel bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=221494
> Related: https://bugzilla.kernel.org/show_bug.cgi?id=221454
> 
> Hardik Prakash (2):
>    Revert "pinctrl-amd: enable IRQ for WACF2200 touchscreen on Lenovo
>      Yoga 7 14AGP11"
>    i2c: designware: defer probe if child GpioInt controllers are not
>      bound
> 
>   drivers/i2c/busses/i2c-designware-platdrv.c | 156 ++++++++++++++++++++
>   drivers/pinctrl/pinctrl-amd.c               |  35 -----
>   2 files changed, 156 insertions(+), 35 deletions(-)
> 
> base-commit: 8fde5d1d47f6

I've left some tags on your series, no need to resend for them though if 
no other feedback.

They should be able to be picked up by the maintainers with b4.

Re: [PATCH v8 0/2] i2c: designware: fix WACF2200 touchscreen probe ordering

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 1170 bytes --]

On Fri, May 29, 2026 at 03:38:35PM +0530, Hardik Prakash wrote:
> This series fixes the non-functional WACF2200 touchscreen on Lenovo
> Yoga 7 14AGP11 by:
> 
> 1. Reverting the earlier DMI-specific GPIO IRQ quirk (patch 1 of the
>    original series, already in Torvalds' tree) which is no longer
>    needed.
> 
> 2. Adding a generic probe deferral in i2c-designware that walks ACPI
>    child devices, finds GpioInt resources, and defers probe until the
>    referenced GPIO controllers are fully bound.
> 
> Testing confirms patch 2 alone is sufficient — the existing
> amd_gpio_irq_enable() flow works correctly once probe ordering is
> fixed, making the manual IRQ restoration in the reverted patch
> unnecessary.
> 
> The probe ordering race was confirmed via dynamic debug tracing:
> 
>   0.285952  amd_gpio_probe: registering gpiochip  <- GPIO chip visible
>   0.287121  amd_gpio_probe: requesting parent IRQ <- probe still running
>   0.301454  AMDI0010:02 dw_i2c_plat_probe: start  <- races here
>   2.348157  lost arbitration
> 
> Tested on Lenovo Yoga 7 14AGP11 (83TD), Fedora 44, kernel 7.1.0-rc5+.

Shall this go in via i2c?


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v8 2/2] i2c: designware: defer probe if child GpioInt controllers are not bound

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 2388 bytes --]

On Fri, May 29, 2026 at 12:12:31PM +0200, Mario Limonciello wrote:
> 
> 
> On 5/29/26 12:08, Hardik Prakash wrote:
> > I2C controllers may have child devices with GpioInt resources that
> > depend on GPIO controllers to be fully initialized. If the I2C
> > controller probes and enumerates children before the referenced GPIO
> > controller has completed probe, GPIO interrupts may not be properly
> > configured, leading to device failures.
> > 
> > On Lenovo Yoga 7 14AGP11, the WACF2200 touchscreen (child of
> > AMDI0010:02) has a GpioInt resource pointing to GPIO 157 on the
> > pinctrl-amd controller (AMDI0030:00). When i2c-designware probes
> > AMDI0010:02 before pinctrl-amd finishes initializing, I2C transactions
> > occur before the GPIO IRQ quirk in amd_gpio_probe() has run, causing:
> > 
> >    i2c_designware AMDI0010:02: i2c_dw_handle_tx_abort: lost arbitration
> > 
> > Add a generic dependency check in i2c-designware that walks ACPI child
> > devices, identifies any GpioInt resources, resolves the referenced GPIO
> > controllers, and defers probe if those controllers are not yet bound.
> > 
> > This ensures GPIO controllers complete initialization (including IRQ
> > setup and quirks) before I2C child enumeration begins, fixing the race
> > without device-specific quirks or DMI matching.
> > 
> > The probe ordering race was confirmed via dynamic debug tracing:
> > 
> >    0.285952  amd_gpio_probe: registering gpiochip  <- GPIO chip visible
> >    0.287121  amd_gpio_probe: requesting parent IRQ <- probe still running
> >    0.301454  AMDI0010:02 dw_i2c_plat_probe: start  <- races here
> >    2.348157  lost arbitration
> > 
> > Suggested-by: Mario Limonciello <mario.limonciello@amd.com>
> > Signed-off-by: Hardik Prakash <hardikprakash.official@gmail.com>
> > Acked-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
> > Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
> > Assisted-by: Claude:claude-sonnet-4-6
> > Assisted-by: GPT-Codex:gpt-5.2-codex
> > Reported-by: kernel test robot <lkp@intel.com>
> > Closes: https://lore.kernel.org/oe-kbuild-all/202605240959.Kcf1lIg4-lkp@intel.com/
> > Link: https://bugzilla.kernel.org/show_bug.cgi?id=221494
> 
> Fixes: 3812a9e84265a ("pinctrl-amd: enable IRQ for WACF2200 touchscreen on
> Lenovo Yoga 7 14AGP11")

No Rev-by from you, Mario?


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v8 2/2] i2c: designware: defer probe if child GpioInt controllers are not bound

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 2220 bytes --]

On Fri, May 29, 2026 at 03:38:37PM +0530, Hardik Prakash wrote:
> I2C controllers may have child devices with GpioInt resources that
> depend on GPIO controllers to be fully initialized. If the I2C
> controller probes and enumerates children before the referenced GPIO
> controller has completed probe, GPIO interrupts may not be properly
> configured, leading to device failures.
> 
> On Lenovo Yoga 7 14AGP11, the WACF2200 touchscreen (child of
> AMDI0010:02) has a GpioInt resource pointing to GPIO 157 on the
> pinctrl-amd controller (AMDI0030:00). When i2c-designware probes
> AMDI0010:02 before pinctrl-amd finishes initializing, I2C transactions
> occur before the GPIO IRQ quirk in amd_gpio_probe() has run, causing:
> 
>   i2c_designware AMDI0010:02: i2c_dw_handle_tx_abort: lost arbitration
> 
> Add a generic dependency check in i2c-designware that walks ACPI child
> devices, identifies any GpioInt resources, resolves the referenced GPIO
> controllers, and defers probe if those controllers are not yet bound.
> 
> This ensures GPIO controllers complete initialization (including IRQ
> setup and quirks) before I2C child enumeration begins, fixing the race
> without device-specific quirks or DMI matching.
> 
> The probe ordering race was confirmed via dynamic debug tracing:
> 
>   0.285952  amd_gpio_probe: registering gpiochip  <- GPIO chip visible
>   0.287121  amd_gpio_probe: requesting parent IRQ <- probe still running
>   0.301454  AMDI0010:02 dw_i2c_plat_probe: start  <- races here
>   2.348157  lost arbitration
> 
> Suggested-by: Mario Limonciello <mario.limonciello@amd.com>
> Signed-off-by: Hardik Prakash <hardikprakash.official@gmail.com>
> Acked-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
> Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
> Assisted-by: Claude:claude-sonnet-4-6
> Assisted-by: GPT-Codex:gpt-5.2-codex
> Reported-by: kernel test robot <lkp@intel.com>
> Closes: https://lore.kernel.org/oe-kbuild-all/202605240959.Kcf1lIg4-lkp@intel.com/
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=221494

In case this goes in via some other tree:

Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v8 2/2] i2c: designware: defer probe if child GpioInt controllers are not bound

[Mario Limonciello]

On 5/29/26 16:42, Wolfram Sang wrote:
> On Fri, May 29, 2026 at 12:12:31PM +0200, Mario Limonciello wrote:
>>
>>
>> On 5/29/26 12:08, Hardik Prakash wrote:
>>> I2C controllers may have child devices with GpioInt resources that
>>> depend on GPIO controllers to be fully initialized. If the I2C
>>> controller probes and enumerates children before the referenced GPIO
>>> controller has completed probe, GPIO interrupts may not be properly
>>> configured, leading to device failures.
>>>
>>> On Lenovo Yoga 7 14AGP11, the WACF2200 touchscreen (child of
>>> AMDI0010:02) has a GpioInt resource pointing to GPIO 157 on the
>>> pinctrl-amd controller (AMDI0030:00). When i2c-designware probes
>>> AMDI0010:02 before pinctrl-amd finishes initializing, I2C transactions
>>> occur before the GPIO IRQ quirk in amd_gpio_probe() has run, causing:
>>>
>>>     i2c_designware AMDI0010:02: i2c_dw_handle_tx_abort: lost arbitration
>>>
>>> Add a generic dependency check in i2c-designware that walks ACPI child
>>> devices, identifies any GpioInt resources, resolves the referenced GPIO
>>> controllers, and defers probe if those controllers are not yet bound.
>>>
>>> This ensures GPIO controllers complete initialization (including IRQ
>>> setup and quirks) before I2C child enumeration begins, fixing the race
>>> without device-specific quirks or DMI matching.
>>>
>>> The probe ordering race was confirmed via dynamic debug tracing:
>>>
>>>     0.285952  amd_gpio_probe: registering gpiochip  <- GPIO chip visible
>>>     0.287121  amd_gpio_probe: requesting parent IRQ <- probe still running
>>>     0.301454  AMDI0010:02 dw_i2c_plat_probe: start  <- races here
>>>     2.348157  lost arbitration
>>>
>>> Suggested-by: Mario Limonciello <mario.limonciello@amd.com>
>>> Signed-off-by: Hardik Prakash <hardikprakash.official@gmail.com>
>>> Acked-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
>>> Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>
>>> Assisted-by: Claude:claude-sonnet-4-6
>>> Assisted-by: GPT-Codex:gpt-5.2-codex
>>> Reported-by: kernel test robot <lkp@intel.com>
>>> Closes: https://lore.kernel.org/oe-kbuild-all/202605240959.Kcf1lIg4-lkp@intel.com/
>>> Link: https://bugzilla.kernel.org/show_bug.cgi?id=221494
>>
>> Fixes: 3812a9e84265a ("pinctrl-amd: enable IRQ for WACF2200 touchscreen on
>> Lenovo Yoga 7 14AGP11")
> 
> No Rev-by from you, Mario?
> 

I added to the individual patches instead, all LGTM.

Re: [PATCH v8 1/2] Revert "pinctrl-amd: enable IRQ for WACF2200 touchscreen on Lenovo Yoga 7 14AGP11"

[Linus Walleij]

On Fri, May 29, 2026 at 12:09 PM Hardik Prakash
<hardikprakash.official@gmail.com> wrote:

> This reverts commit 3812a9e84265a5cdd90d29fe8d97a023e91fb945.
>
> The probe ordering fix in the following patch ensures amd_gpio_probe()
> completes before i2c-designware probes AMDI0010:02, allowing the
> existing amd_gpio_irq_enable() flow to work correctly. The manual IRQ
> restoration added by this patch is therefore no longer needed.
>
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=221494
> Signed-off-by: Hardik Prakash <hardikprakash.official@gmail.com>

Patch applied for fixes.

Yours,
Linus Walleij

Re: [PATCH v8 2/2] i2c: designware: defer probe if child GpioInt controllers are not bound

[Linus Walleij]

On Fri, May 29, 2026 at 4:43 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:

> In case this goes in via some other tree:
>
> Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>

I queued the revert in the pinctrl fixes, you can take this one (2/2).

Yours,
Linus Walleij

Re: [PATCH v8 2/2] i2c: designware: defer probe if child GpioInt controllers are not bound

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 288 bytes --]


> > In case this goes in via some other tree:
> >
> > Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> 
> I queued the revert in the pinctrl fixes, you can take this one (2/2).

Is there really no dependency on patch 1? I'd feel safer if you'd take
this as well...


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: [PATCH v8 2/2] i2c: designware: defer probe if child GpioInt controllers are not bound

[Linus Walleij]

On Fri, May 29, 2026 at 10:55 PM Wolfram Sang
<wsa+renesas@sang-engineering.com> wrote:
> > > In case this goes in via some other tree:
> > >
> > > Acked-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
> >
> > I queued the revert in the pinctrl fixes, you can take this one (2/2).
>
> Is there really no dependency on patch 1? I'd feel safer if you'd take
> this as well...

OK then, you're right. Let's keep it together.

Patch applied!

Yours,
Linus Walleij

Re: [PATCH v8 2/2] i2c: designware: defer probe if child GpioInt controllers are not bound

[Wolfram Sang]

[-- Attachment #1: Type: text/plain, Size: 60 bytes --]


> OK then, you're right. Let's keep it together.

Thanks!


[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]