diff mbox series

[v3] ACPI: resource: Remove "Zen" specific match and quirks

Message ID 20230601221151.670-1-mario.limonciello@amd.com
State New
Headers
Series [v3] ACPI: resource: Remove "Zen" specific match and quirks |

Commit Message

Mario Limonciello June 1, 2023, 10:11 p.m. UTC 
  commit 9946e39fe8d0 ("ACPI: resource: skip IRQ override on
AMD Zen platforms") attempted to overhaul the override logic so it
didn't apply on X86 AMD Zen systems.  This was intentional so that
systems would prefer DSDT values instead of default MADT value for
IRQ 1 on Ryzen 6000 systems which typically uses ActiveLow for IRQ1.

This turned out to be a bad assumption because several vendors
add Interrupt Source Override but don't fix the DSDT. A pile of
quirks was collecting that proved this wasn't sustaintable.

Furthermore some vendors have used ActiveHigh for IRQ1.
To solve this problem revert the following commits:
* commit 17bb7046e7ce ("ACPI: resource: Do IRQ override on all TongFang
GMxRGxx")
* commit f3cb9b740869 ("ACPI: resource: do IRQ override on Lenovo 14ALC7")
* commit bfcdf58380b1 ("ACPI: resource: do IRQ override on LENOVO IdeaPad")
* commit 7592b79ba4a9 ("ACPI: resource: do IRQ override on XMG Core 15")
* commit 9946e39fe8d0 ("ACPI: resource: skip IRQ override on AMD Zen
platforms")

Cc: ofenfisch@googlemail.com
Cc: wse@tuxedocomputers.com
Cc: adam.niederer@gmail.com
Cc: adrian@freund.io
Cc: jirislaby@kernel.org
Cc: Renjith.Pananchikkal@amd.com
Cc: anson.tsao@amd.com
Cc: Richard.Gong@amd.com
Cc: Chuanhong Guo <gch981213@gmail.com>
Reported-by: evilsnoo@proton.me
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217394
Reported-by: ruinairas1992@gmail.com
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217406
Reported-by: nmschulte@gmail.com
Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217336
Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
---
v2->v3:
 * Adjust to drop heuristics entirely
 * Drop tested tags
 * Add more links and people to Cc
 * Drop Fixes tag as this got a lot more risky
v1->v2:
 * Rebase on 71a485624c4c ("ACPI: resource: Add IRQ override quirk for LG UltraPC 17U70P")
 * Pick up tag

Rafael,
Please hold off on picking this up until the majority of those on CC
have tested it on hardware they have and reported results.

Everyone else,
Please test. If you have problems with this applied, please share
an acpidump and dmesg either on a bug or to me privately.
---
 drivers/acpi/resource.c | 60 -----------------------------------------
 1 file changed, 60 deletions(-)

Comments

Werner Sembach June 2, 2023, 3:34 p.m. UTC | #1 
Works for TongFang GMxRGxx/XMG CORE 15 (M22)/TUXEDO Stellaris 15 Gen4 AMD

Tested-by: Werner Sembach <wse@tuxedocomputers.com>

Am 02.06.23 um 00:11 schrieb Mario Limonciello:
> commit 9946e39fe8d0 ("ACPI: resource: skip IRQ override on
> AMD Zen platforms") attempted to overhaul the override logic so it
> didn't apply on X86 AMD Zen systems.  This was intentional so that
> systems would prefer DSDT values instead of default MADT value for
> IRQ 1 on Ryzen 6000 systems which typically uses ActiveLow for IRQ1.
>
> This turned out to be a bad assumption because several vendors
> add Interrupt Source Override but don't fix the DSDT. A pile of
> quirks was collecting that proved this wasn't sustaintable.
>
> Furthermore some vendors have used ActiveHigh for IRQ1.
> To solve this problem revert the following commits:
> * commit 17bb7046e7ce ("ACPI: resource: Do IRQ override on all TongFang
> GMxRGxx")
> * commit f3cb9b740869 ("ACPI: resource: do IRQ override on Lenovo 14ALC7")
> * commit bfcdf58380b1 ("ACPI: resource: do IRQ override on LENOVO IdeaPad")
> * commit 7592b79ba4a9 ("ACPI: resource: do IRQ override on XMG Core 15")
> * commit 9946e39fe8d0 ("ACPI: resource: skip IRQ override on AMD Zen
> platforms")
>
> Cc: ofenfisch@googlemail.com
> Cc: wse@tuxedocomputers.com
> Cc: adam.niederer@gmail.com
> Cc: adrian@freund.io
> Cc: jirislaby@kernel.org
> Cc: Renjith.Pananchikkal@amd.com
> Cc: anson.tsao@amd.com
> Cc: Richard.Gong@amd.com
> Cc: Chuanhong Guo <gch981213@gmail.com>
> Reported-by: evilsnoo@proton.me
> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217394
> Reported-by: ruinairas1992@gmail.com
> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217406
> Reported-by: nmschulte@gmail.com
> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217336
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> ---
> v2->v3:
>   * Adjust to drop heuristics entirely
>   * Drop tested tags
>   * Add more links and people to Cc
>   * Drop Fixes tag as this got a lot more risky
> v1->v2:
>   * Rebase on 71a485624c4c ("ACPI: resource: Add IRQ override quirk for LG UltraPC 17U70P")
>   * Pick up tag
>
> Rafael,
> Please hold off on picking this up until the majority of those on CC
> have tested it on hardware they have and reported results.
>
> Everyone else,
> Please test. If you have problems with this applied, please share
> an acpidump and dmesg either on a bug or to me privately.
> ---
>   drivers/acpi/resource.c | 60 -----------------------------------------
>   1 file changed, 60 deletions(-)
>
> diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
> index 0800a9d77558..1dd8d5aebf67 100644
> --- a/drivers/acpi/resource.c
> +++ b/drivers/acpi/resource.c
> @@ -470,52 +470,6 @@ 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",
> @@ -539,10 +493,6 @@ 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 },
>   };
>   
> @@ -562,16 +512,6 @@ 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;
>   }
>
Nathan Schulte June 3, 2023, 9:54 a.m. UTC | #2 
This seems to work as well for the ASUS TUF Gaming A16 Advantage
Edition FA617XT; both Linux 6.3 and 6.4.  Disabling the ITE5570 EC
[I/O] is required for a "truly" functional experience, of course.

On Thu, Jun 1, 2023 at 5:12 PM Mario Limonciello
<mario.limonciello@amd.com> wrote:
>
> commit 9946e39fe8d0 ("ACPI: resource: skip IRQ override on
> AMD Zen platforms") attempted to overhaul the override logic so it
> didn't apply on X86 AMD Zen systems.  This was intentional so that
> systems would prefer DSDT values instead of default MADT value for
> IRQ 1 on Ryzen 6000 systems which typically uses ActiveLow for IRQ1.
>
> This turned out to be a bad assumption because several vendors
> add Interrupt Source Override but don't fix the DSDT. A pile of
> quirks was collecting that proved this wasn't sustaintable.
>
> Furthermore some vendors have used ActiveHigh for IRQ1.
> To solve this problem revert the following commits:
> * commit 17bb7046e7ce ("ACPI: resource: Do IRQ override on all TongFang
> GMxRGxx")
> * commit f3cb9b740869 ("ACPI: resource: do IRQ override on Lenovo 14ALC7")
> * commit bfcdf58380b1 ("ACPI: resource: do IRQ override on LENOVO IdeaPad")
> * commit 7592b79ba4a9 ("ACPI: resource: do IRQ override on XMG Core 15")
> * commit 9946e39fe8d0 ("ACPI: resource: skip IRQ override on AMD Zen
> platforms")
>
> Cc: ofenfisch@googlemail.com
> Cc: wse@tuxedocomputers.com
> Cc: adam.niederer@gmail.com
> Cc: adrian@freund.io
> Cc: jirislaby@kernel.org
> Cc: Renjith.Pananchikkal@amd.com
> Cc: anson.tsao@amd.com
> Cc: Richard.Gong@amd.com
> Cc: Chuanhong Guo <gch981213@gmail.com>
> Reported-by: evilsnoo@proton.me
> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217394
> Reported-by: ruinairas1992@gmail.com
> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217406
> Reported-by: nmschulte@gmail.com
> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217336
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> ---
> v2->v3:
>  * Adjust to drop heuristics entirely
>  * Drop tested tags
>  * Add more links and people to Cc
>  * Drop Fixes tag as this got a lot more risky
> v1->v2:
>  * Rebase on 71a485624c4c ("ACPI: resource: Add IRQ override quirk for LG UltraPC 17U70P")
>  * Pick up tag
>
> Rafael,
> Please hold off on picking this up until the majority of those on CC
> have tested it on hardware they have and reported results.
>
> Everyone else,
> Please test. If you have problems with this applied, please share
> an acpidump and dmesg either on a bug or to me privately.
> ---
>  drivers/acpi/resource.c | 60 -----------------------------------------
>  1 file changed, 60 deletions(-)
>
> diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
> index 0800a9d77558..1dd8d5aebf67 100644
> --- a/drivers/acpi/resource.c
> +++ b/drivers/acpi/resource.c
> @@ -470,52 +470,6 @@ 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",
> @@ -539,10 +493,6 @@ 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 },
>  };
>
> @@ -562,16 +512,6 @@ 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;
>  }
>
> --
> 2.34.1
>
Chuanhong Guo June 3, 2023, 10:19 a.m. UTC | #3 
Hi!

On Fri, Jun 2, 2023 at 6:12 AM Mario Limonciello
<mario.limonciello@amd.com> wrote:
>
> commit 9946e39fe8d0 ("ACPI: resource: skip IRQ override on
> AMD Zen platforms") attempted to overhaul the override logic so it
> didn't apply on X86 AMD Zen systems.  This was intentional so that
> systems would prefer DSDT values instead of default MADT value for
> IRQ 1 on Ryzen 6000 systems which typically uses ActiveLow for IRQ1.
>
> This turned out to be a bad assumption because several vendors
> add Interrupt Source Override but don't fix the DSDT. A pile of
> quirks was collecting that proved this wasn't sustaintable.
>
> Furthermore some vendors have used ActiveHigh for IRQ1.
> To solve this problem revert the following commits:
> * commit 17bb7046e7ce ("ACPI: resource: Do IRQ override on all TongFang
> GMxRGxx")
> * commit f3cb9b740869 ("ACPI: resource: do IRQ override on Lenovo 14ALC7")
> * commit bfcdf58380b1 ("ACPI: resource: do IRQ override on LENOVO IdeaPad")
> * commit 7592b79ba4a9 ("ACPI: resource: do IRQ override on XMG Core 15")
> * commit 9946e39fe8d0 ("ACPI: resource: skip IRQ override on AMD Zen
> platforms")
>
> Cc: ofenfisch@googlemail.com
> Cc: wse@tuxedocomputers.com
> Cc: adam.niederer@gmail.com
> Cc: adrian@freund.io
> Cc: jirislaby@kernel.org
> Cc: Renjith.Pananchikkal@amd.com
> Cc: anson.tsao@amd.com
> Cc: Richard.Gong@amd.com
> Cc: Chuanhong Guo <gch981213@gmail.com>
> Reported-by: evilsnoo@proton.me
> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217394
> Reported-by: ruinairas1992@gmail.com
> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217406
> Reported-by: nmschulte@gmail.com
> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217336
> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> ---
> v2->v3:
>  * Adjust to drop heuristics entirely
>  * Drop tested tags
>  * Add more links and people to Cc
>  * Drop Fixes tag as this got a lot more risky
> v1->v2:
>  * Rebase on 71a485624c4c ("ACPI: resource: Add IRQ override quirk for LG UltraPC 17U70P")
>  * Pick up tag
>
> Rafael,
> Please hold off on picking this up until the majority of those on CC
> have tested it on hardware they have and reported results.
>
> Everyone else,
> Please test. If you have problems with this applied, please share
> an acpidump and dmesg either on a bug or to me privately.

I was expecting this patch to break my keyboard again but
that didn't happen. I'm on the latest UEFI from Lenovo.
By dumping ACPI APIC I found that there's this:

[0C4h 0196   1]                Subtable Type : 02 [Interrupt Source Override]
[0C5h 0197   1]                       Length : 0A
[0C6h 0198   1]                          Bus : 00
[0C7h 0199   1]                       Source : 01
[0C8h 0200   4]                    Interrupt : 00000001
[0CCh 0204   2]        Flags (decoded below) : 0007
                                    Polarity : 3
                                Trigger Mode : 1

I don't have a dump of the ACPI table from older UEFIs anymore.

Tested on Lenovo Thinkbook 14G4+ ARA with the latest
UEFI (J6CN45WW).

Tested-by: Chuanhong Guo <gch981213@gmail.com>
Mario Limonciello June 5, 2023, 2:46 p.m. UTC | #4 
On 6/3/2023 5:19 AM, Chuanhong Guo wrote:
> Hi!
>
> On Fri, Jun 2, 2023 at 6:12 AM Mario Limonciello
> <mario.limonciello@amd.com> wrote:
>> commit 9946e39fe8d0 ("ACPI: resource: skip IRQ override on
>> AMD Zen platforms") attempted to overhaul the override logic so it
>> didn't apply on X86 AMD Zen systems.  This was intentional so that
>> systems would prefer DSDT values instead of default MADT value for
>> IRQ 1 on Ryzen 6000 systems which typically uses ActiveLow for IRQ1.
>>
>> This turned out to be a bad assumption because several vendors
>> add Interrupt Source Override but don't fix the DSDT. A pile of
>> quirks was collecting that proved this wasn't sustaintable.
>>
>> Furthermore some vendors have used ActiveHigh for IRQ1.
>> To solve this problem revert the following commits:
>> * commit 17bb7046e7ce ("ACPI: resource: Do IRQ override on all TongFang
>> GMxRGxx")
>> * commit f3cb9b740869 ("ACPI: resource: do IRQ override on Lenovo 14ALC7")
>> * commit bfcdf58380b1 ("ACPI: resource: do IRQ override on LENOVO IdeaPad")
>> * commit 7592b79ba4a9 ("ACPI: resource: do IRQ override on XMG Core 15")
>> * commit 9946e39fe8d0 ("ACPI: resource: skip IRQ override on AMD Zen
>> platforms")
>>
>> Cc: ofenfisch@googlemail.com
>> Cc: wse@tuxedocomputers.com
>> Cc: adam.niederer@gmail.com
>> Cc: adrian@freund.io
>> Cc: jirislaby@kernel.org
>> Cc: Renjith.Pananchikkal@amd.com
>> Cc: anson.tsao@amd.com
>> Cc: Richard.Gong@amd.com
>> Cc: Chuanhong Guo <gch981213@gmail.com>
>> Reported-by: evilsnoo@proton.me
>> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217394
>> Reported-by: ruinairas1992@gmail.com
>> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217406
>> Reported-by: nmschulte@gmail.com
>> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217336
>> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
>> ---
>> v2->v3:
>>   * Adjust to drop heuristics entirely
>>   * Drop tested tags
>>   * Add more links and people to Cc
>>   * Drop Fixes tag as this got a lot more risky
>> v1->v2:
>>   * Rebase on 71a485624c4c ("ACPI: resource: Add IRQ override quirk for LG UltraPC 17U70P")
>>   * Pick up tag
>>
>> Rafael,
>> Please hold off on picking this up until the majority of those on CC
>> have tested it on hardware they have and reported results.
>>
>> Everyone else,
>> Please test. If you have problems with this applied, please share
>> an acpidump and dmesg either on a bug or to me privately.
> I was expecting this patch to break my keyboard again but
> that didn't happen. I'm on the latest UEFI from Lenovo.
> By dumping ACPI APIC I found that there's this:
>
> [0C4h 0196   1]                Subtable Type : 02 [Interrupt Source Override]
> [0C5h 0197   1]                       Length : 0A
> [0C6h 0198   1]                          Bus : 00
> [0C7h 0199   1]                       Source : 01
> [0C8h 0200   4]                    Interrupt : 00000001
> [0CCh 0204   2]        Flags (decoded below) : 0007
>                                      Polarity : 3
>                                  Trigger Mode : 1
>
> I don't have a dump of the ACPI table from older UEFIs anymore.
>
> Tested on Lenovo Thinkbook 14G4+ ARA with the latest
> UEFI (J6CN45WW).
>
> Tested-by: Chuanhong Guo <gch981213@gmail.com>
Thanks!  Yours is the one I was most worried about.
Rafael J. Wysocki June 5, 2023, 5:21 p.m. UTC | #5 
On Mon, Jun 5, 2023 at 4:46 PM Limonciello, Mario
<mario.limonciello@amd.com> wrote:
>
>
> On 6/3/2023 5:19 AM, Chuanhong Guo wrote:
> > Hi!
> >
> > On Fri, Jun 2, 2023 at 6:12 AM Mario Limonciello
> > <mario.limonciello@amd.com> wrote:
> >> commit 9946e39fe8d0 ("ACPI: resource: skip IRQ override on
> >> AMD Zen platforms") attempted to overhaul the override logic so it
> >> didn't apply on X86 AMD Zen systems.  This was intentional so that
> >> systems would prefer DSDT values instead of default MADT value for
> >> IRQ 1 on Ryzen 6000 systems which typically uses ActiveLow for IRQ1.
> >>
> >> This turned out to be a bad assumption because several vendors
> >> add Interrupt Source Override but don't fix the DSDT. A pile of
> >> quirks was collecting that proved this wasn't sustaintable.
> >>
> >> Furthermore some vendors have used ActiveHigh for IRQ1.
> >> To solve this problem revert the following commits:
> >> * commit 17bb7046e7ce ("ACPI: resource: Do IRQ override on all TongFang
> >> GMxRGxx")
> >> * commit f3cb9b740869 ("ACPI: resource: do IRQ override on Lenovo 14ALC7")
> >> * commit bfcdf58380b1 ("ACPI: resource: do IRQ override on LENOVO IdeaPad")
> >> * commit 7592b79ba4a9 ("ACPI: resource: do IRQ override on XMG Core 15")
> >> * commit 9946e39fe8d0 ("ACPI: resource: skip IRQ override on AMD Zen
> >> platforms")
> >>
> >> Cc: ofenfisch@googlemail.com
> >> Cc: wse@tuxedocomputers.com
> >> Cc: adam.niederer@gmail.com
> >> Cc: adrian@freund.io
> >> Cc: jirislaby@kernel.org
> >> Cc: Renjith.Pananchikkal@amd.com
> >> Cc: anson.tsao@amd.com
> >> Cc: Richard.Gong@amd.com
> >> Cc: Chuanhong Guo <gch981213@gmail.com>
> >> Reported-by: evilsnoo@proton.me
> >> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217394
> >> Reported-by: ruinairas1992@gmail.com
> >> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217406
> >> Reported-by: nmschulte@gmail.com
> >> Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217336
> >> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com>
> >> ---
> >> v2->v3:
> >>   * Adjust to drop heuristics entirely
> >>   * Drop tested tags
> >>   * Add more links and people to Cc
> >>   * Drop Fixes tag as this got a lot more risky
> >> v1->v2:
> >>   * Rebase on 71a485624c4c ("ACPI: resource: Add IRQ override quirk for LG UltraPC 17U70P")
> >>   * Pick up tag
> >>
> >> Rafael,
> >> Please hold off on picking this up until the majority of those on CC
> >> have tested it on hardware they have and reported results.
> >>
> >> Everyone else,
> >> Please test. If you have problems with this applied, please share
> >> an acpidump and dmesg either on a bug or to me privately.
> > I was expecting this patch to break my keyboard again but
> > that didn't happen. I'm on the latest UEFI from Lenovo.
> > By dumping ACPI APIC I found that there's this:
> >
> > [0C4h 0196   1]                Subtable Type : 02 [Interrupt Source Override]
> > [0C5h 0197   1]                       Length : 0A
> > [0C6h 0198   1]                          Bus : 00
> > [0C7h 0199   1]                       Source : 01
> > [0C8h 0200   4]                    Interrupt : 00000001
> > [0CCh 0204   2]        Flags (decoded below) : 0007
> >                                      Polarity : 3
> >                                  Trigger Mode : 1
> >
> > I don't have a dump of the ACPI table from older UEFIs anymore.
> >
> > Tested on Lenovo Thinkbook 14G4+ ARA with the latest
> > UEFI (J6CN45WW).
> >
> > Tested-by: Chuanhong Guo <gch981213@gmail.com>
> Thanks!  Yours is the one I was most worried about.

I've applied the patch as 6.5 material, thanks!
diff mbox series

Patch

diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index 0800a9d77558..1dd8d5aebf67 100644
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -470,52 +470,6 @@  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",
@@ -539,10 +493,6 @@  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 },
 };
 
@@ -562,16 +512,6 @@  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;
 }