From patchwork Wed Feb 7 08:44:51 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Drake X-Patchwork-Id: 197795 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2093686dyb; Wed, 7 Feb 2024 00:56:26 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCX/WL2Sp6D23GV78q9KYrJjwE7XtNldJAUorV9mrwU5mT4yp4pL3j96obcjU2MZkR9O/PIKGPwuIObQevQWAwQt7YgiNQ== X-Google-Smtp-Source: AGHT+IHIRLO5QSPbfGYZ20T5sqRaczJah7fPuWOl4k2f9hfHSizjkOLHo8gL7ASsZdiHNzCPyI9H X-Received: by 2002:a2e:980c:0:b0:2d0:c541:b8a1 with SMTP id a12-20020a2e980c000000b002d0c541b8a1mr1225343ljj.49.1707296186425; Wed, 07 Feb 2024 00:56:26 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707296186; cv=pass; d=google.com; s=arc-20160816; b=jmUq24yU4OYlvRJbko8PMLcTa9uaFgPpldGqlzqr1yFnRHgzgF3pUoKRj+fXi59mFs QqsVTpW6nSbipvD1pNnnRcfApzmKfpCWmOdAAPMTG9+8uOSmP+c/Hz+mEC742X0b3eSJ W5tU0AhLVYzSqGruo3YEV+0Je8Y2LhCfnY2XUzncRisCxU/kQCHQ7IDaUTwHH7Yi0F5z I+LKNlu81mZfP16B/ghABqoXhXcNDcRAYdT79XiM/AGJivXGntIyF4PZWdtUJ8S1eqv3 5XJxVoQcNYGF7Vw3FppossKErYbv5yI7+HfRgLpv6Ht1MDeKZDWvZh2BmPBMYUPNf1Nu x8ng== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=NAeXDExjFp8LIE+XwnvVYSsXych5ypTHEBtl908GHMU=; fh=I1GIzMWitYrKZEV95XM+VytuOprRrG48kw1UYcZQ5Mk=; b=wkUo1IGsCVxXK96O/1u2Z+R3CC3nTImZnSZTnNlmENhtq0r9OgNbuHLMehjf4wdK3j gs8mARRVLI/E8/Rp+cRsA9qNW6WNkrg59m/zMOPsgvkIky2xd4q1YBGTj37hK+q6BxZl 3xwx4dWMIgRncRS4THAPKnOQEigYUc+SrWpXtitzAUM47pHYZjEBsG9IRSBVwPbAuMp0 MVDFEuJDWrLMpUWzQUsBX1jfHK3n7nUi27bOG+OZZye+tpmLU2b9wHC1aNmRXbhJqldS 8LYDFnyWRmadPxX65YyyBXxFZn5sRFitaM0RMg7KOKszvreb7VcBIc2M1CFpwi6Nq2AB r0mA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@endlessos.org header.s=google header.b=vSAAENbS; arc=pass (i=1 spf=pass spfdomain=endlessos.org dkim=pass dkdomain=endlessos.org dmarc=pass fromdomain=endlessos.org); spf=pass (google.com: domain of linux-kernel+bounces-56138-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56138-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=endlessos.org X-Forwarded-Encrypted: i=2; AJvYcCWTgwSBW3wUlxrny2k0XODLUW237h6p5zIJ3iyHFFH8i3mOnBNZvoSdnkH1GCn6w9HZaK7A/G6Rp1WRQsTkUWt2vz/46g== Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id v5-20020aa7cd45000000b00560c0f4aff4si592435edw.93.2024.02.07.00.56.26 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 00:56:26 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-56138-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@endlessos.org header.s=google header.b=vSAAENbS; arc=pass (i=1 spf=pass spfdomain=endlessos.org dkim=pass dkdomain=endlessos.org dmarc=pass fromdomain=endlessos.org); spf=pass (google.com: domain of linux-kernel+bounces-56138-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56138-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=endlessos.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 88DF11F21D91 for ; Wed, 7 Feb 2024 08:46:14 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id A01C7219E9; Wed, 7 Feb 2024 08:45:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=endlessos.org header.i=@endlessos.org header.b="vSAAENbS" Received: from mail-ej1-f52.google.com (mail-ej1-f52.google.com [209.85.218.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 7088A208C5 for ; Wed, 7 Feb 2024 08:44:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.218.52 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707295501; cv=none; b=ZK5yotztXw4A04mZ8jtW9bwreVsQD/nB4PUQptA20pLB93ICdGcILbjTnOCWKgnG2JU7tsES9txXZny0ZKD+uVKXujzzLPKLz7OxtzWaAUeFNdaYqrpe9w+UvpKHT4R5ZLCdtllk1UHpxbCw/FlLt1uzqS7N6TuR0D1v8HMCVBE= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707295501; c=relaxed/simple; bh=H2Xrmgvl+SM8bD81WrtzhSJbxFmN+3cpc89YY2RXfaY=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version; b=i3znl7cwLrUPf3f3wBYaUxiLOLscjinNaFopyIIxHuGLQlzYSOAqMhrxRI9IZPm7Gk7UqcQhziAHg+1sKi5wypxSBiZCff95JO6lWpvlumlFxQm1Wfy0le6EecvoE8TWSveKs3x6cbhN2v8DbHGQgiU0HSYNbltEUM1ck4iqtZg= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=endlessos.org; spf=pass smtp.mailfrom=endlessos.org; dkim=pass (2048-bit key) header.d=endlessos.org header.i=@endlessos.org header.b=vSAAENbS; arc=none smtp.client-ip=209.85.218.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=endlessos.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=endlessos.org Received: by mail-ej1-f52.google.com with SMTP id a640c23a62f3a-a27e7b70152so15442566b.0 for ; Wed, 07 Feb 2024 00:44:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessos.org; s=google; t=1707295497; x=1707900297; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=NAeXDExjFp8LIE+XwnvVYSsXych5ypTHEBtl908GHMU=; b=vSAAENbS7Ku2Cqif8kivUKMCOsd2sJ6WRog0B7TL9tw14zwYyeGsdJiioa9HcpxjYH yFYKzcUmiOgF3shyP8ydFwJdundQFs+w7cg1WHkh/v3EsFa1j0I7J7fR8FFixarJakIM e/TmlquDXXR+gW75yxBoqmayaaM8FZLxWZM4iXxTf+Et2HOgCgwRMfYx51U61re5lgLk 68lBmBqWHaxRyWxOTpcVz7zv1ApCIglTkaK1ymGvDeudkwFlpYZqITNQH3tLXzGjBx3j SKsTEMZ8BLClFY9A60YrZzZ197omQAHirIw3gnjnjVDJO+l3si1m9O1FbMYmkmyVxAyL rosw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707295497; x=1707900297; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=NAeXDExjFp8LIE+XwnvVYSsXych5ypTHEBtl908GHMU=; b=UP0dS+S4ZMbwu7fPxK9WCSo0VkY0USMEAfX36GWFR0Z1okz88xJDdRAHC+SvBWAzh0 9gwU9xcOpusZ6UTKX87DeHxApTCE++NHOfqGMt1/F2Ct/yIF8gWOqf3XWC0VunQ1rCG2 BNva56kyyOgf1kMyc0x3NSXW7m1OrBj6tXbuomPEyq/leg4V88U1C/lRs9UbQRSB1tvi 6og7merWkkjtMrzBTJK4SxfkPMP4pI+OpUjIVXCrLgWKwGOpxCjw6HP09e3r7h/Prncm fRAoIkfvwvJxF7S7TCm4QwdNdY4FeTb5FEw3iaQrmIsMy2e7gAc5KO1GqKJdZXIDYYPX dszA== X-Forwarded-Encrypted: i=1; AJvYcCWzAVRld0ieSoTJPWKAxYPpNIY9GaKPNTBhe0r/kfTaknUVNRtw6qDWrSPtKXQ121n92HUUESp8FLPS4a6yuh/JTR4W+ORUTLQOCPLf X-Gm-Message-State: AOJu0YyWMCLx+OWNPZX0dXGqUwwaXIT5h6uZGsMi1Lx2g0sQlfL7RMVv MiqXXGUljLyErNCNiRYRAuJkKp27STuNskKhvutas5NGBVKw0AXgPqMjPd/+Jek= X-Received: by 2002:a17:907:7e9b:b0:a38:4eae:b129 with SMTP id qb27-20020a1709077e9b00b00a384eaeb129mr2455655ejc.3.1707295496181; Wed, 07 Feb 2024 00:44:56 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCXD4y+Ezus4AOUzHyJWgh6A6hXrLCrVZBKoWkE0W3oEF/JTD27sbTQK6xQyoJWrBnAUfEZWhID+7mlpMNEKd0kkmQ8o77b4Y4bmYcPaw/sBKUTPNwC+HeAFtFCLPfQ1Xopv4i9LgSzYqZym2Mh9140t6KoFQ0PyOxXiph2KN2ByJAQxH6tvOwNzJMJ5Xkg7LVrG1z7K+HI7sicNl2P0uvx85Xi8vsUDv4Q+m7Ub+TQIEY2rXUtq+PIDrqGbLrq60Gf1xTCtKlwncMj3Cwlnfn8tA4jqgSPeuRjIvvB1eMhsJ1jisXpgeRm+z6/C2DftlpuYaNrrv6M2qY0q4k3L67RYdQRoyu1blHhC+8GDzTLMUyBhe68ONUhSjwSvWaFWt4cDJZplbpJgFCPDfY2Fb/XgSa5RGwSlY9sXuaDwH9Swb69jpyiYR8Fn5exbH1LCzPMw47UFUas= Received: from limbo.local ([2a00:1bb8:11e:cb8d:24dc:94bb:6d8:7d12]) by smtp.gmail.com with ESMTPSA id u25-20020a1709060b1900b00a370a76d3a0sm493921ejg.123.2024.02.07.00.44.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 00:44:55 -0800 (PST) From: Daniel Drake To: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org Cc: hpa@zytor.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, bhelgaas@google.com, david.e.box@linux.intel.com, mario.limonciello@amd.com, rafael@kernel.org, lenb@kernel.org, linux-acpi@vger.kernel.org, linux@endlessos.org Subject: [PATCH v2 1/2] PCI: Disable D3cold on Asus B1400 PCI-NVMe bridge Date: Wed, 7 Feb 2024 09:44:51 +0100 Message-ID: <20240207084452.9597-1-drake@endlessos.org> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790229806045748929 X-GMAIL-MSGID: 1790229806045748929 The Asus B1400 with original shipped firmware versions and VMD disabled cannot resume from suspend: the NVMe device becomes unresponsive and inaccessible. This is because the NVMe device and parent PCI bridge get put into D3cold during suspend, and this PCI bridge cannot be recovered from D3cold mode: echo "0000:01:00.0" > /sys/bus/pci/drivers/nvme/unbind echo "0000:00:06.0" > /sys/bus/pci/drivers/pcieport/unbind setpci -s 00:06.0 CAP_PM+4.b=03 # D3hot acpidbg -b "execute \_SB.PC00.PEG0.PXP._OFF" acpidbg -b "execute \_SB.PC00.PEG0.PXP._ON" setpci -s 00:06.0 CAP_PM+4.b=0 # D0 echo "0000:00:06.0" > /sys/bus/pci/drivers/pcieport/bind echo "0000:01:00.0" > /sys/bus/pci/drivers/nvme/bind # NVMe probe fails here with -ENODEV This appears to be an untested D3cold transition by the vendor; Intel socwatch shows that Windows leaves the NVMe device and parent bridge in D0 during suspend, even though these firmware versions have StorageD3Enable=1. Experimenting with the DSDT, the _OFF method calls DL23() which sets a L23E bit at offset 0xe2 into the PCI configuration space for this root port. This is the specific write that the _ON routine is unable to recover from. This register is not documented in the public chipset datasheet. Disallow D3cold on the PCI bridge to enable successful suspend/resume. Link: https://bugzilla.kernel.org/show_bug.cgi?id=215742 Signed-off-by: Daniel Drake Signed-off-by: Jian-Hong Pan --- arch/x86/pci/fixup.c | 45 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) v2: Match only specific BIOS versions where this quirk is required. Add subsequent patch to this series to revert the original S3 workaround now that s2idle is usable again. diff --git a/arch/x86/pci/fixup.c b/arch/x86/pci/fixup.c index f347c20247d30..6b0b341178e4f 100644 --- a/arch/x86/pci/fixup.c +++ b/arch/x86/pci/fixup.c @@ -907,6 +907,51 @@ static void chromeos_fixup_apl_pci_l1ss_capability(struct pci_dev *dev) DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x5ad6, chromeos_save_apl_pci_l1ss_capability); DECLARE_PCI_FIXUP_RESUME(PCI_VENDOR_ID_INTEL, 0x5ad6, chromeos_fixup_apl_pci_l1ss_capability); +/* + * Disable D3cold on Asus B1400 PCIe bridge at 00:06.0. + * + * On this platform with VMD off, the NVMe's parent PCI bridge cannot + * successfully power back on from D3cold, resulting in unresponsive NVMe on + * resume. This appears to be an untested transition by the vendor: Windows + * leaves the NVMe and parent bridge in D0 during suspend. + * This is only needed on BIOS versions before 308; the newer versions flip + * StorageD3Enable from 1 to 0. + */ +static const struct dmi_system_id asus_nvme_broken_d3cold_table[] = { + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_BIOS_VERSION, "B1400CEAE.304"), + }, + }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_BIOS_VERSION, "B1400CEAE.305"), + }, + }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_BIOS_VERSION, "B1400CEAE.306"), + }, + }, + { + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), + DMI_MATCH(DMI_BIOS_VERSION, "B1400CEAE.307"), + }, + }, + {} +}; + +static void asus_disable_nvme_d3cold(struct pci_dev *pdev) +{ + if (dmi_check_system(asus_nvme_broken_d3cold_table) > 0) + pci_d3cold_disable(pdev); +} +DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_INTEL, 0x9a09, asus_disable_nvme_d3cold); + #ifdef CONFIG_SUSPEND /* * Root Ports on some AMD SoCs advertise PME_Support for D3hot and D3cold, but From patchwork Wed Feb 7 08:44:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Drake X-Patchwork-Id: 197794 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:168b:b0:106:860b:bbdd with SMTP id ma11csp2090932dyb; Wed, 7 Feb 2024 00:48:30 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWf9zS7mUC4AGfV/fyNH8kDv5quey4vBXTnrsRPi5xNmYPdYwp0kBDsHNil7SsUMWmGn2SMr68bu4JkpTYBzZc5IxkBhg== X-Google-Smtp-Source: AGHT+IGYWJjskqihS74ousaLtrAXyrwccoRXxVmAtAmR/9U2rBek1aAxDkiWvefRB5S9hUEN/RZf X-Received: by 2002:a17:90b:1b0a:b0:296:9d63:1d9f with SMTP id nu10-20020a17090b1b0a00b002969d631d9fmr2109302pjb.47.1707295709894; Wed, 07 Feb 2024 00:48:29 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1707295709; cv=pass; d=google.com; s=arc-20160816; b=UfkwW6LuVIhzIlmliOX2CLjK88Ec1KbzvbeulWrUVkMhTn2fXIv74e9dpFO0ypT4BU XQREHNRtnC4tHMYu1lv6WqNe/sdpUWYckuBKmJk+wbEU/E/iLIKN8q/qQ70ofsikZSdI 2MOB53XYTgClX5MnVcG4mE+/jVkqMHcW/6kfweI/fEYlrf0ZWq7X2oMfs0M3cj00jlvy eIvv0tEmIb21/tIuIdACy7Ebdxy2MCK/5h/64iIcXrL8i7AthyP71blhilnEw4ROBKSR ErwrIUKo4H/aNuwAIjBbDnyByitVZlJ7tes4GiC/m6x+42dGgRI2z/QeenRPir2rexTZ 07sQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=iIQKW6QdXz2vaR/7LGjw7ltrzBRpHViscM3vHYU14HI=; fh=LwhQROkPrI0BNzD2MT7N7RgR90Wf5aPASHsucxC8D7I=; b=x/wbg1Y87PRNoeg/EQwGAqs95j7EU0fBJeAMaq7o3UmXHODh/6QqiPi0eo4FLMeWY8 yfvWEhqdaCXzRjGLogOw5KFDDlfCjYESRhztzn16WVOt7C8HmeTkjLv2lDmWu1msgIHy 6FWItSuzseVl0xMBydGSZKiaXKKGxR/u0cs+mTqLUphrkc2dny/rV4g8h06OhCI0WUpT yMAOmSNT4qIautrcEUVTcVKFn/n54EIuPT+XKV6e91T3qsFolyF1mJ7jqsXPy20d8B7I woHRR68GcI8sDLQuzF/zZoAbqvI1xpY6Yek4W5FaFgSV4yoUZUdbhik0sgz3CPTISq51 1hkQ==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@endlessos.org header.s=google header.b=osqGZLas; arc=pass (i=1 spf=pass spfdomain=endlessos.org dkim=pass dkdomain=endlessos.org dmarc=pass fromdomain=endlessos.org); spf=pass (google.com: domain of linux-kernel+bounces-56139-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56139-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=endlessos.org X-Forwarded-Encrypted: i=2; AJvYcCXjCuNwwG9UosbUrD3cS93Src1daU5n6B1ViERZY39pbq8iOtjiwHReU0RJUohnPSFUDIB7Rplf+BO5UNyssIXF3OuBrg== Received: from sy.mirrors.kernel.org (sy.mirrors.kernel.org. [2604:1380:40f1:3f00::1]) by mx.google.com with ESMTPS id y22-20020a17090aa41600b00296e1c56241si902718pjp.61.2024.02.07.00.48.29 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 00:48:29 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-56139-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) client-ip=2604:1380:40f1:3f00::1; Authentication-Results: mx.google.com; dkim=pass header.i=@endlessos.org header.s=google header.b=osqGZLas; arc=pass (i=1 spf=pass spfdomain=endlessos.org dkim=pass dkdomain=endlessos.org dmarc=pass fromdomain=endlessos.org); spf=pass (google.com: domain of linux-kernel+bounces-56139-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:40f1:3f00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-56139-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=endlessos.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sy.mirrors.kernel.org (Postfix) with ESMTPS id 26E86B268DE for ; Wed, 7 Feb 2024 08:46:16 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C724122307; Wed, 7 Feb 2024 08:45:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=endlessos.org header.i=@endlessos.org header.b="osqGZLas" Received: from mail-ed1-f41.google.com (mail-ed1-f41.google.com [209.85.208.41]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1D03B208CE for ; Wed, 7 Feb 2024 08:44:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.41 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707295501; cv=none; b=k+6XcAz8lZa9WYAuJ+cyzQ/iiDIcD2x+mpDXJnOzruhOIFzE9fGryiyHcQUGbueBFzyIarG0hjg20VI9XGUV5RBO/79FcBE5oc5MBHY1GsY7H9qEGGE1DQwyt5mHkASSmc6oCgH8kzSZ/zFnqHRbRwU/u1hqORRldPEDx+ZjwvY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1707295501; c=relaxed/simple; bh=YTPZcSINU7lQwWahDe2E8XZsVbApJNCaAHRu8Dse6tU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jdn4+xxoA9clFVM4rultjp+ddAe9LXUshv8XKkI7v2QQYDkwLeiDZKvltNrhFTIW5YNtR4N2e9+PIx24NtX37OQKzae/Mmm8nv90Dr6bUyUVbQlA3XDZJpCLVA24po/ZGB+n0aDSAZRHxLccr+aECrzXkZr9NjrYI0gGMLnN8BI= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=endlessos.org; spf=pass smtp.mailfrom=endlessos.org; dkim=pass (2048-bit key) header.d=endlessos.org header.i=@endlessos.org header.b=osqGZLas; arc=none smtp.client-ip=209.85.208.41 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=endlessos.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=endlessos.org Received: by mail-ed1-f41.google.com with SMTP id 4fb4d7f45d1cf-55369c59708so65479a12.1 for ; Wed, 07 Feb 2024 00:44:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=endlessos.org; s=google; t=1707295498; x=1707900298; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=iIQKW6QdXz2vaR/7LGjw7ltrzBRpHViscM3vHYU14HI=; b=osqGZLaszV5i952siEuXVuXpU4pa2ukrtQTJ5NboL+LFW/HD3NFChW/6s8ZIMQ/ATl PMgZio+MSsL/YkZaW2PJnQ4OGdkJQ1WTWpkZ2mn4pw3HVe8ifkeI4kXMq7Qng1ewkXsZ 7/C8H1i+kYVBbEZg4GoVvRyWd794YkqY48V3z/XmwqDlGJALSafSMUZVNQO77/ztdKnd Zrb83d6qqNgACfZH4IDyltWGcagPZ8gyef2R2myC6E8rwt5tjqU6AnSXaGGL2bFjTxm/ CgvNxodJgGTZj5iOtpSE9wgdpbZGx25coHhYJYaulYAsBBZp3PqkQu09yo1lXjhz5i/2 311Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707295498; x=1707900298; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=iIQKW6QdXz2vaR/7LGjw7ltrzBRpHViscM3vHYU14HI=; b=imZmAERN8rwMXk/B/N9MtIGHXD1/cOit4xhFIwqkK1blpvyyAMp73yBNQyADWntqri /5xBdv62+BNBXml4bJfmr9aASr58gDTsfYnibg6xRPJGyAoV0QVEOPpvu9DnqO5+qD/m SHQHGr0Rca1e1JMgn21ScgYq2WdTpB0bDIxoSztV4nLcI3wUI+yR0NdCywe3Sua3cChu mt0wiveJctP1GCHl/wFulDceLov2pyNwWbNsTRQbQUZeE3Dow6ftS2t6NEw5vEaRb0H4 7NxPU4oSYAHyPKdos5ie3NPWDkGWGaiH+XBq2qehZOitA8VScabn+9qUFfV5uT5pxlNw BNMQ== X-Forwarded-Encrypted: i=1; AJvYcCVu+UmkXe3ESDAiyeXzXiU+TZm30kMWmVaFm3DeTSjHBZdM0VvFbi+aMUBW9RidNRPUPL/s0btz8ONUtfcv5YHz+Ls6Ghu5sI0kFCDg X-Gm-Message-State: AOJu0Yy/qp3sC77n2f1O+CV5ylsc8/+6dkcFhoI8Lw3JvXVtkRdSelCL GYmmOY16J5sWlrqhX4lsXA3r1lyBXx64Zml8AzRg8wz57L+oCAmlpPEZ6fY8Blg= X-Received: by 2002:a17:906:468a:b0:a38:24ba:99d9 with SMTP id a10-20020a170906468a00b00a3824ba99d9mr2634457ejr.6.1707295498258; Wed, 07 Feb 2024 00:44:58 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVGH4z0ynpHbcdPWjccBmirwpr3RXHiKwQz/4yWilxX6y5d8K7JDWFBuswl8k9B+OKS9Mm7LXDGgBtK6rMDrNslFrHbP62gg13S7+N1X3kONw5MQ8vfM6kACCRtbo/IgWf/7Y33j669EFCiyCXAb94QwiatHul1ddzcqMJjAGefasOy8kOQV9rHnwdeZIzlEmu7m2xlnQehh1ZY4Ob3SWmoqKC7BnghVi0bpOLYsTaUw6Hw3zDeWlAUPm+XtqX5m393cNJcG0rdo6z3PHyxCH7OlrKeUOARFLfvYOc37lFI7OcLXlrhRlW/KhKZ8U6ye8iLMHBG2X0XrOEdoAqig/oaLdO6dVkYYGSaIAPbOkS62rNxP2V9RfdVQ5Wl9SpZVjc0PZY3Z/b003h539igAtOurKUFp4IueZ3vdsxx+j4kHrW4hmASuX+1vUBuayzxDLYeLPCsrho= Received: from limbo.local ([2a00:1bb8:11e:cb8d:24dc:94bb:6d8:7d12]) by smtp.gmail.com with ESMTPSA id u25-20020a1709060b1900b00a370a76d3a0sm493921ejg.123.2024.02.07.00.44.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 00:44:57 -0800 (PST) From: Daniel Drake To: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org Cc: hpa@zytor.com, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org, bhelgaas@google.com, david.e.box@linux.intel.com, mario.limonciello@amd.com, rafael@kernel.org, lenb@kernel.org, linux-acpi@vger.kernel.org, linux@endlessos.org Subject: [PATCH v2 2/2] Revert "ACPI: PM: Block ASUS B1400CEAE from suspend to idle by default" Date: Wed, 7 Feb 2024 09:44:52 +0100 Message-ID: <20240207084452.9597-2-drake@endlessos.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240207084452.9597-1-drake@endlessos.org> References: <20240207084452.9597-1-drake@endlessos.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1790229306554402300 X-GMAIL-MSGID: 1790229306554402300 This reverts commit d52848620de00cde4a3a5df908e231b8c8868250, which was originally put in place to work around a s2idle failure on this platform where the NVMe device was inaccessible upon resume. After extended testing, we found that the firmware's implementation of S3 is buggy and intermittently fails to wake up the system. We need to revert to s2idle mode. The NVMe issue has now been solved more precisely in the commit titled "PCI: Disable D3cold on Asus B1400 PCI-NVMe bridge" Link: https://bugzilla.kernel.org/show_bug.cgi?id=215742 Signed-off-by: Daniel Drake Signed-off-by: Jian-Hong Pan --- drivers/acpi/sleep.c | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/drivers/acpi/sleep.c b/drivers/acpi/sleep.c index 808484d112097..728acfeb774d8 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -385,18 +385,6 @@ static const struct dmi_system_id acpisleep_dmi_table[] __initconst = { DMI_MATCH(DMI_PRODUCT_NAME, "20GGA00L00"), }, }, - /* - * ASUS B1400CEAE hangs on resume from suspend (see - * https://bugzilla.kernel.org/show_bug.cgi?id=215742). - */ - { - .callback = init_default_s3, - .ident = "ASUS B1400CEAE", - .matches = { - DMI_MATCH(DMI_SYS_VENDOR, "ASUSTeK COMPUTER INC."), - DMI_MATCH(DMI_PRODUCT_NAME, "ASUS EXPERTBOOK B1400CEAE"), - }, - }, {}, };