From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E00891C5AA8; Fri, 29 Mar 2024 12:45:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711716303; cv=none; b=uz2UdrRAE0ZkrZFT6Ou22TAZOrUbdRppiESo5ahNR0WpBSpvQq7NlDcLz7vK38iMjkLn+jbsI0CAb0EEETWWMtVQJQvVVpf7YX+InZlFUsxxaq0QJ4C+/R0qG+m7N1AVWYZlQAuH3DwzXq3qOhdwpZWXJZ6QQInm0V79WH+c1aA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711716303; c=relaxed/simple; bh=/QjzGuuut/USs5wAY2EV1/61sfdJ81IHHQB48v+JzWM=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=alagrTXiOF2g9ph3suv1Z39nBKfVHgao1YSKKg8h9JVzNl9hbRn6t111okA10MFeVdcmYKkfYIlDrzJ/Himm+/nieBTxaN59UCRVGNjM24ub71YGQNCzpzybesIp7Z4Q3rna097d+3TfLcX492wd184038ffIe5xH1h/vgt8TyM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=FiOun3hH; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="FiOun3hH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8F866C433B1; Fri, 29 Mar 2024 12:45:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711716302; bh=/QjzGuuut/USs5wAY2EV1/61sfdJ81IHHQB48v+JzWM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=FiOun3hHF65EfYPKOB8+Bqkw7+C+wUpiU97y4FFMcuS5EDciXAXs1A8zEBm0v7TxR Zt2NBmdGEfs/i+bXMFaI4HXBqUqN1jLXuUc+8Hs8JvJtEKAfxHuECNVpg7q60UCd6A 4KtzSiYbDd0Zz0bD+Kx4A/Sej+3SfapoCEAjqT8vJS94x6RYlp9eMb4pkxpdqxhU4d q8KCNE7kB2GxRFhtq0gu0A2xjw6OL6w9NQe+uyeNaRDMoiGUO+GWSh/0b0qJsb4nFg bbMs5si8FzNzHRfMLyIgm0M0AFZnZpbjcqRgGOVqCLB0kg9ETNOEFBdTNxH6Pv04mE pGza2USAxaBug== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Daniel Drake , Bjorn Helgaas , Jian-Hong Pan , "Rafael J . Wysocki" , Sasha Levin , linux-acpi@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 49/75] Revert "ACPI: PM: Block ASUS B1400CEAE from suspend to idle by default" Date: Fri, 29 Mar 2024 08:42:30 -0400 Message-ID: <20240329124330.3089520-49-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240329124330.3089520-1-sashal@kernel.org> References: <20240329124330.3089520-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-acpi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6.23 Content-Transfer-Encoding: 8bit From: Daniel Drake [ Upstream commit cb98555fcd8eee98c30165537c7e394f3a66e809 ] 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 Link: https://lore.kernel.org/r/20240228075316.7404-2-drake@endlessos.org Signed-off-by: Daniel Drake Signed-off-by: Bjorn Helgaas Acked-by: Jian-Hong Pan Acked-by: Rafael J. Wysocki Signed-off-by: Sasha Levin --- 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"), - }, - }, {}, }; -- 2.43.0