Skip to content

Commit 55b0141

Browse files
superm1Damien Le Moal
authored andcommitted
ata: ahci: Rename CONFIG_SATA_LPM_POLICY configuration item back
CONFIG_SATA_LPM_MOBILE_POLICY was renamed to CONFIG_SATA_LPM_POLICY in commit 4dd4d3d ("ata: ahci: Rename CONFIG_SATA_LPM_MOBILE_POLICY configuration item"). This can potentially cause problems as users would invisibly lose configuration policy defaults when they built the new kernel. To avoid such problems, switch back to the old name (even if it's wrong). Suggested-by: Christoph Hellwig <hch@infradead.org> Suggested-by: Damien Le Moal <damien.lemoal@opensource.wdc.com> Signed-off-by: Mario Limonciello <mario.limonciello@amd.com> Signed-off-by: Damien Le Moal <damien.lemoal@opensource.wdc.com>
1 parent 5399752 commit 55b0141

File tree

3 files changed

+6
-4
lines changed

3 files changed

+6
-4
lines changed

drivers/ata/Kconfig

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,16 @@ config SATA_AHCI
115115

116116
If unsure, say N.
117117

118-
config SATA_LPM_POLICY
118+
config SATA_MOBILE_LPM_POLICY
119119
int "Default SATA Link Power Management policy for low power chipsets"
120120
range 0 4
121121
default 0
122122
depends on SATA_AHCI
123123
help
124124
Select the Default SATA Link Power Management (LPM) policy to use
125-
for chipsets / "South Bridges" designated as supporting low power.
125+
for chipsets / "South Bridges" supporting low-power modes. Such
126+
chipsets are typically found on most laptops but desktops and
127+
servers now also widely use chipsets supporting low power modes.
126128

127129
The value set has the following meanings:
128130
0 => Keep firmware settings

drivers/ata/ahci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1595,7 +1595,7 @@ static int ahci_init_msi(struct pci_dev *pdev, unsigned int n_ports,
15951595
static void ahci_update_initial_lpm_policy(struct ata_port *ap,
15961596
struct ahci_host_priv *hpriv)
15971597
{
1598-
int policy = CONFIG_SATA_LPM_POLICY;
1598+
int policy = CONFIG_SATA_MOBILE_LPM_POLICY;
15991599

16001600

16011601
/* Ignore processing for chipsets that don't use policy */

drivers/ata/ahci.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -236,7 +236,7 @@ enum {
236236
AHCI_HFLAG_NO_WRITE_TO_RO = (1 << 24), /* don't write to read
237237
only registers */
238238
AHCI_HFLAG_USE_LPM_POLICY = (1 << 25), /* chipset that should use
239-
SATA_LPM_POLICY
239+
SATA_MOBILE_LPM_POLICY
240240
as default lpm_policy */
241241
AHCI_HFLAG_SUSPEND_PHYS = (1 << 26), /* handle PHYs during
242242
suspend/resume */

0 commit comments

Comments
 (0)