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 9049B1A9CC3; Fri, 29 Mar 2024 12:48:25 +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=1711716505; cv=none; b=UWOHKWKH7ukXl5/1xnMBPVsSl+YQ+bStaKER9R7ATYWJz66HDqOV3El+cB55LFyuXe/sLsusz6PrZJX5d+FV+9Z0AFgP5gsNixpWUUAdTD0YCC+BcJMs/h8GaC/dJ8P3s8wRCA/nJXI3/rmiua3HlW6uEB5eLepgu100p/apW2M= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711716505; c=relaxed/simple; bh=Mpq//dk5KR3KFP9QkYIiwXcTBz+YA/K2dwRwxYPoBUU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jal7wTKKnDRyiXFBjhukJ05R3l5XmNE8buSsz+FDr7i4ZhMem6qwCE1fz0jjt6Kj3s4rrKeIxt5UmFBSmZlEz9YJQ4yxkGIhJ37OmUlvH06i5J3Wv76w2/2xsKNnHVgtLpmiGi++o4X/92Lmm5Fnmq/WpiH1x18dkNS/5ld1APM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=JmUjACsH; 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="JmUjACsH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8B74AC43390; Fri, 29 Mar 2024 12:48:24 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711716505; bh=Mpq//dk5KR3KFP9QkYIiwXcTBz+YA/K2dwRwxYPoBUU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=JmUjACsHjj+7pXHc5J70VThnnzHn3MdIaPDS8QCR5izDOSP7ARW85sh+trAkrAEhj rvB23FqAds2BUcecjY1GuW6zcBXbA2i8qOZ6KgYyX1GK44tyDLcyhh5/Tu9MicJ79P bpyFwP+uNB/kEG/MA6BXqAt83SJ1IfYxhVGbRQfqdd3OftJPR4Pcv23TUL3JDk4D4e AZBo/JR5JW2ZoQDoJ9jUQKM32CSJo08l0rdBRPUKkov/2NJpErd8t7TGTuI8SMRQlP rFv10NZsnzNz9SJsnVOerYxXMcH8P9tmh0D191q09RRukmGW6jP6wHigM1jrrdoCMQ 2amKWYxILSm5A== 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 5.15 20/34] Revert "ACPI: PM: Block ASUS B1400CEAE from suspend to idle by default" Date: Fri, 29 Mar 2024 08:47:21 -0400 Message-ID: <20240329124750.3092394-20-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240329124750.3092394-1-sashal@kernel.org> References: <20240329124750.3092394-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 5.15.153 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 b277e25b276ce..95deb55fb9a8c 100644 --- a/drivers/acpi/sleep.c +++ b/drivers/acpi/sleep.c @@ -382,18 +382,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