Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

ata: ahci: Rename CONFIG_SATA_LPM_POLICY configuration item back

CONFIG_SATA_LPM_MOBILE_POLICY was renamed to CONFIG_SATA_LPM_POLICY in
commit 4dd4d3deb502 ("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>

authored by

Mario Limonciello and committed by
Damien Le Moal
55b01415 53997522

+6 -4
+4 -2
drivers/ata/Kconfig
··· 115 115 116 116 If unsure, say N. 117 117 118 - config SATA_LPM_POLICY 118 + config SATA_MOBILE_LPM_POLICY 119 119 int "Default SATA Link Power Management policy for low power chipsets" 120 120 range 0 4 121 121 default 0 122 122 depends on SATA_AHCI 123 123 help 124 124 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. 126 128 127 129 The value set has the following meanings: 128 130 0 => Keep firmware settings
+1 -1
drivers/ata/ahci.c
··· 1595 1595 static void ahci_update_initial_lpm_policy(struct ata_port *ap, 1596 1596 struct ahci_host_priv *hpriv) 1597 1597 { 1598 - int policy = CONFIG_SATA_LPM_POLICY; 1598 + int policy = CONFIG_SATA_MOBILE_LPM_POLICY; 1599 1599 1600 1600 1601 1601 /* Ignore processing for chipsets that don't use policy */
+1 -1
drivers/ata/ahci.h
··· 236 236 AHCI_HFLAG_NO_WRITE_TO_RO = (1 << 24), /* don't write to read 237 237 only registers */ 238 238 AHCI_HFLAG_USE_LPM_POLICY = (1 << 25), /* chipset that should use 239 - SATA_LPM_POLICY 239 + SATA_MOBILE_LPM_POLICY 240 240 as default lpm_policy */ 241 241 AHCI_HFLAG_SUSPEND_PHYS = (1 << 26), /* handle PHYs during 242 242 suspend/resume */