From: kovalev@altlinux.org
To: stable@vger.kernel.org
Cc: rafael@kernel.org, lenb@kernel.org, pavel@ucw.cz,
hdegoede@redhat.com, linux-acpi@vger.kernel.org,
kovalev@altlinux.org
Subject: [PATCH 6.1.y 03/14] ACPI: resource: Always use MADT override IRQ settings for all legacy non i8042 IRQs
Date: Mon, 8 Apr 2024 13:31:56 +0300 [thread overview]
Message-ID: <20240408103207.197423-4-kovalev@altlinux.org> (raw)
In-Reply-To: <20240408103207.197423-1-kovalev@altlinux.org>
From: Hans de Goede <hdegoede@redhat.com>
commit 9728ac221160c5ea111879125a7694bb81364720 upstream.
All the cases, were the DSDT IRQ settings should be used instead of
the MADT override, are for IRQ 1 or 12, the PS/2 kbd resp. mouse IRQs.
Simplify things by always honering the override for other legacy IRQs
(for non DMI quirked cases).
This allows removing the DMI quirks to honor the override for
some non i8042 IRQs on some AMD ZEN based Lenovo models.
Fixes: a9c4a912b7dc ("ACPI: resource: Remove "Zen" specific match and quirks")
Cc: All applicable <stable@vger.kernel.org>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Vasiliy Kovalev <kovalev@altlinux.org>
---
drivers/acpi/resource.c | 28 ++++++++--------------------
1 file changed, 8 insertions(+), 20 deletions(-)
diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c
index 548fd63ed26927..2a3b8bf58b7ac4 100644
--- a/drivers/acpi/resource.c
+++ b/drivers/acpi/resource.c
@@ -484,24 +484,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",
@@ -605,8 +587,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 },
@@ -629,6 +609,14 @@ static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity,
}
#ifdef CONFIG_X86
+ /*
+ * Always use the MADT override info, except for the i8042 PS/2 ctrl
+ * IRQs (1 and 12). For these the DSDT IRQ settings should sometimes
+ * be used otherwise PS/2 keyboards / mice will not work.
+ */
+ if (gsi != 1 && gsi != 12)
+ return true;
+
/*
* IRQ override isn't needed on modern AMD Zen systems and
* this override breaks active low IRQs on AMD Ryzen 6000 and
--
2.33.8
next prev parent reply other threads:[~2024-04-08 10:32 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-08 10:31 [PATCH v6.1.y 0/14 ] ACPI: resource: Add IRQ override quirks (backport changes from v6.9-rc3) kovalev
2024-04-08 10:31 ` [PATCH 6.1.y 01/14] ACPI: resource: Skip IRQ override on Asus Expertbook B2402FBA kovalev
2024-04-08 10:31 ` [PATCH 6.1.y 02/14] ACPI: resource: Skip IRQ override on ASUS ExpertBook B1502CBA kovalev
2024-04-08 10:31 ` kovalev [this message]
2024-04-08 10:31 ` [PATCH 6.1.y 04/14] ACPI: resource: Honor MADT INT_SRC_OVR settings for IRQ1 on AMD Zen kovalev
2024-04-08 10:31 ` [PATCH 6.1.y 05/14] ACPI: resource: Add IRQ override quirk for PCSpecialist Elimina Pro 16 M kovalev
2024-04-08 10:31 ` [PATCH 6.1.y 06/14] ACPI: resource: Fix " kovalev
2024-04-08 10:32 ` [PATCH 6.1.y 07/14] ACPI: resource: Consolidate IRQ trigger-type override DMI tables kovalev
2024-04-08 10:32 ` [PATCH 6.1.y 08/14] ACPI: resource: Drop .ident values from dmi_system_id tables kovalev
2024-04-08 10:32 ` [PATCH 6.1.y 09/14] ACPI: resource: Add TongFang GM6BGEQ, GM6BG5Q and GM6BG0Q to irq1_edge_low_force_override[] kovalev
2024-04-08 10:32 ` [PATCH 6.1.y 10/14] ACPI: resource: Add DMI quirks for ASUS Vivobook E1504GA and E1504GAB kovalev
2024-04-08 10:32 ` [PATCH 6.1.y 11/14] ACPI: resource: Skip IRQ override on ASUS ExpertBook B1502CGA kovalev
2024-04-08 10:32 ` [PATCH 6.1.y 12/14] ACPI: resource: Skip IRQ override on ASUS ExpertBook B1502CVA kovalev
2024-04-08 10:32 ` [PATCH 6.1.y 13/14] ACPI: resource: Add IRQ override quirk for ASUS ExpertBook B2502FBA kovalev
2024-04-08 10:32 ` [PATCH 6.1.y 14/14] ACPI: resource: Use IRQ override on Maibenben X565 kovalev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20240408103207.197423-4-kovalev@altlinux.org \
--to=kovalev@altlinux.org \
--cc=hdegoede@redhat.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=pavel@ucw.cz \
--cc=rafael@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).