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 695D7191476; Tue, 10 Sep 2024 10:06:13 +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=1725962773; cv=none; b=JdYHCfLjkeGBuHNugTp90BoMWeV1AC+s7AgLD+vUrBoxnVZLQIj+tjCkg4gASC5BjDbdl0Ju1GBECsw2Nh/XpynuM2CCKov/cHERqvuXOw8OtnVPw2UoSDgL3g+nredd5A0/U88Wvh7258M74/EQa5FnQYGxozUMl76UjY3ix38= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725962773; c=relaxed/simple; bh=A6HywdAmH5M8iLqSD9ESP3Wae1b3bVhB+gzPDeCdsNk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=uYsQGVT0p09Q6bs3xjBfWabua4Bmf5gNuJ9+CtQD2KfwZulmfPCTGhJO9KGyyICahNUZASE7fhcYTYdFFkHhO1QH4xWBWgW6vjdjjh5iWO/35e3ev0TUqvTjmswYd3lPUAArt75VH6rolqkX8jhcgZAA45iTOI5ipojfwCWAAfQ= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=SvPu9c9Y; 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="SvPu9c9Y" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96DC0C4CECD; Tue, 10 Sep 2024 10:06:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725962773; bh=A6HywdAmH5M8iLqSD9ESP3Wae1b3bVhB+gzPDeCdsNk=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=SvPu9c9Y7kxTphSwQOLELcc8u8TqMl23VTNvo3Ldj0yV8gaCsZTtWyeizlOvvqIy/ 7uUStt0XTx2/g7sUOTqeDR5FCoYaaWt/BZsDwuJsolRoIk5d+iwfR4yD747ycmGost 2N3MlHsof6b4rshsLLCucC9UzL5HWFZWlx9WJmjo= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Georg Gottleuber , Werner Sembach , Keith Busch Subject: [PATCH 6.1 017/192] nvme-pci: Add sleep quirk for Samsung 990 Evo Date: Tue, 10 Sep 2024 11:30:41 +0200 Message-ID: <20240910092558.651896653@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240910092557.876094467@linuxfoundation.org> References: <20240910092557.876094467@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Georg Gottleuber commit 61aa894e7a2fda4ee026523b01d07e83ce2abb72 upstream. On some TUXEDO platforms, a Samsung 990 Evo NVMe leads to a high power consumption in s2idle sleep (2-3 watts). This patch applies 'Force No Simple Suspend' quirk to achieve a sleep with a lower power consumption, typically around 0.5 watts. Signed-off-by: Georg Gottleuber Signed-off-by: Werner Sembach Cc: Signed-off-by: Keith Busch Signed-off-by: Greg Kroah-Hartman --- drivers/nvme/host/pci.c | 11 +++++++++++ 1 file changed, 11 insertions(+) --- a/drivers/nvme/host/pci.c +++ b/drivers/nvme/host/pci.c @@ -3107,6 +3107,17 @@ static unsigned long check_vendor_combin dmi_match(DMI_BOARD_NAME, "NS5x_7xPU") || dmi_match(DMI_BOARD_NAME, "PH4PRX1_PH6PRX1")) return NVME_QUIRK_FORCE_NO_SIMPLE_SUSPEND; + } else if (pdev->vendor == 0x144d && pdev->device == 0xa80d) { + /* + * Exclude Samsung 990 Evo from NVME_QUIRK_SIMPLE_SUSPEND + * because of high power consumption (> 2 Watt) in s2idle + * sleep. Only some boards with Intel CPU are affected. + */ + if (dmi_match(DMI_BOARD_NAME, "GMxPXxx") || + dmi_match(DMI_BOARD_NAME, "PH4PG31") || + dmi_match(DMI_BOARD_NAME, "PH4PRX1_PH6PRX1") || + dmi_match(DMI_BOARD_NAME, "PH6PG01_PH6PG71")) + return NVME_QUIRK_FORCE_NO_SIMPLE_SUSPEND; } /*