Skip to content

Commit 24e0e61

Browse files
Niklas Casseldamien-lemoal
Niklas Cassel
authored andcommitted
ata: libata: disallow dev-initiated LPM transitions to unsupported states
In AHCI 1.3.1, the register description for CAP.SSC: "When cleared to ‘0’, software must not allow the HBA to initiate transitions to the Slumber state via agressive link power management nor the PxCMD.ICC field in each port, and the PxSCTL.IPM field in each port must be programmed to disallow device initiated Slumber requests." In AHCI 1.3.1, the register description for CAP.PSC: "When cleared to ‘0’, software must not allow the HBA to initiate transitions to the Partial state via agressive link power management nor the PxCMD.ICC field in each port, and the PxSCTL.IPM field in each port must be programmed to disallow device initiated Partial requests." Ensure that we always set the corresponding bits in PxSCTL.IPM, such that a device is not allowed to initiate transitions to power states which are unsupported by the HBA. DevSleep is always initiated by the HBA, however, for completeness, set the corresponding bit in PxSCTL.IPM such that agressive link power management cannot transition to DevSleep if DevSleep is not supported. sata_link_scr_lpm() is used by libahci, ata_piix and libata-pmp. However, only libahci has the ability to read the CAP/CAP2 register to see if these features are supported. Therefore, in order to not introduce any regressions on ata_piix or libata-pmp, create flags that indicate that the respective feature is NOT supported. This way, the behavior for ata_piix and libata-pmp should remain unchanged. This change is based on a patch originally submitted by Runa Guo-oc. Signed-off-by: Niklas Cassel <[email protected]> Fixes: 1152b26 ("libata: implement sata_link_scr_lpm() and make ata_dev_set_feature() global") Cc: [email protected] Signed-off-by: Damien Le Moal <[email protected]>
1 parent 0bb80ec commit 24e0e61

File tree

3 files changed

+29
-3
lines changed

3 files changed

+29
-3
lines changed

drivers/ata/ahci.c

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1883,6 +1883,15 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
18831883
else
18841884
dev_info(&pdev->dev, "SSS flag set, parallel bus scan disabled\n");
18851885

1886+
if (!(hpriv->cap & HOST_CAP_PART))
1887+
host->flags |= ATA_HOST_NO_PART;
1888+
1889+
if (!(hpriv->cap & HOST_CAP_SSC))
1890+
host->flags |= ATA_HOST_NO_SSC;
1891+
1892+
if (!(hpriv->cap2 & HOST_CAP2_SDS))
1893+
host->flags |= ATA_HOST_NO_DEVSLP;
1894+
18861895
if (pi.flags & ATA_FLAG_EM)
18871896
ahci_reset_em(host);
18881897

drivers/ata/libata-sata.c

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -396,10 +396,23 @@ int sata_link_scr_lpm(struct ata_link *link, enum ata_lpm_policy policy,
396396
case ATA_LPM_MED_POWER_WITH_DIPM:
397397
case ATA_LPM_MIN_POWER_WITH_PARTIAL:
398398
case ATA_LPM_MIN_POWER:
399-
if (ata_link_nr_enabled(link) > 0)
400-
/* no restrictions on LPM transitions */
399+
if (ata_link_nr_enabled(link) > 0) {
400+
/* assume no restrictions on LPM transitions */
401401
scontrol &= ~(0x7 << 8);
402-
else {
402+
403+
/*
404+
* If the controller does not support partial, slumber,
405+
* or devsleep, then disallow these transitions.
406+
*/
407+
if (link->ap->host->flags & ATA_HOST_NO_PART)
408+
scontrol |= (0x1 << 8);
409+
410+
if (link->ap->host->flags & ATA_HOST_NO_SSC)
411+
scontrol |= (0x2 << 8);
412+
413+
if (link->ap->host->flags & ATA_HOST_NO_DEVSLP)
414+
scontrol |= (0x4 << 8);
415+
} else {
403416
/* empty port, power off */
404417
scontrol &= ~0xf;
405418
scontrol |= (0x1 << 2);

include/linux/libata.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -222,6 +222,10 @@ enum {
222222
ATA_HOST_PARALLEL_SCAN = (1 << 2), /* Ports on this host can be scanned in parallel */
223223
ATA_HOST_IGNORE_ATA = (1 << 3), /* Ignore ATA devices on this host. */
224224

225+
ATA_HOST_NO_PART = (1 << 4), /* Host does not support partial */
226+
ATA_HOST_NO_SSC = (1 << 5), /* Host does not support slumber */
227+
ATA_HOST_NO_DEVSLP = (1 << 6), /* Host does not support devslp */
228+
225229
/* bits 24:31 of host->flags are reserved for LLD specific flags */
226230

227231
/* various lengths of time */

0 commit comments

Comments
 (0)