1 files changed, 17 insertions, 2 deletions

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 272736e37990..edb31bfff68f 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -40,6 +40,7 @@ enum {
         ATA_MAX_DEVICES         = 2,    /* per bus/port */
         ATA_MAX_PRD             = 256,  /* we could make these 256/256 */
         ATA_SECT_SIZE           = 512,
+        ATA_MAX_SECTORS_128     = 128,
         ATA_MAX_SECTORS         = 256,
         ATA_MAX_SECTORS_LBA48   = 65535,/* TODO: 65536? */
 
@@ -158,11 +159,19 @@ enum {
         ATA_CMD_INIT_DEV_PARAMS = 0x91,
         ATA_CMD_READ_NATIVE_MAX = 0xF8,
         ATA_CMD_READ_NATIVE_MAX_EXT = 0x27,
+        ATA_CMD_SET_MAX         = 0xF9,
+        ATA_CMD_SET_MAX_EXT     = 0x37,
         ATA_CMD_READ_LOG_EXT    = 0x2f,
 
         /* READ_LOG_EXT pages */
         ATA_LOG_SATA_NCQ        = 0x10,
 
+        /* READ/WRITE LONG (obsolete) */
+        ATA_CMD_READ_LONG       = 0x22,
+        ATA_CMD_READ_LONG_ONCE  = 0x23,
+        ATA_CMD_WRITE_LONG      = 0x32,
+        ATA_CMD_WRITE_LONG_ONCE = 0x33,
+
         /* SETFEATURES stuff */
         SETFEATURES_XFER        = 0x03,
         XFER_UDMA_7             = 0x47,
@@ -193,6 +202,8 @@ enum {
         SETFEATURES_WC_ON       = 0x02, /* Enable write cache */
         SETFEATURES_WC_OFF      = 0x82, /* Disable write cache */
 
+        SETFEATURES_SPINUP      = 0x07, /* Spin-up drive */
+
         /* ATAPI stuff */
         ATAPI_PKT_DMA           = (1 << 0),
         ATAPI_DMADIR            = (1 << 2),     /* ATAPI data dir:
@@ -282,7 +293,6 @@ struct ata_taskfile {
 };
 
 #define ata_id_is_ata(id)       (((id)[0] & (1 << 15)) == 0)
-#define ata_id_is_sata(id)      ((id)[93] == 0)
 #define ata_id_rahead_enabled(id) ((id)[85] & (1 << 6))
 #define ata_id_wcache_enabled(id) ((id)[85] & (1 << 5))
 #define ata_id_hpa_enabled(id)  ((id)[85] & (1 << 10))
@@ -324,6 +334,11 @@ static inline unsigned int ata_id_major_version(const u16 *id)
         return mver;
 }
 
+static inline int ata_id_is_sata(const u16 *id)
+{
+        return ata_id_major_version(id) >= 5 && id[93] == 0;
+}
+
 static inline int ata_id_current_chs_valid(const u16 *id)
 {
         /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command
@@ -350,7 +365,7 @@ static inline int ata_id_is_cfa(const u16 *id)
 
 static inline int ata_drive_40wire(const u16 *dev_id)
 {
-        if (ata_id_major_version(dev_id) >= 5 && ata_id_is_sata(dev_id))
+        if (ata_id_is_sata(dev_id))
                 return 0;       /* SATA */
         if ((dev_id[93] & 0xE000) == 0x6000)
                 return 0;       /* 80 wire */