From patchwork Tue Oct 4 10:33:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 12998132 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 50860C4332F for ; Tue, 4 Oct 2022 10:33:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229808AbiJDKdu (ORCPT ); Tue, 4 Oct 2022 06:33:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34402 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229621AbiJDKdt (ORCPT ); Tue, 4 Oct 2022 06:33:49 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1E5E147BAE; Tue, 4 Oct 2022 03:33:48 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id C77A8B819A2; Tue, 4 Oct 2022 10:33:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33B86C433D6; Tue, 4 Oct 2022 10:33:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1664879625; bh=XRG5jiEdp+ApFkASJ+vUHOoQYt1GREQ6VBKWpfYxdr0=; h=From:To:Cc:Subject:Date:From; b=OVwlMLh7arbdUxcDybNlv/kRDl4rFEi9ET/LlYSW255UO6WhRPiqs6R0lFKB5yzWS fbK7duAM9pZ0+i9G+jlwXWVHZn96vj6EjgNBAIQmy1Ocq+GGgthx1JbglTwQN5GVvL axQLp9tM94Nu3o1QAX1Ih9HfPoDlta+XfiY91uA1XB8k0TsCgNEY+w4yvGEQOJKJy3 8yeHkC5DhJgEKiD1mjAx/yrw0Q9PvgcyEUHTHwi6cQtJkNrDVD4htkfmx8Yz/WXKkl LGB54ln2ojk2TWYprUG3wZpe4fV2jGIIu/3Byfx/roBp9sy9ImicSJxDZvrQ89Ga7D j+flN4kFPGl7Q== From: "Jiri Slaby (SUSE)" To: rafael.j.wysocki@intel.com Cc: linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , "Rafael J. Wysocki" , Len Brown , linux-acpi@vger.kernel.org, Chuanhong Guo , Tighe Donnelly , Mario Limonciello , Fridrich Strba Subject: [PATCH 1/2] ACPI: resource: do IRQ override on LENOVO IdeaPad Date: Tue, 4 Oct 2022 12:33:40 +0200 Message-Id: <20221004103341.12646-1-jirislaby@kernel.org> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org LENOVO IdeaPad Flex 5 is ryzen-5 based and the commit below removed IRQ overriding for those. This broke touchscreen and trackpad: i2c_designware AMDI0010:00: controller timed out i2c_designware AMDI0010:03: controller timed out i2c_hid_acpi i2c-MSFT0001:00: failed to reset device: -61 i2c_designware AMDI0010:03: controller timed out ... i2c_hid_acpi i2c-MSFT0001:00: can't add hid device: -61 i2c_hid_acpi: probe of i2c-MSFT0001:00 failed with error -61 White-list this specific model in the override_table. For this to work, the ZEN test needs to be put below the table walk. Fixes: 37c81d9f1d1b (ACPI: resource: skip IRQ override on AMD Zen platforms) Link: https://bugzilla.suse.com/show_bug.cgi?id=1203794 Cc: "Rafael J. Wysocki" Cc: Len Brown Cc: linux-acpi@vger.kernel.org Cc: Chuanhong Guo Cc: Tighe Donnelly Cc: Mario Limonciello Cc: Fridrich Strba Signed-off-by: Jiri Slaby (SUSE) --- drivers/acpi/resource.c | 42 +++++++++++++++++++++++++++-------------- 1 file changed, 28 insertions(+), 14 deletions(-) diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index 514d89656dde..8d13e94bb921 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -424,17 +424,31 @@ static const struct dmi_system_id asus_laptop[] = { { } }; +static const struct dmi_system_id lenovo_82ra[] = { + { + .ident = "LENOVO IdeaPad Flex 5 16ALC7", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "LENOVO"), + DMI_MATCH(DMI_PRODUCT_NAME, "82RA"), + }, + }, + { } +}; + struct irq_override_cmp { const struct dmi_system_id *system; unsigned char irq; unsigned char triggering; unsigned char polarity; unsigned char shareable; + bool override; }; -static const struct irq_override_cmp skip_override_table[] = { - { medion_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0 }, - { asus_laptop, 1, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0 }, +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_82ra, 6, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, true }, + { lenovo_82ra, 10, ACPI_LEVEL_SENSITIVE, ACPI_ACTIVE_LOW, 0, true }, }; static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity, @@ -442,6 +456,17 @@ static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity, { int i; + for (i = 0; i < ARRAY_SIZE(override_table); i++) { + const struct irq_override_cmp *entry = &override_table[i]; + + if (dmi_check_system(entry->system) && + entry->irq == gsi && + entry->triggering == triggering && + entry->polarity == polarity && + entry->shareable == shareable) + return entry->override; + } + #ifdef CONFIG_X86 /* * IRQ override isn't needed on modern AMD Zen systems and @@ -452,17 +477,6 @@ static bool acpi_dev_irq_override(u32 gsi, u8 triggering, u8 polarity, return false; #endif - for (i = 0; i < ARRAY_SIZE(skip_override_table); i++) { - const struct irq_override_cmp *entry = &skip_override_table[i]; - - if (dmi_check_system(entry->system) && - entry->irq == gsi && - entry->triggering == triggering && - entry->polarity == polarity && - entry->shareable == shareable) - return false; - } - return true; } From patchwork Tue Oct 4 10:33:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Slaby X-Patchwork-Id: 12998133 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 CA4A5C433FE for ; Tue, 4 Oct 2022 10:34:04 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229864AbiJDKeD (ORCPT ); Tue, 4 Oct 2022 06:34:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:34412 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229837AbiJDKdv (ORCPT ); Tue, 4 Oct 2022 06:33:51 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B18531EDC; Tue, 4 Oct 2022 03:33:50 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 1BAB4B819B0; Tue, 4 Oct 2022 10:33:49 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D12CAC4347C; Tue, 4 Oct 2022 10:33:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1664879627; bh=z316zTp9PCAkwnzApXdg+7WzQw2yLNucnQgZR9dXar0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=s4muEv07nW60xo5kEVHSSp+/WMZY3c6V2SgXq6gWzYnZ7cmpI7mfyCcIrRwjwUX4f XjDdOyAgyqD61gpkOQjR4ar9ijbfnJjPH8b8wS9XdSoB9p0REH8STYd3VQ9WcOvqzF 6kyL9V03CnKQ+s9Pis4XcrJ8TFmDUvpqGgiAOx4sd2mS256vbsqc2ODITmuW2b8QIL bSEZb+oDDaRbhgdyRngaSR/i5EVQJBBHhBduvoHK5PYhpIuOXCcHIL3TdP1GiGm2dm aF+YjU6wp1Htrc8Sr0WF0/EKOs00BTlhY73F0pn5luLGkblz82Ek4a3sbroaGVcQ/6 PadgFMBOrFeSw== From: "Jiri Slaby (SUSE)" To: rafael.j.wysocki@intel.com Cc: linux-kernel@vger.kernel.org, "Jiri Slaby (SUSE)" , "Rafael J. Wysocki" , Len Brown , linux-acpi@vger.kernel.org, Chuanhong Guo , Tighe Donnelly , Mario Limonciello Subject: [PATCH 2/2] ACPI: resource: note more about IRQ override Date: Tue, 4 Oct 2022 12:33:41 +0200 Message-Id: <20221004103341.12646-2-jirislaby@kernel.org> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221004103341.12646-1-jirislaby@kernel.org> References: <20221004103341.12646-1-jirislaby@kernel.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Use an exclamation mark to note which of the properties was overridden. Cc: "Rafael J. Wysocki" Cc: Len Brown Cc: linux-acpi@vger.kernel.org Cc: Chuanhong Guo Cc: Tighe Donnelly Cc: Mario Limonciello Signed-off-by: Jiri Slaby (SUSE) --- drivers/acpi/resource.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/acpi/resource.c b/drivers/acpi/resource.c index 8d13e94bb921..497d626185e4 100644 --- a/drivers/acpi/resource.c +++ b/drivers/acpi/resource.c @@ -508,8 +508,11 @@ static void acpi_dev_get_irqresource(struct resource *res, u32 gsi, u8 pol = p ? ACPI_ACTIVE_LOW : ACPI_ACTIVE_HIGH; if (triggering != trig || polarity != pol) { - pr_warn("ACPI: IRQ %d override to %s, %s\n", gsi, - t ? "level" : "edge", p ? "low" : "high"); + pr_warn("ACPI: IRQ %d override to %s%s, %s%s\n", gsi, + t ? "level" : "edge", + trig == triggering ? "" : "(!)", + p ? "low" : "high", + pol == polarity ? "" : "(!)"); triggering = trig; polarity = pol; }