diff options
| author | Tejun Heo <tj@kernel.org> | 2015-02-09 15:54:41 +0300 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2015-02-09 15:54:41 +0300 |
| commit | b12aa1f25e1da7e23fa44f646ac46e41366cfc6c (patch) | |
| tree | 465be1cfceaa37861f5629821e1be2559ba39cfb /include | |
| parent | f627cfdeb7d07df7d7ad2e6ebe59f25d8af4212e (diff) | |
| parent | 09c32aaa3683cbcb6c2787a42f87630dff37d2a5 (diff) | |
| download | linux-b12aa1f25e1da7e23fa44f646ac46e41366cfc6c.tar.xz | |
Merge branch 'for-3.19-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata into for-3.20
09c32aaa3683 ("ahci_xgene: Fix the dma state machine lockup for the
ATA_CMD_SMART PIO mode command.") missed 3.19 release. Fold it into
for-3.20.
Signed-off-by: Tejun Heo <tj@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/libata.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/libata.h b/include/linux/libata.h index 11beb4196c32..61df823ac86a 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h @@ -231,6 +231,7 @@ enum { ATA_FLAG_SW_ACTIVITY = (1 << 22), /* driver supports sw activity * led */ ATA_FLAG_NO_DIPM = (1 << 23), /* host not happy with DIPM */ + ATA_FLAG_LOWTAG = (1 << 24), /* host wants lowest available tag */ /* bits 24:31 of ap->flags are reserved for LLD specific flags */ @@ -422,6 +423,7 @@ enum { ATA_HORKAGE_NO_NCQ_TRIM = (1 << 19), /* don't use queued TRIM */ ATA_HORKAGE_NOLPM = (1 << 20), /* don't use LPM */ ATA_HORKAGE_WD_BROKEN_LPM = (1 << 21), /* some WDs have broken LPM */ + ATA_HORKAGE_ZERO_AFTER_TRIM = (1 << 22),/* guarantees zero after trim */ /* DMA mask for user DMA control: User visible values; DO NOT renumber */ |