[PATCH v2] platform/x86/amd/pmc: Add Thinkpad L14 Gen3 (21C5) to quirk_s2idle_bug

[PATCH v2] platform/x86/amd/pmc: Add Thinkpad L14 Gen3 (21C5) to quirk_s2idle_bug

[Bruno BOI]

The Thinkpad L14 Gen3 with DMI product name 21C5 is affected by the same
s2idle resume stall as the already listed 21C6 variant: resuming from
s2idle blocks for several seconds before the kernel resumes.

DMI_MATCH() performs substring matching, so a "21C5" entry also covers
SKUs such as 21C5S05800. Add the 21C5 model to the existing
quirk_s2idle_bug table.

Closes: https://bugzilla.kernel.org/show_bug.cgi?id=222070
Link: https://bugzilla.kernel.org/show_bug.cgi?id=221273
Signed-off-by: Bruno BOI <bruno.boi@bobtopus.eu>
---
Changes in v2: resent with the correct sender address; the patch
content is unchanged from v1.
 drivers/platform/x86/amd/pmc/pmc-quirks.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/drivers/platform/x86/amd/pmc/pmc-quirks.c b/drivers/platform/x86/amd/pmc/pmc-quirks.c
index 74ddf1d..c3fabc9 100644
--- a/drivers/platform/x86/amd/pmc/pmc-quirks.c
+++ b/drivers/platform/x86/amd/pmc/pmc-quirks.c
@@ -246,6 +246,15 @@ static const struct dmi_system_id fwbug_list[] = {
 			DMI_MATCH(DMI_PRODUCT_NAME, "21C6"),
 		}
 	},
