diff options
author | Marc Carino <marc.ceeeee@gmail.com> | 2013-08-25 02:22:49 -0400 |
---|---|---|
committer | Tejun Heo <tj@kernel.org> | 2013-08-25 09:39:12 -0400 |
commit | 40fb59e75ad197a1c4ca2fbccef85432d8d103f8 (patch) | |
tree | 7f354bbaea70614e29b06a6616e486f27bc7e19c | |
parent | 8be5ad9acb7c11b9d717bcdbe3d6de0dab081a39 (diff) |
libata: Add H2D FIS "auxiliary" port flag
Add a new port flag, ATA_FLAG_FPDMA_AUX, used to indicate
support for transmission of the H2D FIS 'auxiliary' field.
Signed-off-by: Marc Carino <marc.ceeeee@gmail.com>
Signed-off-by: Tejun Heo <tj@kernel.org>
-rw-r--r-- | drivers/ata/ahci.c | 8 | ||||
-rw-r--r-- | include/linux/libata.h | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/drivers/ata/ahci.c b/drivers/ata/ahci.c index 5064f3ea20f1..8d41c57fd969 100644 --- a/drivers/ata/ahci.c +++ b/drivers/ata/ahci.c | |||
@@ -1288,6 +1288,14 @@ static int ahci_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) | |||
1288 | */ | 1288 | */ |
1289 | if (!(hpriv->flags & AHCI_HFLAG_NO_FPDMA_AA)) | 1289 | if (!(hpriv->flags & AHCI_HFLAG_NO_FPDMA_AA)) |
1290 | pi.flags |= ATA_FLAG_FPDMA_AA; | 1290 | pi.flags |= ATA_FLAG_FPDMA_AA; |
1291 | |||
1292 | /* | ||
1293 | * All AHCI controllers should be forward-compatible | ||
1294 | * with the new auxiliary field. This code should be | ||
1295 | * conditionalized if any buggy AHCI controllers are | ||
1296 | * encountered. | ||
1297 | */ | ||
1298 | pi.flags |= ATA_FLAG_FPDMA_AUX; | ||
1291 | } | 1299 | } |
1292 | 1300 | ||
1293 | if (hpriv->cap & HOST_CAP_PMP) | 1301 | if (hpriv->cap & HOST_CAP_PMP) |
diff --git a/include/linux/libata.h b/include/linux/libata.h index 9b6ba196179f..578f98c3ff57 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -223,6 +223,7 @@ enum { | |||
223 | ATA_FLAG_ACPI_SATA = (1 << 17), /* need native SATA ACPI layout */ | 223 | ATA_FLAG_ACPI_SATA = (1 << 17), /* need native SATA ACPI layout */ |
224 | ATA_FLAG_AN = (1 << 18), /* controller supports AN */ | 224 | ATA_FLAG_AN = (1 << 18), /* controller supports AN */ |
225 | ATA_FLAG_PMP = (1 << 19), /* controller supports PMP */ | 225 | ATA_FLAG_PMP = (1 << 19), /* controller supports PMP */ |
226 | ATA_FLAG_FPDMA_AUX = (1 << 20), /* controller supports H2DFIS aux field */ | ||
226 | ATA_FLAG_EM = (1 << 21), /* driver supports enclosure | 227 | ATA_FLAG_EM = (1 << 21), /* driver supports enclosure |
227 | * management */ | 228 | * management */ |
228 | ATA_FLAG_SW_ACTIVITY = (1 << 22), /* driver supports sw activity | 229 | ATA_FLAG_SW_ACTIVITY = (1 << 22), /* driver supports sw activity |