Revert "[PATCH] x86-64: fix x86_64-mm-sched-clock-share"

[safe/jmp/linux-2.6] / include / linux / ata.h

diff --git a/include/linux/ata.h b/include/linux/ata.h
index f4dc8df..c043c1c 100644 (file)
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -64,6 +64,28 @@ enum {
        ATA_ID_PROD_LEN         = 40,
 
        ATA_PCI_CTL_OFS         = 2,
+
+       ATA_PIO0                = (1 << 0),
+       ATA_PIO1                = ATA_PIO0 | (1 << 1),
+       ATA_PIO2                = ATA_PIO1 | (1 << 2),
+       ATA_PIO3                = ATA_PIO2 | (1 << 3),
+       ATA_PIO4                = ATA_PIO3 | (1 << 4),
+       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),
@@ -126,6 +148,7 @@ enum {
        ATA_REG_IRQ             = ATA_REG_NSECT,
 
        /* ATA device commands */
+       ATA_CMD_DEV_RESET       = 0x08, /* ATAPI device reset */
        ATA_CMD_CHK_POWER       = 0xE5, /* check power mode */
        ATA_CMD_STANDBY         = 0xE2, /* place in standby power mode */
        ATA_CMD_IDLE            = 0xE3, /* place in idle power mode */
@@ -151,6 +174,7 @@ enum {
        ATA_CMD_WRITE_MULTI_EXT = 0x39,
        ATA_CMD_WRITE_MULTI_FUA_EXT = 0xCE,
        ATA_CMD_SET_FEATURES    = 0xEF,
+       ATA_CMD_SET_MULTI       = 0xC6,
        ATA_CMD_PACKET          = 0xA0,
        ATA_CMD_VERIFY          = 0x40,
        ATA_CMD_VERIFY_EXT      = 0x42,
@@ -162,6 +186,8 @@ enum {
        ATA_CMD_SET_MAX         = 0xF9,
        ATA_CMD_SET_MAX_EXT     = 0x37,
        ATA_CMD_READ_LOG_EXT    = 0x2f,
+       ATA_CMD_PMP_READ        = 0xE4,
+       ATA_CMD_PMP_WRITE       = 0xE8,
 
        /* READ_LOG_EXT pages */
        ATA_LOG_SATA_NCQ        = 0x10,
@@ -202,12 +228,36 @@ 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:
                                                   0=to device, 1=to host */
        ATAPI_CDB_LEN           = 16,
 
+       /* PMP stuff */
+       SATA_PMP_MAX_PORTS      = 15,
+       SATA_PMP_CTRL_PORT      = 15,
+
+       SATA_PMP_GSCR_DWORDS    = 128,
+       SATA_PMP_GSCR_PROD_ID   = 0,
+       SATA_PMP_GSCR_REV       = 1,
+       SATA_PMP_GSCR_PORT_INFO = 2,
+       SATA_PMP_GSCR_ERROR     = 32,
+       SATA_PMP_GSCR_ERROR_EN  = 33,
+       SATA_PMP_GSCR_FEAT      = 64,
+       SATA_PMP_GSCR_FEAT_EN   = 96,
+
+       SATA_PMP_PSCR_STATUS    = 0,
+       SATA_PMP_PSCR_ERROR     = 1,
+       SATA_PMP_PSCR_CONTROL   = 2,
+
+       SATA_PMP_FEAT_BIST      = (1 << 0),
+       SATA_PMP_FEAT_PMREQ     = (1 << 1),
+       SATA_PMP_FEAT_DYNSSC    = (1 << 2),
+       SATA_PMP_FEAT_NOTIFY    = (1 << 3),
+
        /* cable types */
        ATA_CBL_NONE            = 0,
        ATA_CBL_PATA40          = 1,
@@ -247,7 +297,7 @@ enum ata_tf_protocols {
        /* ATA taskfile protocols */
        ATA_PROT_UNKNOWN,       /* unknown/invalid */
        ATA_PROT_NODATA,        /* no data */
-       ATA_PROT_PIO,           /* PIO single sector */
+       ATA_PROT_PIO,           /* PIO data xfer */
        ATA_PROT_DMA,           /* DMA */
        ATA_PROT_NCQ,           /* NCQ */
        ATA_PROT_ATAPI,         /* packet command, PIO data xfer*/
@@ -414,4 +464,9 @@ static inline int lba_48_ok(u64 block, u32 n_block)
        return ((block + n_block - 1) < ((u64)1 << 48)) && (n_block <= 65536);
 }
 
+#define sata_pmp_gscr_vendor(gscr)     ((gscr)[SATA_PMP_GSCR_PROD_ID] & 0xffff)
+#define sata_pmp_gscr_devid(gscr)      ((gscr)[SATA_PMP_GSCR_PROD_ID] >> 16)
+#define sata_pmp_gscr_rev(gscr)                (((gscr)[SATA_PMP_GSCR_REV] >> 8) & 0xff)
+#define sata_pmp_gscr_ports(gscr)      ((gscr)[SATA_PMP_GSCR_PORT_INFO] & 0xf)
+
 #endif /* __LINUX_ATA_H__ */