From patchwork Mon Apr 8 10:31:54 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasiliy Kovalev X-Patchwork-Id: 13620968 Received: from air.basealt.ru (air.basealt.ru [194.107.17.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6BD645810A; Mon, 8 Apr 2024 10:32:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.39 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572346; cv=none; b=ChxZYhSrg/rNd/gS0xNww5CHLDrnJ9eESHbbSdrRr0r99BGt5F1kcbc3qmsN81xtEaUDTGYX7bRusmXVyHNGyZ9RwwocZlVWmK95PhsK16oyCFb6ZqvfHyAxTqaR7YShmU736y8eL2iv9Kt5BCxbGAzJoBsMS9UG7IAikOh791g= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572346; c=relaxed/simple; bh=leV/hO1lT0ThkwVwzmco7siUwL9jreY0Hyp6cd76cp8=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=BeFIt+v7XKJgBboLYUMHdLsRrQxzOuLCiaZxfv6w6PdRXSvU6Ksa7wkQqEyJQtkIY+Q2wcT2O+vAYDdQKRfSoi95uu4HBYEKQvK3chyHlx1U5+bkYqOG6WlGIGUEnLStj/hVMRU5PdlyA1SG6NgnW+M24dzFbpGROoKGb171GIA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.39 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: by air.basealt.ru (Postfix, from userid 490) id D84BF2F2024E; Mon, 8 Apr 2024 10:32:23 +0000 (UTC) X-Spam-Level: Received: from altlinux.malta.altlinux.ru (obninsk.basealt.ru [217.15.195.17]) by air.basealt.ru (Postfix) with ESMTPSA id 732C42F2024C; Mon, 8 Apr 2024 10:32:09 +0000 (UTC) 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 01/14] ACPI: resource: Skip IRQ override on Asus Expertbook B2402FBA Date: Mon, 8 Apr 2024 13:31:54 +0300 Message-Id: <20240408103207.197423-2-kovalev@altlinux.org> X-Mailer: git-send-email 2.33.8 In-Reply-To: <20240408103207.197423-1-kovalev@altlinux.org> References: <20240408103207.197423-1-kovalev@altlinux.org> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Vojtech Hejsek commit 65eb2867f5bf46023ab42ba8347106870d961cf3 upstream. The Asus Expertbook B2502FBA has IRQ 1 described as Active_Low in its ACPI table. However, the kernel overrides this and sets it to Edge_High, which prevents the internal keyboard from working properly. Adding this laptop model to the override_table fixes the issue. Signed-off-by: Vojtech Hejsek Signed-off-by: Rafael J. Wysocki Signed-off-by: Vasiliy Kovalev --- drivers/acpi/resource.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index 1c5c1a269fbee4..2d3ed21c010fb8 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -460,6 +460,13 @@ static const struct dmi_system_id asus_laptop[] = { DMI_MATCH(DMI_BOARD_NAME, "B2402CBA"), }, }, + { + .ident = "Asus ExpertBook B2402FBA", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_BOARD_NAME, "B2402FBA"), + }, + }, { .ident = "Asus ExpertBook B2502", .matches = { From patchwork Mon Apr 8 10:31:55 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasiliy Kovalev X-Patchwork-Id: 13620966 Received: from air.basealt.ru (air.basealt.ru [194.107.17.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9210655E44; Mon, 8 Apr 2024 10:32:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.39 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572345; cv=none; b=NQmraYK6Zdl8FZk7v4/D+BuZajk4SC44eihaBQaJHm0bBiyb9aJC9vZbFHeTU8jRU45RgrGW6yloiU7/QKI4dSQ2h2NLWwVjiteVgAtk8vMUv9qW0Unr4VdffsTxlapzcJhdw1adAJzFskbzfBHD3/BgW8bmiA0mcPVNLH+RfAQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572345; c=relaxed/simple; bh=X+hMBt08Tze+49WFvWV70qzbOOi6S4gL6Dreppyl/TA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=l+FIMixRaMDjf2Q5jXOJPymlWDiCVzkHbFPjjmU/oLNLZgIzXVSDWPK81l5EP7R3p7WADh66hiMMPDWLoHgxzR3ae8CRbgs/Y9ZDFOsYIZjbnww+MReR4or+zo/lqk8vcPEax/xYX+k0eIwwkoKSEB3N3P+mxptnsTHJjtuALxk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.39 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: by air.basealt.ru (Postfix, from userid 490) id 08B272F20250; Mon, 8 Apr 2024 10:32:22 +0000 (UTC) X-Spam-Level: Received: from altlinux.malta.altlinux.ru (obninsk.basealt.ru [217.15.195.17]) by air.basealt.ru (Postfix) with ESMTPSA id 830F12F20252; Mon, 8 Apr 2024 10:32:09 +0000 (UTC) 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 02/14] ACPI: resource: Skip IRQ override on ASUS ExpertBook B1502CBA Date: Mon, 8 Apr 2024 13:31:55 +0300 Message-Id: <20240408103207.197423-3-kovalev@altlinux.org> X-Mailer: git-send-email 2.33.8 In-Reply-To: <20240408103207.197423-1-kovalev@altlinux.org> References: <20240408103207.197423-1-kovalev@altlinux.org> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Paul Menzel commit 05cda427126f30ce3fc8ffd82fd6f5196398d502 upstream. Like the ASUS ExpertBook B2502CBA and various ASUS Vivobook laptops, the ASUS ExpertBook B1502CBA has an ACPI DSDT table that describes IRQ 1 as ActiveLow while the kernel overrides it to Edge_High. $ sudo dmesg | grep DMI DMI: ASUSTeK COMPUTER INC. ASUS EXPERTBOOK B1502CBA_B1502CBA/B1502CBA, BIOS B1502CBA.300 01/18/2023 $ grep -A 40 PS2K dsdt.dsl | grep IRQ -A 1 IRQ (Level, ActiveLow, Exclusive, ) {1} This prevents the keyboard from working. To fix this issue, add this laptop to the skip_override_table so that the kernel does not override IRQ 1. Link: https://bugzilla.kernel.org/show_bug.cgi?id=217323 Signed-off-by: Paul Menzel Signed-off-by: Rafael J. Wysocki Signed-off-by: Vasiliy Kovalev --- drivers/acpi/resource.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index 2d3ed21c010fb8..548fd63ed26927 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -453,6 +453,13 @@ static const struct dmi_system_id asus_laptop[] = { DMI_MATCH(DMI_BOARD_NAME, "B1402CVA"), }, }, + { + .ident = "Asus ExpertBook B1502CBA", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_BOARD_NAME, "B1502CBA"), + }, + }, { .ident = "Asus ExpertBook B2402CBA", .matches = { From patchwork Mon Apr 8 10:31:56 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasiliy Kovalev X-Patchwork-Id: 13620965 Received: from air.basealt.ru (air.basealt.ru [194.107.17.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 6968555C07; Mon, 8 Apr 2024 10:32:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.39 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572343; cv=none; b=DjXQX0phgEG0GWOYGCMKqbfeh/bYCpgQ5sqzBUPFJCq3UMHyIFx1MvF/UOnG7KRlRvO5fqk928gj1vMgmE8igPh9Xojtx1mVslS/kTokZvAhX5t4j/Cu1wLqlw+XpqoaztePD0s0VXeFRqHmpTiNWgHzEOQ5heMSrBNq4rhQWcw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572343; c=relaxed/simple; bh=yoTDhlWQfE6S6gLckI5sPJKv73dejU/mHkcxeFKARsY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=dSzvN5ZpvomtUL+Zqf/eGPfYyHVSfuU8ZiwQVx7Lm+3Nmc3hxufk0YDByIDo0MW+LFfMgvin+Z386Xy36a/WPie0It6k8PvQyVoQZIBqD8RBP8+XfW84ioWy6yaKlCPPcAGy3HlwehFHMMd2kLlVr3EFXD20Q8bDqtHV6Pwdkh0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.39 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: by air.basealt.ru (Postfix, from userid 490) id ED0082F2024A; Mon, 8 Apr 2024 10:32:20 +0000 (UTC) X-Spam-Level: Received: from altlinux.malta.altlinux.ru (obninsk.basealt.ru [217.15.195.17]) by air.basealt.ru (Postfix) with ESMTPSA id 94EDD2F20253; Mon, 8 Apr 2024 10:32:09 +0000 (UTC) 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 Message-Id: <20240408103207.197423-4-kovalev@altlinux.org> X-Mailer: git-send-email 2.33.8 In-Reply-To: <20240408103207.197423-1-kovalev@altlinux.org> References: <20240408103207.197423-1-kovalev@altlinux.org> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Hans de Goede 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 Signed-off-by: Hans de Goede Signed-off-by: Rafael J. Wysocki Signed-off-by: Vasiliy Kovalev --- 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 From patchwork Mon Apr 8 10:31:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasiliy Kovalev X-Patchwork-Id: 13620975 Received: from air.basealt.ru (air.basealt.ru [194.107.17.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 18EC057885; Mon, 8 Apr 2024 10:32:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.39 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572352; cv=none; b=DljJ4tsIW/4L6cLl4NH/XdITArOWMU6Be96WtQD55fwvSc31qkWIAyOgCNWYaxzr32hAoeu6wBNIk8cNiw0FnG30EGWAtq0x4HNa8TmPRnKmFfo/L/PB0fOLyE3XpUZAzXOvIQI0zyTxUGxGYNac486fDSlcOP093B5pQnq52Tg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572352; c=relaxed/simple; bh=+hYDOeBeIk1HSQh5+r8LsDK14MmGxozbWb/i83GBvfk=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=NZwRBLnzK6TpMuyS8MSm5k53pJI/B7YXNh3I9rhjOe6RXx8EW24QvXKALkNXP6xTx+wb2l3MJdlq/ME94c85O/h8ke3dISZPZuIf7WQ0KqNyHGhhzrmOD+jsZcR38wQL1hZKEIzeVDk0TUjnotcdbfEqv6LrVGkIWw2R1M6u+KA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.39 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: by air.basealt.ru (Postfix, from userid 490) id 685FD2F20275; Mon, 8 Apr 2024 10:32:29 +0000 (UTC) X-Spam-Level: Received: from altlinux.malta.altlinux.ru (obninsk.basealt.ru [217.15.195.17]) by air.basealt.ru (Postfix) with ESMTPSA id A72702F20254; Mon, 8 Apr 2024 10:32:09 +0000 (UTC) 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 04/14] ACPI: resource: Honor MADT INT_SRC_OVR settings for IRQ1 on AMD Zen Date: Mon, 8 Apr 2024 13:31:57 +0300 Message-Id: <20240408103207.197423-5-kovalev@altlinux.org> X-Mailer: git-send-email 2.33.8 In-Reply-To: <20240408103207.197423-1-kovalev@altlinux.org> References: <20240408103207.197423-1-kovalev@altlinux.org> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Hans de Goede commit c6a1fd910d1bf8a0e3db7aebb229e3c81bc305c4 upstream. On AMD Zen acpi_dev_irq_override() by default prefers the DSDT IRQ 1 settings over the MADT settings. This causes the keyboard to malfunction on some laptop models (see Links), all models from the Links have an INT_SRC_OVR MADT entry for IRQ 1. Fixes: a9c4a912b7dc ("ACPI: resource: Remove "Zen" specific match and quirks") Link: https://bugzilla.kernel.org/show_bug.cgi?id=217336 Link: https://bugzilla.kernel.org/show_bug.cgi?id=217394 Link: https://bugzilla.kernel.org/show_bug.cgi?id=217406 Cc: All applicable Signed-off-by: Hans de Goede Signed-off-by: Rafael J. Wysocki Signed-off-by: Vasiliy Kovalev --- arch/x86/include/asm/acpi.h | 2 ++ arch/x86/kernel/acpi/boot.c | 4 ++++ drivers/acpi/resource.c | 4 ++++ 3 files changed, 10 insertions(+) diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index 8eb74cf386dbe5..2888c0ee4df045 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -15,6 +15,7 @@ #include #include #include +#include #ifdef CONFIG_ACPI_APEI # include @@ -31,6 +32,7 @@ extern int acpi_skip_timer_override; extern int acpi_use_timer_override; extern int acpi_fix_pin2_polarity; extern int acpi_disable_cmcff; +extern bool acpi_int_src_ovr[NR_IRQS_LEGACY]; extern u8 acpi_sci_flags; extern u32 acpi_sci_override_gsi; diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c index 2252340b2133e2..b045e20872d107 100644 --- a/arch/x86/kernel/acpi/boot.c +++ b/arch/x86/kernel/acpi/boot.c @@ -52,6 +52,7 @@ int acpi_lapic; int acpi_ioapic; int acpi_strict; int acpi_disable_cmcff; +bool acpi_int_src_ovr[NR_IRQS_LEGACY]; /* ACPI SCI override configuration */ u8 acpi_sci_flags __initdata; @@ -591,6 +592,9 @@ acpi_parse_int_src_ovr(union acpi_subtable_headers * header, acpi_table_print_madt_entry(&header->common); + if (intsrc->source_irq < NR_IRQS_LEGACY) + acpi_int_src_ovr[intsrc->source_irq] = true; + if (intsrc->source_irq == acpi_gbl_FADT.sci_interrupt) { acpi_sci_ioapic_setup(intsrc->source_irq, intsrc->inti_flags & ACPI_MADT_POLARITY_MASK, diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index 2a3b8bf58b7ac4..8e28e76158894f 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -617,6 +617,10 @@ static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity, if (gsi != 1 && gsi != 12) return true; + /* If the override comes from an INT_SRC_OVR MADT entry, honor it. */ + if (acpi_int_src_ovr[gsi]) + return true; + /* * IRQ override isn't needed on modern AMD Zen systems and * this override breaks active low IRQs on AMD Ryzen 6000 and From patchwork Mon Apr 8 10:31:58 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasiliy Kovalev X-Patchwork-Id: 13620977 Received: from air.basealt.ru (air.basealt.ru [194.107.17.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E7FA757335; Mon, 8 Apr 2024 10:32:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.39 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572353; cv=none; b=N85MTETgaKDyiGu0Bjw5IwLfvfCUMFpgUu4O8d0eysUHcyUhP877hgEKxc5PignJYpKM03TmR84wz8nMAzb3sICDPOjCpAMt7fqFPx3+BlHphDHANHcs8OwpoufrsS8t3a/SKOCfBmXJadcl6Dh+zmYm5tGrZILx1aJIrwp8ZKE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572353; c=relaxed/simple; bh=dmpC4cQYnSwpaSj1SZixLV/xSssDQufO+mwY1wkUQNA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=P0+5GUjHnc+kmE91D8MIUgieQPMYwLDE7BFkcCcJSupP7oHmWwhAS+F8Q8vcKjVnYad61VlMwtckBtwrTjf7j9BZCJA/DDf4jMV8JyugfyGYQVzN5aZk0abLbRa6UhgQVpKXno+WFruJqn7sw4dIVLyZALEu06yuyQ1rDzGhuls= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.39 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: by air.basealt.ru (Postfix, from userid 490) id 31D5F2F20257; Mon, 8 Apr 2024 10:32:30 +0000 (UTC) X-Spam-Level: Received: from altlinux.malta.altlinux.ru (obninsk.basealt.ru [217.15.195.17]) by air.basealt.ru (Postfix) with ESMTPSA id BA7AC2F20255; Mon, 8 Apr 2024 10:32:09 +0000 (UTC) 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 05/14] ACPI: resource: Add IRQ override quirk for PCSpecialist Elimina Pro 16 M Date: Mon, 8 Apr 2024 13:31:58 +0300 Message-Id: <20240408103207.197423-6-kovalev@altlinux.org> X-Mailer: git-send-email 2.33.8 In-Reply-To: <20240408103207.197423-1-kovalev@altlinux.org> References: <20240408103207.197423-1-kovalev@altlinux.org> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Hans de Goede commit 56fec0051a69ace182ca3fba47be9c13038b4e3f upstream. The PCSpecialist Elimina Pro 16 M laptop model is a Zen laptop which needs to use the MADT IRQ settings override and which does not have an INT_SRC_OVR entry for IRQ 1 in its MADT. So this model needs a DMI quirk to enable the MADT IRQ settings override to fix its keyboard not working. Fixes: a9c4a912b7dc ("ACPI: resource: Remove "Zen" specific match and quirks") Link: https://bugzilla.kernel.org/show_bug.cgi?id=217394#c18 Cc: All applicable Signed-off-by: Hans de Goede Signed-off-by: Rafael J. Wysocki Signed-off-by: Vasiliy Kovalev --- drivers/acpi/resource.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index 8e28e76158894f..eebfc26c325866 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -531,6 +531,17 @@ static const struct dmi_system_id maingear_laptop[] = { { } }; +static const struct dmi_system_id pcspecialist_laptop[] = { + { + .ident = "PCSpecialist Elimina Pro 16 M", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "PCSpecialist"), + DMI_MATCH(DMI_PRODUCT_NAME, "Elimina Pro 16 M"), + }, + }, + { } +}; + static const struct dmi_system_id lg_laptop[] = { { .ident = "LG Electronics 17U70P", @@ -589,6 +600,7 @@ static const struct irq_override_cmp override_table[] = { { asus_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, false }, { tongfang_gm_rg, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1, true }, { maingear_laptop, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1, true }, + { pcspecialist_laptop, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1, true }, { lg_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, false }, }; From patchwork Mon Apr 8 10:31:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasiliy Kovalev X-Patchwork-Id: 13620973 Received: from air.basealt.ru (air.basealt.ru [194.107.17.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 843F65813F; Mon, 8 Apr 2024 10:32:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.39 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572351; cv=none; b=CSccQoJP7+9B5p7w/nQFeUXe8VztfuIyvLjGixoZKZ62SH41/BRJiNb7OBRqpn16Oq8P+V0r2zeVLxAiRaz97fj4yLnr9I9rNlRzTn8iSxysZlLx2fxRX9UdILI0JfeLMXHzFuo34K3YYJnuOszR4rwDTWOk2VrI2/7EbIuXjK0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572351; c=relaxed/simple; bh=NwtmJOtk7FCAQ3mRWiBh/LpxG8ViaB5l2wms0Oo7kjA=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=npeJMGbkt7pA1ijhhrxRQHogyTjtqRWrgcX5Sahh28sCRfTK59MCtrx6LPq3d3I4RBE3eBWI/hYl6UV12pjEQTZDd+8noW/7VPUkjF8bD1MGAiY91qgxq5EwXYa3T2kLo31U+14erPGCHi55Hno4fr8Vvz+Z7154qoadKlXlOqQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.39 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: by air.basealt.ru (Postfix, from userid 490) id D1BB72F20274; Mon, 8 Apr 2024 10:32:28 +0000 (UTC) X-Spam-Level: Received: from altlinux.malta.altlinux.ru (obninsk.basealt.ru [217.15.195.17]) by air.basealt.ru (Postfix) with ESMTPSA id CC33F2F20256; Mon, 8 Apr 2024 10:32:09 +0000 (UTC) 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 06/14] ACPI: resource: Fix IRQ override quirk for PCSpecialist Elimina Pro 16 M Date: Mon, 8 Apr 2024 13:31:59 +0300 Message-Id: <20240408103207.197423-7-kovalev@altlinux.org> X-Mailer: git-send-email 2.33.8 In-Reply-To: <20240408103207.197423-1-kovalev@altlinux.org> References: <20240408103207.197423-1-kovalev@altlinux.org> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Hans de Goede commit 453b014e2c294abf762d3bce12e91ce4b34055e6 upstream. It turns out that some PCSpecialist Elimina Pro 16 M models have "GM6BGEQ" as DMI product-name instead of "Elimina Pro 16 M", causing the existing DMI quirk to not work on these models. The DMI board-name is always "GM6BGEQ", so match on that instead. Fixes: 56fec0051a69 ("ACPI: resource: Add IRQ override quirk for PCSpecialist Elimina Pro 16 M") Link: https://bugzilla.kernel.org/show_bug.cgi?id=217394#c36 Cc: All applicable Signed-off-by: Hans de Goede Signed-off-by: Rafael J. Wysocki Signed-off-by: Vasiliy Kovalev --- drivers/acpi/resource.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index eebfc26c325866..a14a1adaac99a0 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -534,9 +534,13 @@ static const struct dmi_system_id maingear_laptop[] = { static const struct dmi_system_id pcspecialist_laptop[] = { { .ident = "PCSpecialist Elimina Pro 16 M", + /* + * Some models have product-name "Elimina Pro 16 M", + * others "GM6BGEQ". Match on board-name to match both. + */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "PCSpecialist"), - DMI_MATCH(DMI_PRODUCT_NAME, "Elimina Pro 16 M"), + DMI_MATCH(DMI_BOARD_NAME, "GM6BGEQ"), }, }, { } From patchwork Mon Apr 8 10:32:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasiliy Kovalev X-Patchwork-Id: 13620976 Received: from air.basealt.ru (air.basealt.ru [194.107.17.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D8F057332; Mon, 8 Apr 2024 10:32:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.39 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572352; cv=none; b=UHbCuJpSEWz9TgONgSc0srwkiOpB89P19Iy8lm7+EfbCdvjC1EQK6NJz9qnRuyqa57tqMvi8uoQsa8s6hKMKPxXggFbSxIlCjP09yIc8Cc5zMP6RMTK75fpfDsrsR6FCuIcCd6D8Z6hc2hBq97vHNLGYnyT1MjI6Tz0geLnIa/s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572352; c=relaxed/simple; bh=L5PsDvROCzEJTldIxbTQR0ExfypJnOAw9pFOQLdMB80=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=cGrlhMNWLzpK3rxWFs8EEi5Anb5gdrOWYSyxbgO63qWNcERklCzxIcrdI3+ImCGWP7oxYUaP3OP47zDMybq2A/u9zXrCpC6Z5ygC6kc7Ds0Vx/g3ZvIM/Q2EiWOUjpLtdxmGCiK2NG3qZezHpfDNEXypHTxFXA/8p46wh/zj5O8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.39 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: by air.basealt.ru (Postfix, from userid 490) id 8A0652F20254; Mon, 8 Apr 2024 10:32:29 +0000 (UTC) X-Spam-Level: Received: from altlinux.malta.altlinux.ru (obninsk.basealt.ru [217.15.195.17]) by air.basealt.ru (Postfix) with ESMTPSA id E0E542F20257; Mon, 8 Apr 2024 10:32:09 +0000 (UTC) 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 07/14] ACPI: resource: Consolidate IRQ trigger-type override DMI tables Date: Mon, 8 Apr 2024 13:32:00 +0300 Message-Id: <20240408103207.197423-8-kovalev@altlinux.org> X-Mailer: git-send-email 2.33.8 In-Reply-To: <20240408103207.197423-1-kovalev@altlinux.org> References: <20240408103207.197423-1-kovalev@altlinux.org> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Hans de Goede commit d37273af0e428e95a34841c1ade16b172db6c2b5 upstream. Before this patch there were 6 dmi_system_id tables. While looking at the override_table[] there are only 2 cases: 1. irq 1, level, active-low, not-shared, skip-override 2. irq 1, edge, activ-low, shared, force-override Merge the dmi_system_id tables for identical cases together, going from 6 dmi_system_id tables and 6 override_table[] entries to just 2, one for each case. Signed-off-by: Hans de Goede Signed-off-by: Rafael J. Wysocki Signed-off-by: Vasiliy Kovalev --- drivers/acpi/resource.c | 52 +++++++++++++++++------------------------ 1 file changed, 21 insertions(+), 31 deletions(-) diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index a14a1adaac99a0..54bd6919f719c8 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -385,7 +385,12 @@ unsigned int acpi_dev_get_irq_type(int triggering, int polarity) } EXPORT_SYMBOL_GPL(acpi_dev_get_irq_type); -static const struct dmi_system_id medion_laptop[] = { +/* + * DMI matches for boards where the DSDT specifies the kbd IRQ as + * level active-low and using the override changes this to rising edge, + * stopping the keyboard from working. + */ +static const struct dmi_system_id irq1_level_low_skip_override[] = { { .ident = "MEDION P15651", .matches = { @@ -407,10 +412,6 @@ static const struct dmi_system_id medion_laptop[] = { DMI_MATCH(DMI_BOARD_NAME, "M1xA"), }, }, - { } -}; - -static const struct dmi_system_id asus_laptop[] = { { .ident = "Asus Vivobook K3402ZA", .matches = { @@ -481,20 +482,28 @@ static const struct dmi_system_id asus_laptop[] = { DMI_MATCH(DMI_BOARD_NAME, "B2502CBA"), }, }, + { + .ident = "LG Electronics 17U70P", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LG Electronics"), + DMI_MATCH(DMI_BOARD_NAME, "17U70P"), + }, + }, { } }; -static const struct dmi_system_id tongfang_gm_rg[] = { +/* + * DMI matches for AMD Zen boards where the DSDT specifies the kbd IRQ + * as falling edge and this must be overridden to rising edge, + * to have a working keyboard. + */ +static const struct dmi_system_id irq1_edge_low_force_override[] = { { .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 = { @@ -528,10 +537,6 @@ static const struct dmi_system_id maingear_laptop[] = { DMI_MATCH(DMI_PRODUCT_NAME, "MG-VCP2-17A3070T"), }, }, - { } -}; - -static const struct dmi_system_id pcspecialist_laptop[] = { { .ident = "PCSpecialist Elimina Pro 16 M", /* @@ -543,17 +548,6 @@ static const struct dmi_system_id pcspecialist_laptop[] = { DMI_MATCH(DMI_BOARD_NAME, "GM6BGEQ"), }, }, - { } -}; - -static const struct dmi_system_id lg_laptop[] = { - { - .ident = "LG Electronics 17U70P", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "LG Electronics"), - DMI_MATCH(DMI_BOARD_NAME, "17U70P"), - }, - }, { /* Infinity E15-5A165-BM */ .matches = { @@ -600,12 +594,8 @@ 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 }, - { tongfang_gm_rg, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1, true }, - { maingear_laptop, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1, true }, - { pcspecialist_laptop, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1, true }, - { lg_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, false }, + { irq1_level_low_skip_override, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, false }, + { irq1_edge_low_force_override, 1, ACPI_EDGE_SENSITIVE, ACPI_ACTIVE_LOW, 1, true }, }; static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity, From patchwork Mon Apr 8 10:32:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasiliy Kovalev X-Patchwork-Id: 13620969 Received: from air.basealt.ru (air.basealt.ru [194.107.17.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A4D3356461; Mon, 8 Apr 2024 10:32:25 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.39 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572348; cv=none; b=uFirePR9gLKRWCpx3Hi7wn2VAmSmgQi49Pk40tMRN6dUSDiCQr6oRfdmDGmqr4S/9MSmx/zGq4zXkfb3a+1kaj+4ZnzlIP3MHpwexpvaAAkoomBsPHpm158MkHspEBsukCr8iL+iN3dcrzNqZrvmTt9Nnw6tKQEAckblHs9Xmmo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572348; c=relaxed/simple; bh=fXIqXueGUbGfH2unVIcGkhP53qXTuywBVNkfQJP/4pY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pJAoF6EtMig48R6miwPbHTpqpCC0kTeq71F5WN+49Defrb0oX2WnIelJ8wakolpHGMLvSwV+ce9ww8XC+182geRr/F9VnOhoe3tlsFr+C+uc83dSfXolBFOSX7im0DYMQoL/O03X+csgLvnAr97YfKCa8tJJ6fLXU/L0dIdMWpg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.39 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: by air.basealt.ru (Postfix, from userid 490) id 301DE2F20267; Mon, 8 Apr 2024 10:32:24 +0000 (UTC) X-Spam-Level: Received: from altlinux.malta.altlinux.ru (obninsk.basealt.ru [217.15.195.17]) by air.basealt.ru (Postfix) with ESMTPSA id F16B72F20258; Mon, 8 Apr 2024 10:32:09 +0000 (UTC) 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 08/14] ACPI: resource: Drop .ident values from dmi_system_id tables Date: Mon, 8 Apr 2024 13:32:01 +0300 Message-Id: <20240408103207.197423-9-kovalev@altlinux.org> X-Mailer: git-send-email 2.33.8 In-Reply-To: <20240408103207.197423-1-kovalev@altlinux.org> References: <20240408103207.197423-1-kovalev@altlinux.org> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Hans de Goede commit 424009ab203086288dcd183d3ab48d243eb31268 upstream. The dmi_system_id.ident values are not used, replace the .ident = "$ident" lines with /* $ident */ to drop the unused strings from the text section. Signed-off-by: Hans de Goede Signed-off-by: Rafael J. Wysocki Signed-off-by: Vasiliy Kovalev --- drivers/acpi/resource.c | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index 54bd6919f719c8..ef5a08c1596031 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -392,56 +392,56 @@ EXPORT_SYMBOL_GPL(acpi_dev_get_irq_type); */ static const struct dmi_system_id irq1_level_low_skip_override[] = { { - .ident = "MEDION P15651", + /* MEDION P15651 */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "MEDION"), DMI_MATCH(DMI_BOARD_NAME, "M15T"), }, }, { - .ident = "MEDION S17405", + /* MEDION S17405 */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "MEDION"), DMI_MATCH(DMI_BOARD_NAME, "M17T"), }, }, { - .ident = "MEDION S17413", + /* MEDION S17413 */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "MEDION"), DMI_MATCH(DMI_BOARD_NAME, "M1xA"), }, }, { - .ident = "Asus Vivobook K3402ZA", + /* Asus Vivobook K3402ZA */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_BOARD_NAME, "K3402ZA"), }, }, { - .ident = "Asus Vivobook K3502ZA", + /* Asus Vivobook K3502ZA */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_BOARD_NAME, "K3502ZA"), }, }, { - .ident = "Asus Vivobook S5402ZA", + /* Asus Vivobook S5402ZA */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_BOARD_NAME, "S5402ZA"), }, }, { - .ident = "Asus Vivobook S5602ZA", + /* Asus Vivobook S5602ZA */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_BOARD_NAME, "S5602ZA"), }, }, { - .ident = "Asus ExpertBook B1402CBA", + /* Asus ExpertBook B1402CBA */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_BOARD_NAME, "B1402CBA"), @@ -455,35 +455,35 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = { }, }, { - .ident = "Asus ExpertBook B1502CBA", + /* Asus ExpertBook B1502CBA */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_BOARD_NAME, "B1502CBA"), }, }, { - .ident = "Asus ExpertBook B2402CBA", + /* Asus ExpertBook B2402CBA */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_BOARD_NAME, "B2402CBA"), }, }, { - .ident = "Asus ExpertBook B2402FBA", + /* Asus ExpertBook B2402FBA */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_BOARD_NAME, "B2402FBA"), }, }, { - .ident = "Asus ExpertBook B2502", + /* Asus ExpertBook B2502 */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), DMI_MATCH(DMI_BOARD_NAME, "B2502CBA"), }, }, { - .ident = "LG Electronics 17U70P", + /* LG Electronics 17U70P */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "LG Electronics"), DMI_MATCH(DMI_BOARD_NAME, "17U70P"), @@ -499,13 +499,13 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = { */ static const struct dmi_system_id irq1_edge_low_force_override[] = { { - .ident = "TongFang GMxRGxx/XMG CORE 15 (M22)/TUXEDO Stellaris 15 Gen4 AMD", + /* TongFang GMxRGxx/XMG CORE 15 (M22)/TUXEDO Stellaris 15 Gen4 AMD */ .matches = { DMI_MATCH(DMI_BOARD_NAME, "GMxRGxx"), }, }, { - .ident = "MAINGEAR Vector Pro 2 15", + /* MAINGEAR Vector Pro 2 15 */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Micro Electronics Inc"), DMI_MATCH(DMI_PRODUCT_NAME, "MG-VCP2-15A3070T"), @@ -531,7 +531,7 @@ static const struct dmi_system_id irq1_edge_low_force_override[] = { }, }, { - .ident = "MAINGEAR Vector Pro 2 17", + /* MAINGEAR Vector Pro 2 17 */ .matches = { DMI_MATCH(DMI_SYS_VENDOR, "Micro Electronics Inc"), DMI_MATCH(DMI_PRODUCT_NAME, "MG-VCP2-17A3070T"), From patchwork Mon Apr 8 10:32:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasiliy Kovalev X-Patchwork-Id: 13620979 Received: from air.basealt.ru (air.basealt.ru [194.107.17.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3B6FC101C6; Mon, 8 Apr 2024 10:32:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.39 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572354; cv=none; b=bhnlsoWfI5nzYkjOMUpAoEJBeYEoxHdvTbeixe0SqhzmZvY4pIoXRZX6Z9abreKArpbEe5VkoO3MHylkBrYZ5Yb0Fd483w/FlOQvPid9b1T8XJ7vg4OYd1smR4Q+Vv2DvDdgNbiqx3+HEjuLgEQFqK8UJs45/tH0h2mxGtQ3Lxc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572354; c=relaxed/simple; bh=gJHFBUDlINjXvuU9E8gnt4auKG05LEKIOw1LNr7SZOI=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pgVz+kq1/LuN8rLMcswGBhLGaNH5DBqIyAe7WpTK3XsVz5oOHnp7GC39l3skT2/S+HmRfilLTywBeKYMp8gcvQTTYg1d6zCxkGH9IGfxKgDhg8ksimAQeWdG7nwSDMFnl+/ChHIX09imrSDOuqTT0PxL+wMHvfLGeot7Cp4K2+c= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.39 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: by air.basealt.ru (Postfix, from userid 490) id 8EDDF2F2027B; Mon, 8 Apr 2024 10:32:31 +0000 (UTC) X-Spam-Level: Received: from altlinux.malta.altlinux.ru (obninsk.basealt.ru [217.15.195.17]) by air.basealt.ru (Postfix) with ESMTPSA id 0E6D92F20259; Mon, 8 Apr 2024 10:32:10 +0000 (UTC) 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 09/14] ACPI: resource: Add TongFang GM6BGEQ, GM6BG5Q and GM6BG0Q to irq1_edge_low_force_override[] Date: Mon, 8 Apr 2024 13:32:02 +0300 Message-Id: <20240408103207.197423-10-kovalev@altlinux.org> X-Mailer: git-send-email 2.33.8 In-Reply-To: <20240408103207.197423-1-kovalev@altlinux.org> References: <20240408103207.197423-1-kovalev@altlinux.org> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Hans de Goede commit f9b3ea02555e67e2e7bf95219953b88d122bd275 upstream. The TongFang GM6BGEQ, GM6BG5Q and GM6BG0Q are 3 GPU variants of a TongFang barebone design which is sold under various brand names. The ACPI IRQ override for the keyboard IRQ must be used on these AMD Zen laptops in order for the IRQ to work. Adjust the pcspecialist_laptop[] DMI match table for this: 1. Drop the sys-vendor match from the existing PCSpecialist Elimina Pro 16 entry for the GM6BGEQ (RTX3050 GPU) model so that it will also match the laptop when sold by other vendors such as hyperbook.pl. 2. Add board-name matches for the GM6BG5Q (RTX4050) and GM6B0Q (RTX4060) models. Note the .ident values of the dmi_system_id structs are left unset since these are not used. Suggested-by: August Wikerfors Reported-by: Francesco Closes: https://bugzilla.kernel.org/show_bug.cgi?id=217394 Link: https://laptopparts4less.frl/index.php?route=product/search&filter_name=GM6BG Link: https://hyperbook.pl/en/content/14-hyperbook-drivers Link: https://linux-hardware.org/?probe=bfa70344e3 Link: https://bbs.archlinuxcn.org/viewtopic.php?id=13313 Signed-off-by: Hans de Goede Signed-off-by: Rafael J. Wysocki Signed-off-by: Vasiliy Kovalev --- drivers/acpi/resource.c | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index ef5a08c1596031..c8dbe3cc3bbae0 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -538,16 +538,23 @@ static const struct dmi_system_id irq1_edge_low_force_override[] = { }, }, { - .ident = "PCSpecialist Elimina Pro 16 M", - /* - * Some models have product-name "Elimina Pro 16 M", - * others "GM6BGEQ". Match on board-name to match both. - */ + /* TongFang GM6BGEQ / PCSpecialist Elimina Pro 16 M, RTX 3050 */ .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "PCSpecialist"), DMI_MATCH(DMI_BOARD_NAME, "GM6BGEQ"), }, }, + { + /* TongFang GM6BG5Q, RTX 4050 */ + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "GM6BG5Q"), + }, + }, + { + /* TongFang GM6BG0Q / PCSpecialist Elimina Pro 16 M, RTX 4060 */ + .matches = { + DMI_MATCH(DMI_BOARD_NAME, "GM6BG0Q"), + }, + }, { /* Infinity E15-5A165-BM */ .matches = { From patchwork Mon Apr 8 10:32:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasiliy Kovalev X-Patchwork-Id: 13620971 Received: from air.basealt.ru (air.basealt.ru [194.107.17.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E6E5257332; Mon, 8 Apr 2024 10:32:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.39 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572350; cv=none; b=DQ7cbDXW/AANPzkun8wW3lm2IeCyVQvrGhcOEAcxIBCVPUSADabxipdm3YHpsZdi6lWisYgPRvdx+XMt382b0pZKOy0cJPfmHOdTm8c923x8Yr5lkhCtk3aJbLCU3l9moN2WrvB9TG0QSxmGfbTJSV74rrAvdJCPeKy0Y/LtnVE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572350; c=relaxed/simple; bh=mndJf29iEej2EkWzUYBmNEMOuaaJfmsB3kDkrrmDq3c=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ZgaiWVycrqSa9A3sBSVOQQk7m+AqNKJylLbtHpu29olJODFcc1lIkpM2355GhnvLLEKtjHwgHHuGXmBx84sZzblSelGOarGWU6JvygyETVYztjQFhToK5cCJ9/44Q8v4RoB5FvcNyjXLMVZTPk+Y11EwBFAblmmEZhjS8ny9mmA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.39 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: by air.basealt.ru (Postfix, from userid 490) id 7389E2F20272; Mon, 8 Apr 2024 10:32:27 +0000 (UTC) X-Spam-Level: Received: from altlinux.malta.altlinux.ru (obninsk.basealt.ru [217.15.195.17]) by air.basealt.ru (Postfix) with ESMTPSA id 201EE2F20246; Mon, 8 Apr 2024 10:32:10 +0000 (UTC) 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 10/14] ACPI: resource: Add DMI quirks for ASUS Vivobook E1504GA and E1504GAB Date: Mon, 8 Apr 2024 13:32:03 +0300 Message-Id: <20240408103207.197423-11-kovalev@altlinux.org> X-Mailer: git-send-email 2.33.8 In-Reply-To: <20240408103207.197423-1-kovalev@altlinux.org> References: <20240408103207.197423-1-kovalev@altlinux.org> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Ben Mayo commit d2aaf19965045f70bb2ece514399cdc6fcce2e73 upstream. Asus Vivobook E1504GA and E1504GAB notebooks are affected by bug #216158 (DSDT specifies the kbd IRQ as level active-low and using the override changes this to rising edge, stopping the keyboard from working). Users of these notebooks do not have a working keyboard unless they add their DMI information to the struct irq1_level_low_skip_override array and compile a custom kernel. Add support for these computers to the Linux kernel without requiring the end-user to recompile the kernel. Link: https://bugzilla.kernel.org/show_bug.cgi?id=216158 Signed-off-by: Ben Mayo [ rjw: Link tag, subject and changelog edits ] Signed-off-by: Rafael J. Wysocki Signed-off-by: Vasiliy Kovalev --- drivers/acpi/resource.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index c8dbe3cc3bbae0..d5cac22b6b7261 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -482,6 +482,20 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = { DMI_MATCH(DMI_BOARD_NAME, "B2502CBA"), }, }, + { + /* Asus Vivobook E1504GA */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_BOARD_NAME, "E1504GA"), + }, + }, + { + /* Asus Vivobook E1504GAB */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_BOARD_NAME, "E1504GAB"), + }, + }, { /* LG Electronics 17U70P */ .matches = { From patchwork Mon Apr 8 10:32:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasiliy Kovalev X-Patchwork-Id: 13620970 Received: from air.basealt.ru (air.basealt.ru [194.107.17.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D174458124; Mon, 8 Apr 2024 10:32:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.39 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572348; cv=none; b=shTaU1F/+ng6hMXhFJsj1kHvIERN8MmdRhaJ8L4XwLDgaCOH6mMWejhB+tyzEp1ifL8Au349/FBE59EE/dziskjj0hXwS8Xc7jnykSDs/OErqg20IkDta9LsAdbsva1uXKPQdGUJmbkJlfhFFJQ3iVQDzT13TGK0mwRWyxF3cHY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572348; c=relaxed/simple; bh=Mvzgnx3Xc+01j6Y4a3i4qvU0y1pw+PiGidPS4wPO1CU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=pHSubo9ZLrkZ91vnOYc7emKAzoiYAvfEqGOl202+uKKL0vLlUbH+thhopBuETtTi6VPTYkqtlySZMk3nTp34lgHJ1bDLnPFsw3QVCCTxiOcvIfZqiL3oNlFaqIHob0ByUSXGlF+qF2C2ldKh0poQuTzPIbAOtV5D78fdrtw9eqg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.39 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: by air.basealt.ru (Postfix, from userid 490) id 391CB2F2026E; Mon, 8 Apr 2024 10:32:25 +0000 (UTC) X-Spam-Level: Received: from altlinux.malta.altlinux.ru (obninsk.basealt.ru [217.15.195.17]) by air.basealt.ru (Postfix) with ESMTPSA id 332582F2025B; Mon, 8 Apr 2024 10:32:10 +0000 (UTC) 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 11/14] ACPI: resource: Skip IRQ override on ASUS ExpertBook B1502CGA Date: Mon, 8 Apr 2024 13:32:04 +0300 Message-Id: <20240408103207.197423-12-kovalev@altlinux.org> X-Mailer: git-send-email 2.33.8 In-Reply-To: <20240408103207.197423-1-kovalev@altlinux.org> References: <20240408103207.197423-1-kovalev@altlinux.org> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Michael Maltsev commit e315e8692f7922cd1b2a26bd7a1741cc8ce77085 upstream. Like the ASUS ExpertBook B1502CBA and various ASUS laptops, the ASUS ExpertBook B1502CGA has an ACPI DSDT table that describes IRQ 1 as ActiveLow while the kernel overrides it to Edge_High. $ sudo dmesg | grep DMI [ 0.000000] DMI: ASUSTeK COMPUTER INC. ASUS EXPERTBOOK B1502CGA_B1502CGA/B1502CGA, BIOS B1502CGA.303 06/05/2023 $ grep -A 40 PS2K dsdt.dsl | grep IRQ -A 1 IRQ (Level, ActiveLow, Exclusive, ) {1} This prevents the keyboard from working. To fix this issue, add this laptop to the skip_override_table so that the kernel does not override IRQ 1. Signed-off-by: Michael Maltsev [ rjw: rebase, replace .ident field with a comment ] Signed-off-by: Rafael J. Wysocki Signed-off-by: Vasiliy Kovalev --- drivers/acpi/resource.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index d5cac22b6b7261..5697ccf902184e 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -461,6 +461,13 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = { DMI_MATCH(DMI_BOARD_NAME, "B1502CBA"), }, }, + { + /* Asus ExpertBook B1502CGA */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_BOARD_NAME, "B1502CGA"), + }, + }, { /* Asus ExpertBook B2402CBA */ .matches = { From patchwork Mon Apr 8 10:32:05 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasiliy Kovalev X-Patchwork-Id: 13620978 Received: from air.basealt.ru (air.basealt.ru [194.107.17.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D20025A11C; Mon, 8 Apr 2024 10:32:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.39 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572354; cv=none; b=sb7k1uKCzXyx2yzUl2xaFa9yvIUu1G0sWFFQVPsK0zlXxyB/hsXEsK12w9cFJZRdYIRFNSSSdJUSvTqPI88ZVse86VIWk69SWaTlO3gocpQ2JGmE8epgkHS6h51C2QkUvE2/B09tsM0X9V8RTsRjxNcpqIFi9U6xqAZx6jhZv+A= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572354; c=relaxed/simple; bh=m9BJlA3v26UaNJxmSCbA61ukI2y0NQsanGsLp9fpqec=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=I9lbZSYHh5HhsST5QEWUbS1pPOXlYCzAz56A9l4mKVxHSeD3SHc6PwLfTBSzooOvswq6yBDX4Zkc8blrb8txOKmjxK/ydV+Dw9QZQFQrzc8O2dtpbfuQV2OlExjTFAUyJGO570SzFPujqRJyxuYPhdlk9gPvggLP5BAb5wuObWM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.39 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: by air.basealt.ru (Postfix, from userid 490) id 6596A2F20255; Mon, 8 Apr 2024 10:32:31 +0000 (UTC) X-Spam-Level: Received: from altlinux.malta.altlinux.ru (obninsk.basealt.ru [217.15.195.17]) by air.basealt.ru (Postfix) with ESMTPSA id 4CF232F2025C; Mon, 8 Apr 2024 10:32:10 +0000 (UTC) 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 12/14] ACPI: resource: Skip IRQ override on ASUS ExpertBook B1502CVA Date: Mon, 8 Apr 2024 13:32:05 +0300 Message-Id: <20240408103207.197423-13-kovalev@altlinux.org> X-Mailer: git-send-email 2.33.8 In-Reply-To: <20240408103207.197423-1-kovalev@altlinux.org> References: <20240408103207.197423-1-kovalev@altlinux.org> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Nicolas Haye commit ca3afc2806046f626a1518f160a564b90f141f95 upstream. Like many b1502 models, the b1502CVA keyboard doesn't work because of an ACPI DSDT table that describes IRQ 1 as ActiveLow while the kernel overrides it to Edge_High. Signed-off-by: Nicolas Haye Signed-off-by: Rafael J. Wysocki Signed-off-by: Vasiliy Kovalev --- drivers/acpi/resource.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index 5697ccf902184e..a4f245669d24a5 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -468,6 +468,13 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = { DMI_MATCH(DMI_BOARD_NAME, "B1502CGA"), }, }, + { + /* Asus ExpertBook B1502CVA */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_BOARD_NAME, "B1502CVA"), + }, + }, { /* Asus ExpertBook B2402CBA */ .matches = { From patchwork Mon Apr 8 10:32:06 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasiliy Kovalev X-Patchwork-Id: 13620972 Received: from air.basealt.ru (air.basealt.ru [194.107.17.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id D521E57335; Mon, 8 Apr 2024 10:32:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.39 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572351; cv=none; b=CPjEsw5RGi6EwkDlIjwXeuXPuPZoO8O67Pbyn2kjer1gHktafFye/rc1xSZR9r1WJ0gR8cRTgPHcu/otB31kb/EBApDBP7SrcxGCSN9VhwNtgsTNEXCP7AvRaKml3Cj5p4TKQJ77lQMpus5ldOJrbd0YXuSYqRagvh2ij2hWFXU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572351; c=relaxed/simple; bh=1+2N9VD8aWYC8y5MqMhMYEILaIevx0gzV/OF6Mwttf0=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=ahDMW6VrKlNy/Sx7N6g7t4JmHhJCDQy+fY+ZktJWMSZzqUqK2n8aZpCZMnrUl2RwvdPIs9ntoNlQobIPOJEiFqbj1PIvAuEiiiyQ569Gm2SXluQF5uP+HNQppAs7/i5Wy3ebWwHM7vOzLWe/5B/PCQr2pRVID3mpDUw8wanx7Os= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.39 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: by air.basealt.ru (Postfix, from userid 490) id 698352F20273; Mon, 8 Apr 2024 10:32:28 +0000 (UTC) X-Spam-Level: Received: from altlinux.malta.altlinux.ru (obninsk.basealt.ru [217.15.195.17]) by air.basealt.ru (Postfix) with ESMTPSA id 5F4FE2F2025F; Mon, 8 Apr 2024 10:32:10 +0000 (UTC) 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 13/14] ACPI: resource: Add IRQ override quirk for ASUS ExpertBook B2502FBA Date: Mon, 8 Apr 2024 13:32:06 +0300 Message-Id: <20240408103207.197423-14-kovalev@altlinux.org> X-Mailer: git-send-email 2.33.8 In-Reply-To: <20240408103207.197423-1-kovalev@altlinux.org> References: <20240408103207.197423-1-kovalev@altlinux.org> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Sviatoslav Harasymchuk commit 0793e511c4c66c38dd26add86f7236bcdc70c3b5 upstream. In order to fix the keyboard on ASUS ExpertBook B2502FBA, add an IRQ override quirk for it in analogy with how it was done for other members of this machine family. Link: https://lore.kernel.org/linux-acpi/20230411183144.6932-1-pmenzel@molgen.mpg.de Link: https://bugzilla.kernel.org/show_bug.cgi?id=217323 Signed-off-by: Sviatoslav Harasymchuk [ rjw: Subject and changelog rewrite, fix broken white space ] Signed-off-by: Rafael J. Wysocki Signed-off-by: Vasiliy Kovalev --- drivers/acpi/resource.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index a4f245669d24a5..42b594f5127e4a 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -496,6 +496,13 @@ static const struct dmi_system_id irq1_level_low_skip_override[] = { DMI_MATCH(DMI_BOARD_NAME, "B2502CBA"), }, }, + { + /* Asus ExpertBook B2502FBA */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_BOARD_NAME, "B2502FBA"), + }, + }, { /* Asus Vivobook E1504GA */ .matches = { From patchwork Mon Apr 8 10:32:07 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vasiliy Kovalev X-Patchwork-Id: 13620974 Received: from air.basealt.ru (air.basealt.ru [194.107.17.39]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E74A556461; Mon, 8 Apr 2024 10:32:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=194.107.17.39 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572352; cv=none; b=UEO7E7ZQdIycwXL0nxDWdI5MUsgzW/keffK/fgNQ8rHlk1ZQAVLZlFfff0fm4LEDDqyFofBxENpw0VEaH10PWSwgwAmajJB1j3Gg+0ipCo1LA7ibaniTeVrisaDxIVDx/sFy4VK1l15uQxOxShz0Z4U+U8WeTax7shFi3Uzt8vU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712572352; c=relaxed/simple; bh=EBbPXX1GRVfEnGt9wh3Y1T42heRsa6Z1PnPbI5TzPzo=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=p5oNRoPgfonmISLMhU11uP4iEibZLDNqJk/w6b/MHLA5Cp4OzJq281VF4Mly3COJHchpDIU05vZ6JKHSzTM5sSNuAUwqHeioOMBH+yycKhEGH2V1bejaM3krctDjmn/KeeeqBZFqnUaPtE+crS3pEIUoifGWljlkmYBqZJHKNaQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org; spf=pass smtp.mailfrom=altlinux.org; arc=none smtp.client-ip=194.107.17.39 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=altlinux.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=altlinux.org Received: by air.basealt.ru (Postfix, from userid 490) id 4B4DB2F20256; Mon, 8 Apr 2024 10:32:29 +0000 (UTC) X-Spam-Level: Received: from altlinux.malta.altlinux.ru (obninsk.basealt.ru [217.15.195.17]) by air.basealt.ru (Postfix) with ESMTPSA id 70A732F20260; Mon, 8 Apr 2024 10:32:10 +0000 (UTC) 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 14/14] ACPI: resource: Use IRQ override on Maibenben X565 Date: Mon, 8 Apr 2024 13:32:07 +0300 Message-Id: <20240408103207.197423-15-kovalev@altlinux.org> X-Mailer: git-send-email 2.33.8 In-Reply-To: <20240408103207.197423-1-kovalev@altlinux.org> References: <20240408103207.197423-1-kovalev@altlinux.org> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 From: Sergey Kalinichev commit 00efe7fcf9ceeff0808bca9460afb49e7ada6068 upstream. Use ACPI IRQ override on Maibenben X565 laptop to make the internal keyboard work. Add a new entry to the irq1_edge_low_force_override structure, similar to the existing ones. Signed-off-by: Sergey Kalinichev Signed-off-by: Rafael J. Wysocki Signed-off-by: Vasiliy Kovalev --- drivers/acpi/resource.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index 42b594f5127e4a..e2db4d5883ca40 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -623,6 +623,13 @@ static const struct dmi_system_id irq1_edge_low_force_override[] = { DMI_MATCH(DMI_BOARD_NAME, "X577"), }, }, + { + /* Maibenben X565 */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "MAIBENBEN"), + DMI_MATCH(DMI_BOARD_NAME, "X565"), + }, + }, { } };