1 files changed, 15 insertions, 10 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 7a54244d30aa..b3d4c906e242 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -123,6 +123,7 @@ enum {
         ATA_DFLAG_LBA48         = (1 << 0), /* device supports LBA48 */
         ATA_DFLAG_PIO           = (1 << 1), /* device currently in PIO mode */
         ATA_DFLAG_LBA           = (1 << 2), /* device supports LBA */
+        ATA_DFLAG_CDB_INTR      = (1 << 3), /* device asserts INTRQ when ready for CDB */
 
         ATA_DEV_UNKNOWN         = 0,    /* unknown device */
         ATA_DEV_ATA             = 1,    /* ATA device */
@@ -141,8 +142,8 @@ enum {
         ATA_FLAG_MMIO           = (1 << 6), /* use MMIO, not PIO */
         ATA_FLAG_SATA_RESET     = (1 << 7), /* (obsolete) use COMRESET */
         ATA_FLAG_PIO_DMA        = (1 << 8), /* PIO cmds via DMA */
-        ATA_FLAG_NOINTR         = (1 << 9), /* FIXME: Remove this once
-                                             * proper HSM is in place. */
+        ATA_FLAG_PIO_POLLING    = (1 << 9), /* use polling PIO if LLD
+                                             * doesn't handle PIO interrupts */
         ATA_FLAG_DEBUGMSG       = (1 << 10),
         ATA_FLAG_NO_ATAPI       = (1 << 11), /* No ATAPI support */
 
@@ -165,6 +166,8 @@ enum {
         ATA_TMOUT_PIO           = 30 * HZ,
         ATA_TMOUT_BOOT          = 30 * HZ,      /* heuristic */
         ATA_TMOUT_BOOT_QUICK    = 7 * HZ,       /* heuristic */
+        ATA_TMOUT_DATAOUT       = 30 * HZ,
+        ATA_TMOUT_DATAOUT_QUICK = 5 * HZ,
         ATA_TMOUT_CDB           = 30 * HZ,
         ATA_TMOUT_CDB_QUICK     = 5 * HZ,
         ATA_TMOUT_INTERNAL      = 30 * HZ,
@@ -212,14 +215,16 @@ enum {
 };
 
 enum hsm_task_states {
-        HSM_ST_UNKNOWN,
-        HSM_ST_IDLE,
-        HSM_ST_POLL,
-        HSM_ST_TMOUT,
-        HSM_ST,
-        HSM_ST_LAST,
-        HSM_ST_LAST_POLL,
-        HSM_ST_ERR,
+        HSM_ST_UNKNOWN,         /* state unknown */
+        HSM_ST_IDLE,            /* no command on going */
+        HSM_ST_POLL,            /* same as HSM_ST, waits longer */
+        HSM_ST_TMOUT,           /* timeout */
+        HSM_ST,                 /* (waiting the device to) transfer data */
+        HSM_ST_LAST,            /* (waiting the device to) complete command */
+        HSM_ST_LAST_POLL,       /* same as HSM_ST_LAST, waits longer */
+        HSM_ST_ERR,             /* error */
+        HSM_ST_FIRST,           /* (waiting the device to)
+                                   write CDB or first data block */
 };
 
 enum ata_completion_errors {