diff options
author | Adam Manzanares <adam.manzanares@hgst.com> | 2016-10-20 05:40:19 +0200 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2016-10-20 16:06:30 +0200 |
commit | 4e647d960c510e0d5cd700058fb8ddd529c390ee (patch) | |
tree | 04377f7c11e67c498fdb35418b0bda2116da7b26 /drivers/ata/libata-scsi.c | |
parent | ata: ATA Command Priority Disabled By Default (diff) | |
download | linux-4e647d960c510e0d5cd700058fb8ddd529c390ee.tar.xz linux-4e647d960c510e0d5cd700058fb8ddd529c390ee.zip |
ata: set ncq_prio_enabled iff device has support
We previously had a check to see if the device has support for
prioritized ncq commands and a check to see if a device flag
is set, through a sysfs variable, in order to send a prioritized
command.
This patch only allows the sysfs variable to be set if the device
supports prioritized commands enabling one check in ata_build_rw_tf
in order to determine whether or not to send a prioritized command.
This patch depends on ata: ATA Command Priority Disabled By Default
tj: Minor subject and formatting updates.
Signed-off-by: Adam Manzanares <adam.manzanares@wdc.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'drivers/ata/libata-scsi.c')
-rw-r--r-- | drivers/ata/libata-scsi.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index 87597a3f6149..49c09d876358 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c @@ -323,10 +323,16 @@ static ssize_t ata_ncq_prio_enable_store(struct device *device, goto unlock; } - if (input) + if (input) { + if (!(dev->flags & ATA_DFLAG_NCQ_PRIO)) { + rc = -EOPNOTSUPP; + goto unlock; + } + dev->flags |= ATA_DFLAG_NCQ_PRIO_ENABLE; - else + } else { dev->flags &= ~ATA_DFLAG_NCQ_PRIO_ENABLE; + } unlock: spin_unlock_irqrestore(ap->lock, flags); |