From patchwork Mon Oct 24 11:32:35 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9579 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp527739wru; Mon, 24 Oct 2022 09:01:15 -0700 (PDT) X-Google-Smtp-Source: AMsMyM4fRR8TDZOAoa5uH9O5QeMjqz1yMO2fgjyiLm1PqY07vwlKYw4AFwVoxoVxlOKL2Vl7lM4X X-Received: by 2002:a17:906:7621:b0:750:c4a3:8fcd with SMTP id c1-20020a170906762100b00750c4a38fcdmr29595294ejn.180.1666627275384; Mon, 24 Oct 2022 09:01:15 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666627275; cv=none; d=google.com; s=arc-20160816; b=ptczjWzjP3lCBpO2gccAKyXFGOqekFFnwekE9s28lcwKj1vTpDMop9KNTEhAGmT3Bs tD1isyblbWf5FGUVq9gnhbc2H99odZD0RQF5VUqOhVVZEA39HcXIHhiyhs8b0wlnSSFO 8SrwSCCvEbmpCREuuYv+Z0/d+fCluQDXGCFLHJ/cZWfAjU6staiR4ZZxom19QOhomtHo YumWVpgcJkjBp+mqbL0KW1qWALKQLJ5dPdipxpdKsi1w7EetY/Sav2t/Q+izqMbUraEI 8jhF3NodYslW05DK45zUTw94dIWEcNVd0CWi3TH9sni3T5HbBLpdwhaUtlZuuGpMnAoi w01A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=vVgVxbrpv6Vlds6UZz8MzTv+NMZc77UjXXa5Fq/Z23Q=; b=PRDqiEBl3l/jyZK03lNRq4nuzyey2BSdIH2sH2B8HKlcEP0nWeZ1qPzL92HsJXyBgf pMork1k9B/kcPrM0jpRwAE+pJGSzlXTB1TrdOxtJ9EHM9kLp3f8DMQaCDBSxRxV+APXJ 1VSBgH1/k1+ptR+JixB/UB6BPcLpBNgxsgzH2kG8nHLFDVIoiMtxOF2OaNcQT/PKTKbx yE+DKsc+tIAwqu690nlKMQXYXYtCC9+AYaBA/JvQ756ZKqb99Bv5Hjaa5bKHNXpWvj2C WofgqH8s8GJsutIwNy9J1LTD7hPc/+tfHaandMJlKnWLfSIbtATrKtrAJQsuMLrYcjjd u2fA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JBuKYyqF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id nd32-20020a17090762a000b0078e1e216396si151239ejc.66.2022.10.24.09.00.47; Mon, 24 Oct 2022 09:01:15 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=JBuKYyqF; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232289AbiJXP64 (ORCPT + 99 others); Mon, 24 Oct 2022 11:58:56 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35566 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232106AbiJXP57 (ORCPT ); Mon, 24 Oct 2022 11:57:59 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BC1BD9A9FF; Mon, 24 Oct 2022 07:53:21 -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 5FB31B819FE; Mon, 24 Oct 2022 12:51:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id AD608C433D6; Mon, 24 Oct 2022 12:50:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615859; bh=EvJC7ybRO4I0b2bkGMWAtdvSSua1BQZEEPWytH/fjio=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JBuKYyqFqS6FSeYLonhtulUOLs2hcvnoJFD4C7BBOjxV2lX7K8LiRUKUEW67bIbcv XPeJXpCXAgDPPPsQ6zu4H+k8IgYLLcDElcbke9x4wUJZRjUKU+19Ly6NVqVV0DBblM sc9a0Gi30KJ1uZ2v134omCazAGv1V12j3iPAzBIU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mario Limonciello , Hans de Goede , "Rafael J. Wysocki" , Sasha Levin , Luya Tshimbalanga Subject: [PATCH 5.15 411/530] ACPI: x86: Add a quirk for Dell Inspiron 14 2-in-1 for StorageD3Enable Date: Mon, 24 Oct 2022 13:32:35 +0200 Message-Id: <20221024113103.692523351@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747585362158308633?= X-GMAIL-MSGID: =?utf-8?q?1747585362158308633?= From: Mario Limonciello [ Upstream commit 018d6711c26e4bd26e20a819fcc7f8ab902608f3 ] Dell Inspiron 14 2-in-1 has two ACPI nodes under GPP1 both with _ADR of 0, both without _HID. It's ambiguous which the kernel should take, but it seems to take "DEV0". Unfortunately "DEV0" is missing the device property `StorageD3Enable` which is present on "NVME". To avoid this causing problems for suspend, add a quirk for this system to behave like `StorageD3Enable` property was found. Link: https://bugzilla.kernel.org/show_bug.cgi?id=216440 Reported-and-tested-by: Luya Tshimbalanga Signed-off-by: Mario Limonciello Reviewed-by: Hans de Goede Signed-off-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- drivers/acpi/x86/utils.c | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/drivers/acpi/x86/utils.c b/drivers/acpi/x86/utils.c index b3fb428461c6..3a3f09b6cbfc 100644 --- a/drivers/acpi/x86/utils.c +++ b/drivers/acpi/x86/utils.c @@ -198,7 +198,24 @@ static const struct x86_cpu_id storage_d3_cpu_ids[] = { {} }; +static const struct dmi_system_id force_storage_d3_dmi[] = { + { + /* + * _ADR is ambiguous between GPP1.DEV0 and GPP1.NVME + * but .NVME is needed to get StorageD3Enable node + * https://bugzilla.kernel.org/show_bug.cgi?id=216440 + */ + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "Dell Inc."), + DMI_MATCH(DMI_PRODUCT_NAME, "Inspiron 14 7425 2-in-1"), + } + }, + {} +}; + bool force_storage_d3(void) { - return x86_match_cpu(storage_d3_cpu_ids); + const struct dmi_system_id *dmi_id = dmi_first_match(force_storage_d3_dmi); + + return dmi_id || x86_match_cpu(storage_d3_cpu_ids); }