From patchwork Tue Aug 8 10:33:34 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hans de Goede X-Patchwork-Id: 711626 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B4903C04E69 for ; Tue, 8 Aug 2023 18:26:36 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235419AbjHHS0f (ORCPT ); Tue, 8 Aug 2023 14:26:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33502 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233070AbjHHS0N (ORCPT ); Tue, 8 Aug 2023 14:26:13 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 411C79C465 for ; Tue, 8 Aug 2023 10:39:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1691516341; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=MGbr01H7ohRSkPP3ck7I4OfbupVIQ571vmUuvRJPa8U=; b=G8xpKcNZyoja9HC0HPkWxTepYS//rbdbxrQQp3VjXt8WSgeCAhSi6RCT4lex3yRcegWLvk lZiUSA0pdyzHio7xi0xy4z8wMJLnYvGEq+ISAaPRgEassVc4CD4Nest9wDptdVQiRAtp9v 7xHzcn1estpE8OaM3Esm83pMmVbjb5k= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-259-SAkIxSzVMZW-004HZWkrgw-1; Tue, 08 Aug 2023 06:33:48 -0400 X-MC-Unique: SAkIxSzVMZW-004HZWkrgw-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 91053185A7A5; Tue, 8 Aug 2023 10:33:47 +0000 (UTC) Received: from localhost.localdomain (unknown [10.39.194.191]) by smtp.corp.redhat.com (Postfix) with ESMTP id 966D740C2076; Tue, 8 Aug 2023 10:33:46 +0000 (UTC) From: Hans de Goede To: "Rafael J . Wysocki" , Mario Limonciello Cc: Hans de Goede , Linux regressions mailing list , stable@vger.kernel.org, linux-acpi@vger.kernel.org, x86@kernel.org Subject: [PATCH v2 2/3] ACPI: resource: Always use MADT override IRQ settings for GSI != 1 Date: Tue, 8 Aug 2023 12:33:34 +0200 Message-ID: <20230808103335.95339-3-hdegoede@redhat.com> In-Reply-To: <20230808103335.95339-1-hdegoede@redhat.com> References: <20230808103335.95339-1-hdegoede@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.1 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org All the cases, were the DSDT IRQ settings should be used instead of the MADT override, are for IRQ 1 (the PS/2 kbd IRQ). Simplify things by always honering the override for GSI != 1 (for non DMI quirked cases). This allows removing the DMI quirks to honor the override for some non IRQ 1 IRQs on some AMD ZEN based Lenovo models. Fixes: a9c4a912b7dc ("ACPI: resource: Remove "Zen" specific match and quirks") Cc: Mario Limonciello Cc: Linux regressions mailing list Cc: stable@vger.kernel.org Signed-off-by: Hans de Goede --- 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 0800a9d77558..840b938a5fb0 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -470,24 +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", @@ -539,8 +521,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,6 +542,14 @@ static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity, return entry->override; } + /* + * Always use the MADT override info, except for IRQ 1 for IRQ1 + * the DSDT IRQ settings should sometimes be used otherwise + * PS/2 keyboards will not work. + */ + if (gsi != 1) + return true; + #ifdef CONFIG_X86 /* * IRQ override isn't needed on modern AMD Zen systems and