diff options
author | Tejun Heo <htejun@gmail.com> | 2007-09-23 00:14:13 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2007-10-12 14:55:41 -0400 |
commit | e31e8531d668c9c4dc7883054788f89805188003 (patch) | |
tree | 9c3762792344d24c996d6459409456664a2e381b | |
parent | 668108d73bbb1ae85f01db38d6be822fd28ece1f (diff) |
libata-pmp-prep: implement ATA_HORKAGE_SKIP_PM
Some pseudo devices fail PM commands unnecessarily aborting system
suspend. Implement ATA_HORKAGE_SKIP_PM which makes libata skip PM
commands for these devices.
Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r-- | drivers/ata/libata-scsi.c | 7 | ||||
-rw-r--r-- | include/linux/libata.h | 1 |
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 8ca2caeed017..451f79c6fbac 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c | |||
@@ -944,6 +944,13 @@ static unsigned int ata_scsi_start_stop_xlat(struct ata_queued_cmd *qc) | |||
944 | goto invalid_fld; /* LOEJ bit set not supported */ | 944 | goto invalid_fld; /* LOEJ bit set not supported */ |
945 | if (((cdb[4] >> 4) & 0xf) != 0) | 945 | if (((cdb[4] >> 4) & 0xf) != 0) |
946 | goto invalid_fld; /* power conditions not supported */ | 946 | goto invalid_fld; /* power conditions not supported */ |
947 | |||
948 | if (qc->dev->horkage & ATA_HORKAGE_SKIP_PM) { | ||
949 | /* the device lacks PM support, finish without doing anything */ | ||
950 | scmd->result = SAM_STAT_GOOD; | ||
951 | return 1; | ||
952 | } | ||
953 | |||
947 | if (cdb[4] & 0x1) { | 954 | if (cdb[4] & 0x1) { |
948 | tf->nsect = 1; /* 1 sector, lba=0 */ | 955 | tf->nsect = 1; /* 1 sector, lba=0 */ |
949 | 956 | ||
diff --git a/include/linux/libata.h b/include/linux/libata.h index 2bd1d26c9c8d..56b218771114 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -329,6 +329,7 @@ enum { | |||
329 | ATA_HORKAGE_NONCQ = (1 << 2), /* Don't use NCQ */ | 329 | ATA_HORKAGE_NONCQ = (1 << 2), /* Don't use NCQ */ |
330 | ATA_HORKAGE_MAX_SEC_128 = (1 << 3), /* Limit max sects to 128 */ | 330 | ATA_HORKAGE_MAX_SEC_128 = (1 << 3), /* Limit max sects to 128 */ |
331 | ATA_HORKAGE_BROKEN_HPA = (1 << 4), /* Broken HPA */ | 331 | ATA_HORKAGE_BROKEN_HPA = (1 << 4), /* Broken HPA */ |
332 | ATA_HORKAGE_SKIP_PM = (1 << 5), /* Skip PM operations */ | ||
332 | }; | 333 | }; |
333 | 334 | ||
334 | enum hsm_task_states { | 335 | enum hsm_task_states { |