Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev:
  [libata] Bump driver versions
  ata_piix: implement IOCFG bit18 quirk
  libata: implement BROKEN_HPA horkage and apply it to affected drives
  sata_promise: FastTrack TX4200 is a second-generation chip
  pata_marvell: Add more identifiers
  ata_piix: add Satellite U200 to broken suspend list
  ata: add ATA_MWDMA* and ATA_SWDMA* defines
  ata_piix: IDE mode SATA patch for Intel Tolapai
  libata-core: Allow translation setting to fail

2 files changed, 14 insertions, 0 deletions

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 23a22df039d8..c043c1ccf1c5 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -73,6 +73,19 @@ enum {
         ATA_PIO5                = ATA_PIO4 | (1 << 5),
         ATA_PIO6                = ATA_PIO5 | (1 << 6),
 
+        ATA_SWDMA0              = (1 << 0),
+        ATA_SWDMA1              = ATA_SWDMA0 | (1 << 1),
+        ATA_SWDMA2              = ATA_SWDMA1 | (1 << 2),
+
+        ATA_SWDMA2_ONLY         = (1 << 2),
+
+        ATA_MWDMA0              = (1 << 0),
+        ATA_MWDMA1              = ATA_MWDMA0 | (1 << 1),
+        ATA_MWDMA2              = ATA_MWDMA1 | (1 << 2),
+
+        ATA_MWDMA12_ONLY        = (1 << 1) | (1 << 2),
+        ATA_MWDMA2_ONLY         = (1 << 2),
+
         ATA_UDMA0               = (1 << 0),
         ATA_UDMA1               = ATA_UDMA0 | (1 << 1),
         ATA_UDMA2               = ATA_UDMA1 | (1 << 2),
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 41978a557318..a67bb9075e9b 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -303,6 +303,7 @@ enum {
         ATA_HORKAGE_NODMA       = (1 << 1),     /* DMA problems */
         ATA_HORKAGE_NONCQ       = (1 << 2),     /* Don't use NCQ */
         ATA_HORKAGE_MAX_SEC_128 = (1 << 3),     /* Limit max sects to 128 */
+        ATA_HORKAGE_BROKEN_HPA  = (1 << 4),     /* Broken HPA */
 };
 
 enum hsm_task_states {