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 A345C144D34; Thu, 11 Apr 2024 10:11:09 +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=1712830269; cv=none; b=K+Fa5TjKPYo1tDR4BUDjh3a54uN5elAiaFJ5xnVwHxpHh5WCWMGWOM26/7JKiOzxUu3G/Af1Pj1mFHlkv9TYefUiF1QOEAKgJWW4PArTBY2Hpv3X1P0kXVb1I02TJ67yX4MK1xVy2FBBJhevfJJkUwiaYZ4kIBIgV/eBTqCAA2E= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1712830269; c=relaxed/simple; bh=6jPvWZmloux/iNeWorem3hFmXIwpQ9g60fkllB/nsCk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G4srEc4vr8VihAi5ntyTI9T72gi0N9NfdGIfiqas++zyyQsxppfiUIPk9n2YtUZJRjxBMWA3g3Qgy2IE9gba7KdCGHp0r4diJehROEOCShFEQKiG23OZjBGZotmHnkIUBD0hyte+vRX5H96F7VnNTBWwtTmH1Q+sD8xzGjYXZ7Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SuOi+ufS; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="SuOi+ufS" Received: by smtp.kernel.org (Postfix) with ESMTPSA id EEAD5C433F1; Thu, 11 Apr 2024 10:11:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1712830269; bh=6jPvWZmloux/iNeWorem3hFmXIwpQ9g60fkllB/nsCk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SuOi+ufSP1aTaz6UuvLCUl+FYZmtPMlVUfZzFsFmuWUqw268O+A+DTbwrcWQOgu0p 57kqNbyQATd9Qc+CnE9b/6z0Te7kSZeoNX/RbLNHFK+nPxrQrJAE8AgPpUGyyTuDIK 3bUgAr5Y0mfaxIJuECn3uM6BGEsZtjlKBokp6V3Y= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Daniel Drake , Bjorn Helgaas , Jian-Hong Pan , "Rafael J. Wysocki" , Sasha Levin Subject: [PATCH 6.8 091/143] Revert "ACPI: PM: Block ASUS B1400CEAE from suspend to idle by default" Date: Thu, 11 Apr 2024 11:55:59 +0200 Message-ID: <20240411095423.648754513@linuxfoundation.org> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240411095420.903937140@linuxfoundation.org> References: <20240411095420.903937140@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.8-stable review patch. If anyone has any objections, please let me know. ------------------ 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