+	/* https://bugzilla.kernel.org/show_bug.cgi?id=221273 */
+	{
+		.ident = "Thinkpad L14 Gen3",
+		.driver_data = &quirk_s2idle_bug,
+		.matches = {
+			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
+			DMI_MATCH(DMI_PRODUCT_NAME, "21C5"),
+		}
+	},
 	/* https://gitlab.freedesktop.org/drm/amd/-/issues/4434 */
 	{
 		.ident = "Lenovo Yoga 6 13ALC6",
-- 
2.55.0

Re: [PATCH v2] platform/x86/amd/pmc: Add Thinkpad L14 Gen3 (21C5) to quirk_s2idle_bug

[Mario Limonciello]

On 9/28/26 11:06, Bruno BOI wrote:
> The Thinkpad L14 Gen3 with DMI product name 21C5 is affected by the same
> s2idle resume stall as the already listed 21C6 variant: resuming from
> s2idle blocks for several seconds before the kernel resumes.
> 
> DMI_MATCH() performs substring matching, so a "21C5" entry also covers
> SKUs such as 21C5S05800. Add the 21C5 model to the existing
> quirk_s2idle_bug table.
> 
> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=222070
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=221273
> Signed-off-by: Bruno BOI <bruno.boi@bobtopus.eu>
> ---
> Changes in v2: resent with the correct sender address; the patch
> content is unchanged from v1.
>   drivers/platform/x86/amd/pmc/pmc-quirks.c | 9 +++++++++
>   1 file changed, 9 insertions(+)

Mark,

Since it uses prefixes rather than a new entry how would you feel about:

DMI_MATCH(DMI_PRODUCT_NAME, "21C"),

On the 21C6 existing entry.
> 
> diff --git a/drivers/platform/x86/amd/pmc/pmc-quirks.c b/drivers/platform/x86/amd/pmc/pmc-quirks.c
> index 74ddf1d..c3fabc9 100644
> --- a/drivers/platform/x86/amd/pmc/pmc-quirks.c
> +++ b/drivers/platform/x86/amd/pmc/pmc-quirks.c
> @@ -246,6 +246,15 @@ static const struct dmi_system_id fwbug_list[] = {
>   			DMI_MATCH(DMI_PRODUCT_NAME, "21C6"),
>   		}
>   	},
> +	/* https://bugzilla.kernel.org/show_bug.cgi?id=221273 */
> +	{
> +		.ident = "Thinkpad L14 Gen3",
> +		.driver_data = &quirk_s2idle_bug,
> +		.matches = {
> +			DMI_MATCH(DMI_BOARD_VENDOR, "LENOVO"),
> +			DMI_MATCH(DMI_PRODUCT_NAME, "21C5"),
> +		}
> +	},
>   	/* https://gitlab.freedesktop.org/drm/amd/-/issues/4434 */
>   	{
>   		.ident = "Lenovo Yoga 6 13ALC6",

Re: [PATCH v2] platform/x86/amd/pmc: Add Thinkpad L14 Gen3 (21C5) to quirk_s2idle_bug

[Bruno BOI]

Hi Mario, Mark,

On 9/28/26 11:09, Mario Limonciello wrote:
> Mark,
>
> Since it uses prefixes rather than a new entry how would you feel about:
>
> DMI_MATCH(DMI_PRODUCT_NAME, "21C"),
>
> On the 21C6 existing entry.

Works for me — and it should be inert outside the AMD units: the "21C"
prefix also spans the Intel siblings of the L14/L15 Gen 3 family, but
amd_pmc never binds on those (no AMDI0005 ACPI node exposed by their
firmware), so the widened match can only ever fire on the AMD types
anyway.

Happy to resend as a modification of the existing entry if that's the
preferred shape.

For reference, the v2 as sent was tested on 21C5S05800, BIOS R1YET62W
(1.39), kernel 7.2.8: the 7-10 s resume stall is gone (kernel resume
in under 100 ms, A/B tested against the stock module on the same boot).

Regards,
Bruno

Re: [PATCH v2] platform/x86/amd/pmc: Add Thinkpad L14 Gen3 (21C5) to quirk_s2idle_bug

[Mark Pearson]

On Mon, Sep 28, 2026, at 12:09 PM, Mario Limonciello wrote:
> On 9/28/26 11:06, Bruno BOI wrote:
>> The Thinkpad L14 Gen3 with DMI product name 21C5 is affected by the same
>> s2idle resume stall as the already listed 21C6 variant: resuming from
>> s2idle blocks for several seconds before the kernel resumes.
>> 
>> DMI_MATCH() performs substring matching, so a "21C5" entry also covers
>> SKUs such as 21C5S05800. Add the 21C5 model to the existing
>> quirk_s2idle_bug table.
>> 
>> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=222070
>> Link: https://bugzilla.kernel.org/show_bug.cgi?id=221273
>> Signed-off-by: Bruno BOI <bruno.boi@bobtopus.eu>
>> ---
>> Changes in v2: resent with the correct sender address; the patch
>> content is unchanged from v1.
>>   drivers/platform/x86/amd/pmc/pmc-quirks.c | 9 +++++++++
>>   1 file changed, 9 insertions(+)
>
> Mark,
>
> Since it uses prefixes rather than a new entry how would you feel about:
>
> DMI_MATCH(DMI_PRODUCT_NAME, "21C"),
>
> On the 21C6 existing entry.

The last char covers a lot of platforms unfortunately

Ignoring the Intel platforms (I assume this driver wouldn't try and load on those - there are a bunch including a Chromebook if that makes any difference)

T14s Gen 3 AMD, X13 Gen 3 AMD, L14 Gen 3 AMD, L15 Gen 3 AMD, T14 Gen 3 AMD, T16 G1 AMD, P16s Gen 1 AMD, K14 AMD would all be impacted.

I probably have a bunch of these to be able to test - but not all (and definitely not the K14).

Adding 21C5 and 21C6 should cover all L14 G3 AMD models.

Mark

Re: [PATCH v2] platform/x86/amd/pmc: Add Thinkpad L14 Gen3 (21C5) to quirk_s2idle_bug

[Mario Limonciello]

On 9/28/26 11:53, Mark Pearson wrote:
> On Mon, Sep 28, 2026, at 12:09 PM, Mario Limonciello wrote:
>> On 9/28/26 11:06, Bruno BOI wrote:
>>> The Thinkpad L14 Gen3 with DMI product name 21C5 is affected by the same
>>> s2idle resume stall as the already listed 21C6 variant: resuming from
>>> s2idle blocks for several seconds before the kernel resumes.
>>>
>>> DMI_MATCH() performs substring matching, so a "21C5" entry also covers
>>> SKUs such as 21C5S05800. Add the 21C5 model to the existing
>>> quirk_s2idle_bug table.
>>>
>>> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=222070
>>> Link: https://bugzilla.kernel.org/show_bug.cgi?id=221273
>>> Signed-off-by: Bruno BOI <bruno.boi@bobtopus.eu>
>>> ---
>>> Changes in v2: resent with the correct sender address; the patch
>>> content is unchanged from v1.
>>>    drivers/platform/x86/amd/pmc/pmc-quirks.c | 9 +++++++++
>>>    1 file changed, 9 insertions(+)
>>
>> Mark,
>>
>> Since it uses prefixes rather than a new entry how would you feel about:
>>
>> DMI_MATCH(DMI_PRODUCT_NAME, "21C"),
>>
>> On the 21C6 existing entry.
> 
> The last char covers a lot of platforms unfortunately
> 
> Ignoring the Intel platforms (I assume this driver wouldn't try and load on those - there are a bunch including a Chromebook if that makes any difference)
> 
> T14s Gen 3 AMD, X13 Gen 3 AMD, L14 Gen 3 AMD, L15 Gen 3 AMD, T14 Gen 3 AMD, T16 G1 AMD, P16s Gen 1 AMD, K14 AMD would all be impacted.
> 
> I probably have a bunch of these to be able to test - but not all (and definitely not the K14).
> 
> Adding 21C5 and 21C6 should cover all L14 G3 AMD models.
> 
> Mark

Got it; thanks for confirming.  No concerns by me with the new quirk 
then either.

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

Re: [PATCH v2] platform/x86/amd/pmc: Add Thinkpad L14 Gen3 (21C5) to quirk_s2idle_bug

[Mark Pearson]

On Mon, Sep 28, 2026, at 12:54 PM, Mario Limonciello wrote:
> On 9/28/26 11:53, Mark Pearson wrote:
>> On Mon, Sep 28, 2026, at 12:09 PM, Mario Limonciello wrote:
>>> On 9/28/26 11:06, Bruno BOI wrote:
>>>> The Thinkpad L14 Gen3 with DMI product name 21C5 is affected by the same
>>>> s2idle resume stall as the already listed 21C6 variant: resuming from
>>>> s2idle blocks for several seconds before the kernel resumes.
>>>>
>>>> DMI_MATCH() performs substring matching, so a "21C5" entry also covers
>>>> SKUs such as 21C5S05800. Add the 21C5 model to the existing
>>>> quirk_s2idle_bug table.
>>>>
>>>> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=222070
>>>> Link: https://bugzilla.kernel.org/show_bug.cgi?id=221273
>>>> Signed-off-by: Bruno BOI <bruno.boi@bobtopus.eu>
>>>> ---
>>>> Changes in v2: resent with the correct sender address; the patch
>>>> content is unchanged from v1.
>>>>    drivers/platform/x86/amd/pmc/pmc-quirks.c | 9 +++++++++
>>>>    1 file changed, 9 insertions(+)
>>>
>>> Mark,
>>>
>>> Since it uses prefixes rather than a new entry how would you feel about:
>>>
>>> DMI_MATCH(DMI_PRODUCT_NAME, "21C"),
>>>
>>> On the 21C6 existing entry.
>> 
>> The last char covers a lot of platforms unfortunately
>> 
>> Ignoring the Intel platforms (I assume this driver wouldn't try and load on those - there are a bunch including a Chromebook if that makes any difference)
>> 
>> T14s Gen 3 AMD, X13 Gen 3 AMD, L14 Gen 3 AMD, L15 Gen 3 AMD, T14 Gen 3 AMD, T16 G1 AMD, P16s Gen 1 AMD, K14 AMD would all be impacted.
>> 
>> I probably have a bunch of these to be able to test - but not all (and definitely not the K14).
>> 
>> Adding 21C5 and 21C6 should cover all L14 G3 AMD models.
>> 
>> Mark
>
> Got it; thanks for confirming.  No concerns by me with the new quirk 
> then either.
>
> Reviewed-by: Mario Limonciello (AMD) <superm1@kernel.org>

I'll lob in a tag too.
Reviewed-by: Mark Pearson <mpearson-lenovo@squebb.ca>

Thanks Bruno

Mark