[PATCH 1/2] gpiolib: acpi: Add quirk for ASUS ProArt PX13

[PATCH 1/2] gpiolib: acpi: Add quirk for ASUS ProArt PX13

[Mario Limonciello (AMD)]

The ASUS ProArt PX13 has a spurious wakeup event from the touchpad
a few moments after entering hardware sleep.  This can be avoided
by preventing the touchpad from being a wake source.

Add to the wakeup ignore list.

Reported-by: Amit Chaudhari <amitchaudhari@mac.com>
Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4482
Tested-by: Amit Chaudhari <amitchaudhari@mac.com>
Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
---
 drivers/gpio/gpiolib-acpi-quirks.c | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/drivers/gpio/gpiolib-acpi-quirks.c b/drivers/gpio/gpiolib-acpi-quirks.c
index c13545dce3492..bfb04e67c4bc8 100644
--- a/drivers/gpio/gpiolib-acpi-quirks.c
+++ b/drivers/gpio/gpiolib-acpi-quirks.c
@@ -344,6 +344,20 @@ static const struct dmi_system_id gpiolib_acpi_quirks[] __initconst = {
 			.ignore_interrupt = "AMDI0030:00@8",
 		},
 	},
+	{
+		/*
+		 * Spurious wakeups from TP_ATTN# pin
+		 * Found in BIOS 5.35
+		 * https://gitlab.freedesktop.org/drm/amd/-/issues/4482
+		 */
+		.matches = {
+			DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."),
+			DMI_MATCH(DMI_PRODUCT_FAMILY, "ProArt PX13"),
+		},
+		.driver_data = &(struct acpi_gpiolib_dmi_quirk) {
+			.ignore_wake = "ASCP1A00:00@8",
+		},
+	},
 	{} /* Terminating entry */
 };
 
-- 
2.43.0

[PATCH 2/2] pinctrl: amd: Add PM debugging message for turning on/off wakes

[Mario Limonciello (AMD)]

The GPIOs for devices not in _AEI/_EVT such as touchpad or touchscreen
won't have wakeup turned on until the suspend sequence starts.

Due to code in amd_gpio_suspend_hibernate_common() masking the interrupt
can make this difficult to follow what's going on.  Add an explicit
debugging message to tell when that was turned on/off.

Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
---
 drivers/pinctrl/pinctrl-amd.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/drivers/pinctrl/pinctrl-amd.c b/drivers/pinctrl/pinctrl-amd.c
index 09a5425d54ba3..127eeb0104d85 100644
--- a/drivers/pinctrl/pinctrl-amd.c
+++ b/drivers/pinctrl/pinctrl-amd.c
@@ -448,6 +448,9 @@ static int amd_gpio_irq_set_wake(struct irq_data *d, unsigned int on)
 	u32 wake_mask = BIT(WAKE_CNTRL_OFF_S0I3) | BIT(WAKE_CNTRL_OFF_S3);
 	int err;
 
+	pm_pr_dbg("Setting wake for GPIO %lu to %s\n",
+		   d->hwirq, str_enable_disable(on));
+
 	raw_spin_lock_irqsave(&gpio_dev->lock, flags);
 	pin_reg = readl(gpio_dev->base + (d->hwirq)*4);
 
-- 
2.43.0

Re: [PATCH 1/2] gpiolib: acpi: Add quirk for ASUS ProArt PX13

[Mika Westerberg]

On Thu, Aug 14, 2025 at 01:34:29PM -0500, Mario Limonciello (AMD) wrote:
> The ASUS ProArt PX13 has a spurious wakeup event from the touchpad
> a few moments after entering hardware sleep.  This can be avoided
> by preventing the touchpad from being a wake source.
> 
> Add to the wakeup ignore list.
> 
> Reported-by: Amit Chaudhari <amitchaudhari@mac.com>
> Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4482
> Tested-by: Amit Chaudhari <amitchaudhari@mac.com>
> Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>

Reviewed-by: Mika Westerberg <mika.westerberg@linux.intel.com>

Re: [PATCH 1/2] gpiolib: acpi: Add quirk for ASUS ProArt PX13

[Linus Walleij]

On Thu, Aug 14, 2025 at 8:34 PM Mario Limonciello (AMD)
<superm1@kernel.org> wrote:

> The ASUS ProArt PX13 has a spurious wakeup event from the touchpad
> a few moments after entering hardware sleep.  This can be avoided
> by preventing the touchpad from being a wake source.
>
> Add to the wakeup ignore list.
>
> Reported-by: Amit Chaudhari <amitchaudhari@mac.com>
> Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4482
> Tested-by: Amit Chaudhari <amitchaudhari@mac.com>
> Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>

Bartosz is on vacation and this patch series is half-pinctrl so I applied this
and patch 2/2 for pin control fixes.

Yours,
Linus Walleij

Re: [PATCH 2/2] pinctrl: amd: Add PM debugging message for turning on/off wakes

[Andy Shevchenko]

On Thu, Aug 14, 2025 at 01:34:30PM -0500, Mario Limonciello (AMD) wrote:
> The GPIOs for devices not in _AEI/_EVT such as touchpad or touchscreen
> won't have wakeup turned on until the suspend sequence starts.
> 
> Due to code in amd_gpio_suspend_hibernate_common() masking the interrupt
> can make this difficult to follow what's going on.  Add an explicit
> debugging message to tell when that was turned on/off.

...

> +	pm_pr_dbg("Setting wake for GPIO %lu to %s\n",
> +		   d->hwirq, str_enable_disable(on));

Can you send a follow up to move from dereference to an API for hwirq?


-- 
With Best Regards,
Andy Shevchenko

Re: [PATCH 1/2] gpiolib: acpi: Add quirk for ASUS ProArt PX13

[Andy Shevchenko]

On Tue, Aug 19, 2025 at 02:16:28PM +0200, Linus Walleij wrote:
> On Thu, Aug 14, 2025 at 8:34 PM Mario Limonciello (AMD)
> <superm1@kernel.org> wrote:
> 
> > The ASUS ProArt PX13 has a spurious wakeup event from the touchpad
> > a few moments after entering hardware sleep.  This can be avoided
> > by preventing the touchpad from being a wake source.
> >
> > Add to the wakeup ignore list.
> >
> > Reported-by: Amit Chaudhari <amitchaudhari@mac.com>
> > Closes: https://gitlab.freedesktop.org/drm/amd/-/issues/4482
> > Tested-by: Amit Chaudhari <amitchaudhari@mac.com>
> > Signed-off-by: Mario Limonciello (AMD) <superm1@kernel.org>
> 
> Bartosz is on vacation and this patch series is half-pinctrl so I applied this
> and patch 2/2 for pin control fixes.

I also was on vacation and become to full speed next week. But series is fine,
just one nit-pick I commented on, it can be addressed in a separate followup.

-- 
With Best Regards,
Andy Shevchenko