Re: [PATCH] ACPI: resource: revert "Remove "Zen" specific match and quirks"

Mario Limonciello
2023-08-06T17:14:08Z

On 8/6/23 10:14, Hans de Goede wrote:
> Commit a9c4a912b7dc ("ACPI: resource: Remove "Zen" specific match and
> quirks") is causing keyboard problems for quite a log of AMD based
> laptop users, leading to many bug reports.
>
> Revert this change for now, until we can come up with
> a better fix for the PS/2 IRQ trigger-type/polarity problems
> on some x86 laptops.

Reverting it is going to help a bunch of machines but cause regressions
for others. How do you prioritize which to fix when it comes to a
regression?

>
> Fixes: a9c4a912b7dc ("ACPI: resource: Remove "Zen" specific match and quirks")
> Link: https://bugzilla.redhat.com/show_bug.cgi?id=2229165
> Link: https://bugzilla.redhat.com/show_bug.cgi?id=2229317
> Link: https://bugzilla.kernel.org/show_bug.cgi?id=217726
> Cc: Mario Limonciello <mario.limonciello@amd.com>
> Cc: Linux regressions mailing list <regressions@lists.linux.dev>
> Cc: stable@vger.kernel.org
> Signed-off-by: Hans de Goede <hdegoede@redhat.com>
> ---
> drivers/acpi/resource.c | 60 +++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 60 insertions(+)
>
> diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
> index 1dd8d5aebf67..0800a9d77558 100644
> --- a/drivers/acpi/resource.c
> +++ b/drivers/acpi/resource.c
> @@ -470,6 +470,52 @@ static const struct dmi_system_id asus_laptop[] = {
> { }
> };
>
> +static const struct dmi_system_id lenovo_laptop[] = {
> + {
> + .ident = "LENOVO IdeaPad Flex 5 14ALC7",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "82R9"),
> + },
> + },
> + {
> + .ident = "LENOVO IdeaPad Flex 5 16ALC7",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "82RA"),
> + },
> + },
> + { }
> +};
> +
> +static const struct dmi_system_id tongfang_gm_rg[] = {
> + {
> + .ident = "TongFang GMxRGxx/XMG CORE 15 (M22)/TUXEDO Stellaris 15 Gen4 AMD",
> + .matches = {
> + DMI_MATCH(DMI_BOARD_NAME, "GMxRGxx"),
> + },
> + },
> + { }
> +};
> +
> +static const struct dmi_system_id maingear_laptop[] = {
> + {
> + .ident = "MAINGEAR Vector Pro 2 15",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "Micro Electronics Inc"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "MG-VCP2-15A3070T"),
> + }
> + },
> + {
> + .ident = "MAINGEAR Vector Pro 2 17",
> + .matches = {
> + DMI_MATCH(DMI_SYS_VENDOR, "Micro Electronics Inc"),
> + DMI_MATCH(DMI_PRODUCT_NAME, "MG-VCP2-17A3070T"),
> + },
> + },
> + { }
> +};
> +
> static const struct dmi_system_id lg_laptop[] = {
> {
> .ident = "LG Electronics 17U70P",
> @@ -493,6 +539,10 @@ struct irq_override_cmp {
> static const struct irq_override_cmp override_table[] = {
> { medion_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, false },
> { asus_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, false },
> + { lenovo_laptop, 6, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, true },
> + { lenovo_laptop, 10, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, true },
> + { tongfang_gm_rg, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1, true },
> + { maingear_laptop, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1, true },
> { lg_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, false },
> };
>
> @@ -512,6 +562,16 @@ static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity,
> return entry->override;
> }
>
> +#ifdef CONFIG_X86
> + /*
> + * IRQ override isn't needed on modern AMD Zen systems and
> + * this override breaks active low IRQs on AMD Ryzen 6000 and
> + * newer systems. Skip it.
> + */
> + if (boot_cpu_has(X86_FEATURE_ZEN))
> + return false;
> +#endif
> +
> return true;
> }
>