diff options
-rw-r--r-- | drivers/ata/libata-scsi.c | 5 | ||||
-rw-r--r-- | drivers/ata/sata_sil24.c | 2 | ||||
-rw-r--r-- | include/linux/libata.h | 1 |
3 files changed, 2 insertions, 6 deletions
diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c index b061ba2c31d8..fd9be1756f0d 100644 --- a/drivers/ata/libata-scsi.c +++ b/drivers/ata/libata-scsi.c | |||
@@ -4240,10 +4240,7 @@ int ata_sas_allocate_tag(struct ata_port *ap) | |||
4240 | unsigned int i, tag; | 4240 | unsigned int i, tag; |
4241 | 4241 | ||
4242 | for (i = 0, tag = ap->sas_last_tag + 1; i < max_queue; i++, tag++) { | 4242 | for (i = 0, tag = ap->sas_last_tag + 1; i < max_queue; i++, tag++) { |
4243 | if (ap->flags & ATA_FLAG_LOWTAG) | 4243 | tag = tag < max_queue ? tag : 0; |
4244 | tag = 1; | ||
4245 | else | ||
4246 | tag = tag < max_queue ? tag : 0; | ||
4247 | 4244 | ||
4248 | /* the last tag is reserved for internal command. */ | 4245 | /* the last tag is reserved for internal command. */ |
4249 | if (tag == ATA_TAG_INTERNAL) | 4246 | if (tag == ATA_TAG_INTERNAL) |
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c index ba2667fa0528..52428971ba94 100644 --- a/drivers/ata/sata_sil24.c +++ b/drivers/ata/sata_sil24.c | |||
@@ -246,7 +246,7 @@ enum { | |||
246 | /* host flags */ | 246 | /* host flags */ |
247 | SIL24_COMMON_FLAGS = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA | | 247 | SIL24_COMMON_FLAGS = ATA_FLAG_SATA | ATA_FLAG_PIO_DMA | |
248 | ATA_FLAG_NCQ | ATA_FLAG_ACPI_SATA | | 248 | ATA_FLAG_NCQ | ATA_FLAG_ACPI_SATA | |
249 | ATA_FLAG_AN | ATA_FLAG_PMP | ATA_FLAG_LOWTAG, | 249 | ATA_FLAG_AN | ATA_FLAG_PMP, |
250 | SIL24_FLAG_PCIX_IRQ_WOC = (1 << 24), /* IRQ loss errata on PCI-X */ | 250 | SIL24_FLAG_PCIX_IRQ_WOC = (1 << 24), /* IRQ loss errata on PCI-X */ |
251 | 251 | ||
252 | IRQ_STAT_4PORTS = 0xf, | 252 | IRQ_STAT_4PORTS = 0xf, |
diff --git a/include/linux/libata.h b/include/linux/libata.h index fc03efa64ffe..ebe132a4873c 100644 --- a/include/linux/libata.h +++ b/include/linux/libata.h | |||
@@ -231,7 +231,6 @@ enum { | |||
231 | ATA_FLAG_SW_ACTIVITY = (1 << 22), /* driver supports sw activity | 231 | ATA_FLAG_SW_ACTIVITY = (1 << 22), /* driver supports sw activity |
232 | * led */ | 232 | * led */ |
233 | ATA_FLAG_NO_DIPM = (1 << 23), /* host not happy with DIPM */ | 233 | ATA_FLAG_NO_DIPM = (1 << 23), /* host not happy with DIPM */ |
234 | ATA_FLAG_LOWTAG = (1 << 24), /* host wants lowest available tag */ | ||
235 | 234 | ||
236 | /* bits 24:31 of ap->flags are reserved for LLD specific flags */ | 235 | /* bits 24:31 of ap->flags are reserved for LLD specific flags */ |
237 | 236 | ||