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 AE8F2311965 for ; Thu, 21 Aug 2025 12:41:48 +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=1755780108; cv=none; b=Gfgubg+9dDHjGFmFDgfvH0BlKxJsBmQlK7bLKADqDjVAjeHX9i6XohunSN9Y40EROtYx/qHSe5zGFssaMw+rlbAb99fhKXrsqPiANHtwqP+aTYvCiGCCPvEKmzKBaLoeEEyTDnw4TsGMECrZiTLva/fBVmjsaEILrrIRUTKYglw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755780108; c=relaxed/simple; bh=DAk7y0hWI5JSY89XA41Ahgla4p/AbwKZ68z+q+oF7zE=; h=Subject:To:Cc:From:Date:Message-ID:MIME-Version:Content-Type; b=MJvmDSEPSKgdKS5OmUMi12Nod77+0dBFt/szTd1Uvf5FeeuIlR+p93JNWYTbn/ocRo1/v4KM+5tOaVd2WwkX886ft08yZSv165QA2s4gR8OuNHJbD9pmps0qG3JA0RWyVjEGAt/qUWbZiBSj5oYSlFoDiS0YDTCRBiXP0C7YV/Q= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KtsY5i89; 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="KtsY5i89" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 08E3CC4CEEB; Thu, 21 Aug 2025 12:41:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1755780108; bh=DAk7y0hWI5JSY89XA41Ahgla4p/AbwKZ68z+q+oF7zE=; h=Subject:To:Cc:From:Date:From; b=KtsY5i89T1JdU0XEYgPSe3bSm01hF4zEQ50BAxlMbQHqlO5Gx5vtPLS3+kpnfQ/Bf vJMUG1KkYRyg8XfFZk8Xafa/7mnU23k7LwC4X9gtpeS7bXIfuufD2IMQLIJLjNhT5p 9y0cGU9ZkBZYrLjQGPK6i3tSzS+WxDGL1F83kMcY= Subject: FAILED: patch "[PATCH] ata: Fix SATA_MOBILE_LPM_POLICY description in Kconfig" failed to apply to 6.1-stable tree To: dlemoal@kernel.org,cassel@kernel.org,hare@suse.de Cc: From: Date: Thu, 21 Aug 2025 14:41:37 +0200 Message-ID: <2025082137-earmuff-rifling-98cf@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.1-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.1.y git checkout FETCH_HEAD git cherry-pick -x ed62a62a18bc144f73eadf866ae46842e8f6606e # git commit -s git send-email --to '' --in-reply-to '2025082137-earmuff-rifling-98cf@gregkh' --subject-prefix 'PATCH 6.1.y' HEAD^.. Possible dependencies: thanks, greg k-h ------------------ original commit in Linus's tree ------------------ >From ed62a62a18bc144f73eadf866ae46842e8f6606e Mon Sep 17 00:00:00 2001 From: Damien Le Moal Date: Wed, 18 Jun 2025 16:25:19 +0900 Subject: [PATCH] ata: Fix SATA_MOBILE_LPM_POLICY description in Kconfig Improve the description of the possible default SATA link power management policies and add the missing description for policy 5. No functional changes. Fixes: a5ec5a7bfd1f ("ata: ahci: Support state with min power but Partial low power state") Cc: stable@vger.kernel.org Signed-off-by: Damien Le Moal Reviewed-by: Hannes Reinecke Reviewed-by: Niklas Cassel diff --git a/drivers/ata/Kconfig b/drivers/ata/Kconfig index e00536b49552..120a2b7067fc 100644 --- a/drivers/ata/Kconfig +++ b/drivers/ata/Kconfig @@ -117,23 +117,39 @@ config SATA_AHCI config SATA_MOBILE_LPM_POLICY int "Default SATA Link Power Management policy" - range 0 4 + range 0 5 default 3 depends on SATA_AHCI help Select the Default SATA Link Power Management (LPM) policy to use for chipsets / "South Bridges" supporting low-power modes. Such chipsets are ubiquitous across laptops, desktops and servers. + Each policy combines power saving states and features: + - Partial: The Phy logic is powered but is in a reduced power + state. The exit latency from this state is no longer than + 10us). + - Slumber: The Phy logic is powered but is in an even lower power + state. The exit latency from this state is potentially + longer, but no longer than 10ms. + - DevSleep: The Phy logic may be powered down. The exit latency from + this state is no longer than 20 ms, unless otherwise + specified by DETO in the device Identify Device Data log. + - HIPM: Host Initiated Power Management (host automatically + transitions to partial and slumber). + - DIPM: Device Initiated Power Management (device automatically + transitions to partial and slumber). - The value set has the following meanings: + The possible values for the default SATA link power management + policies are: 0 => Keep firmware settings - 1 => Maximum performance - 2 => Medium power - 3 => Medium power with Device Initiated PM enabled - 4 => Minimum power + 1 => No power savings (maximum performance) + 2 => HIPM (Partial) + 3 => HIPM (Partial) and DIPM (Partial and Slumber) + 4 => HIPM (Partial and DevSleep) and DIPM (Partial and Slumber) + 5 => HIPM (Slumber and DevSleep) and DIPM (Partial and Slumber) - Note "Minimum power" is known to cause issues, including disk - corruption, with some disks and should not be used. + Excluding the value 0, higher values represent policies with higher + power savings. config SATA_AHCI_PLATFORM tristate "Platform AHCI SATA support"