1 files changed, 37 insertions, 0 deletions

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 312a2c0c64e6..3671af869696 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -97,6 +97,9 @@ enum {
         ATA_DRQ                 = (1 << 3),     /* data request i/o */
         ATA_ERR                 = (1 << 0),     /* have an error */
         ATA_SRST                = (1 << 2),     /* software reset */
+        ATA_ICRC                = (1 << 7),     /* interface CRC error */
+        ATA_UNC                 = (1 << 6),     /* uncorrectable media error */
+        ATA_IDNF                = (1 << 4),     /* ID not found */
         ATA_ABORTED             = (1 << 2),     /* command aborted */
 
         /* ATA command block registers */
@@ -130,6 +133,8 @@ enum {
         ATA_CMD_WRITE           = 0xCA,
         ATA_CMD_WRITE_EXT       = 0x35,
         ATA_CMD_WRITE_FUA_EXT   = 0x3D,
+        ATA_CMD_FPDMA_READ      = 0x60,
+        ATA_CMD_FPDMA_WRITE     = 0x61,
         ATA_CMD_PIO_READ        = 0x20,
         ATA_CMD_PIO_READ_EXT    = 0x24,
         ATA_CMD_PIO_WRITE       = 0x30,
@@ -148,6 +153,10 @@ enum {
         ATA_CMD_INIT_DEV_PARAMS = 0x91,
         ATA_CMD_READ_NATIVE_MAX = 0xF8,
         ATA_CMD_READ_NATIVE_MAX_EXT = 0x27,
+        ATA_CMD_READ_LOG_EXT    = 0x2f,
+
+        /* READ_LOG_EXT pages */
+        ATA_LOG_SATA_NCQ        = 0x10,
 
         /* SETFEATURES stuff */
         SETFEATURES_XFER        = 0x03,
@@ -172,6 +181,9 @@ enum {
         XFER_PIO_0              = 0x08,
         XFER_PIO_SLOW           = 0x00,
 
+        SETFEATURES_WC_ON       = 0x02, /* Enable write cache */
+        SETFEATURES_WC_OFF      = 0x82, /* Disable write cache */
+
         /* ATAPI stuff */
         ATAPI_PKT_DMA           = (1 << 0),
         ATAPI_DMADIR            = (1 << 2),     /* ATAPI data dir:
@@ -192,6 +204,16 @@ enum {
         SCR_ACTIVE              = 3,
         SCR_NOTIFICATION        = 4,
 
+        /* SError bits */
+        SERR_DATA_RECOVERED     = (1 << 0), /* recovered data error */
+        SERR_COMM_RECOVERED     = (1 << 1), /* recovered comm failure */
+        SERR_DATA               = (1 << 8), /* unrecovered data error */
+        SERR_PERSISTENT         = (1 << 9), /* persistent data/comm error */
+        SERR_PROTOCOL           = (1 << 10), /* protocol violation */
+        SERR_INTERNAL           = (1 << 11), /* host internal error */
+        SERR_PHYRDY_CHG         = (1 << 16), /* PHY RDY changed */
+        SERR_DEV_XCHG           = (1 << 26), /* device exchanged */
+
         /* struct ata_taskfile flags */
         ATA_TFLAG_LBA48         = (1 << 0), /* enable 48-bit LBA and "HOB" */
         ATA_TFLAG_ISADDR        = (1 << 1), /* enable r/w to nsect/lba regs */
@@ -199,6 +221,7 @@ enum {
         ATA_TFLAG_WRITE         = (1 << 3), /* data dir: host->dev==1 (write) */
         ATA_TFLAG_LBA           = (1 << 4), /* enable LBA */
         ATA_TFLAG_FUA           = (1 << 5), /* enable FUA */
+        ATA_TFLAG_POLLING       = (1 << 6), /* set nIEN to 1 and use polling */
 };
 
 enum ata_tf_protocols {
@@ -207,6 +230,7 @@ enum ata_tf_protocols {
         ATA_PROT_NODATA,        /* no data */
         ATA_PROT_PIO,           /* PIO single sector */
         ATA_PROT_DMA,           /* DMA */
+        ATA_PROT_NCQ,           /* NCQ */
         ATA_PROT_ATAPI,         /* packet command, PIO data xfer*/
         ATA_PROT_ATAPI_NODATA,  /* packet command, no data */
         ATA_PROT_ATAPI_DMA,     /* packet command with special DMA sauce */
@@ -262,6 +286,8 @@ struct ata_taskfile {
 #define ata_id_has_pm(id)       ((id)[82] & (1 << 3))
 #define ata_id_has_lba(id)      ((id)[49] & (1 << 9))
 #define ata_id_has_dma(id)      ((id)[49] & (1 << 8))
+#define ata_id_has_ncq(id)      ((id)[76] & (1 << 8))
+#define ata_id_queue_depth(id)  (((id)[75] & 0x1f) + 1)
 #define ata_id_removeable(id)   ((id)[0] & (1 << 7))
 #define ata_id_has_dword_io(id) ((id)[50] & (1 << 0))
 #define ata_id_u32(id,n)        \
@@ -272,6 +298,8 @@ struct ata_taskfile {
           ((u64) (id)[(n) + 1] << 16) | \
           ((u64) (id)[(n) + 0]) )
 
+#define ata_id_cdb_intr(id)     (((id)[0] & 0x60) == 0x20)
+
 static inline unsigned int ata_id_major_version(const u16 *id)
 {
         unsigned int mver;
@@ -311,6 +339,15 @@ static inline int is_atapi_taskfile(const struct ata_taskfile *tf)
                (tf->protocol == ATA_PROT_ATAPI_DMA);
 }
 
+static inline int is_multi_taskfile(struct ata_taskfile *tf)
+{
+        return (tf->command == ATA_CMD_READ_MULTI) ||
+               (tf->command == ATA_CMD_WRITE_MULTI) ||
+               (tf->command == ATA_CMD_READ_MULTI_EXT) ||
+               (tf->command == ATA_CMD_WRITE_MULTI_EXT) ||
+               (tf->command == ATA_CMD_WRITE_MULTI_FUA_EXT);
+}
+
 static inline int ata_ok(u8 status)
 {
         return ((status & (ATA_BUSY | ATA_DRDY | ATA_DF | ATA_DRQ | ATA_ERR))