From mboxrd@z Thu Jan 1 00:00:00 1970 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 DEF5DC76195 for ; Thu, 16 Mar 2023 16:33:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230374AbjCPQde (ORCPT ); Thu, 16 Mar 2023 12:33:34 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40876 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230377AbjCPQdS (ORCPT ); Thu, 16 Mar 2023 12:33:18 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5B071CF62; Thu, 16 Mar 2023 09:33:02 -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 sin.source.kernel.org (Postfix) with ESMTPS id 9F3E1CE1DDC; Thu, 16 Mar 2023 16:33:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D682AC433D2; Thu, 16 Mar 2023 16:32:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1678984379; bh=NP0Ls7B1aIxpGe0fZTWet09qyPVhMgouoYrI9T3wV+0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=vI70xHPN3RQp6+gFLKTDkVL0iMeEgbpJ96M6AJ9+9nABTC+DL9Tw6yy/7aUz7mI0A suVYq1s32RuH2Lhe1lhl5TKtIeta5xs996T2yL4pTMMoMX3YSHFqdIyZHtoG/Q2HPq ijin9ocQqVkHyiO5LMVyiLhgF9lBb5Nue/uP748IH2qCJzaYeLlpz5Cft6YfCW9epv +oR3l35jpftoHUoKmgM/N1RswuE0SleDJrq8VKju+m1Kln+ioF9QNB2+Doje/dmyLU OcIDhrX0kNeJ9hotZX8qg1sZUAo7kvcpIM2TtpcanoltMFv7jfHlkLrENVf0ZDBGRs inivMJKm+Ox9g== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mario Limonciello , Anson Tsao , "Rafael J . Wysocki" , Sasha Levin , rafael@kernel.org, philipp.zabel@gmail.com, hdegoede@redhat.com, Shyam-sundar.S-k@amd.com, peterz@infradead.org, linux-acpi@vger.kernel.org Subject: [PATCH AUTOSEL 6.2 5/7] ACPI: x86: Drop quirk for HP Elitebook Date: Thu, 16 Mar 2023 12:32:22 -0400 Message-Id: <20230316163227.708614-5-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230316163227.708614-1-sashal@kernel.org> References: <20230316163227.708614-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mario Limonciello [ Upstream commit e32d546c483a2a0f607687f5b521c2a2f942ffbe ] There was a quirk in `acpi/x86/s2idle.c` for an HP Elitebook G9 platforms to force AMD GUID codepath instead of Microsoft codepath. This was due to a bug with WCN6855 WLAN firmware interaction with the system. This bug is fixed by WCN6855 firmware: WLAN.HSP.1.1-03125-QCAHSPSWPL_V1_V2_SILICONZ_LITE-3.6510.23 Remove the quirk as it's no longer necessary with this firmware. Link: https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/commit/?id=c7a57ef688f7d99d8338a5d8edddc8836ff0e6de Tested-by: Anson Tsao Signed-off-by: Mario Limonciello Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/x86/s2idle.c | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/drivers/acpi/x86/s2idle.c b/drivers/acpi/x86/s2idle.c index c7afce465a071..e499c60c45791 100644 --- a/drivers/acpi/x86/s2idle.c +++ b/drivers/acpi/x86/s2idle.c @@ -384,29 +384,6 @@ static const struct acpi_device_id amd_hid_ids[] = { {} }; -static int lps0_prefer_amd(const struct dmi_system_id *id) -{ - pr_debug("Using AMD GUID w/ _REV 2.\n"); - rev_id = 2; - return 0; -} -static const struct dmi_system_id s2idle_dmi_table[] __initconst = { - { - /* - * AMD Rembrandt based HP EliteBook 835/845/865 G9 - * Contains specialized AML in AMD/_REV 2 path to avoid - * triggering a bug in Qualcomm WLAN firmware. This may be - * removed in the future if that firmware is fixed. - */ - .callback = lps0_prefer_amd, - .matches = { - DMI_MATCH(DMI_BOARD_VENDOR, "HP"), - DMI_MATCH(DMI_BOARD_NAME, "8990"), - }, - }, - {} -}; - static int lps0_device_attach(struct acpi_device *adev, const struct acpi_device_id *not_used) { @@ -586,7 +563,6 @@ static const struct platform_s2idle_ops acpi_s2idle_ops_lps0 = { void __init acpi_s2idle_setup(void) { - dmi_check_system(s2idle_dmi_table); acpi_scan_add_handler(&lps0_handler); s2idle_set_ops(&acpi_s2idle_ops_lps0); } -- 2.39.2