1 files changed, 17 insertions, 1 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index dc18b87ed722..3d501db36a26 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -209,6 +209,7 @@ enum {
 
         /* bits 24:31 of ap->flags are reserved for LLD specific flags */
 
+
         /* struct ata_port pflags */
         ATA_PFLAG_EH_PENDING    = (1 << 0), /* EH pending */
         ATA_PFLAG_EH_IN_PROGRESS = (1 << 1), /* EH in progress */
@@ -225,6 +226,9 @@ enum {
         ATA_PFLAG_PM_PENDING    = (1 << 18), /* PM operation pending */
         ATA_PFLAG_INIT_GTM_VALID = (1 << 19), /* initial gtm data valid */
 
+        ATA_PFLAG_PIO32         = (1 << 20),  /* 32bit PIO */
+        ATA_PFLAG_PIO32CHANGE   = (1 << 21),  /* 32bit PIO can be turned on/off */
+
         /* struct ata_queued_cmd flags */
         ATA_QCFLAG_ACTIVE       = (1 << 0), /* cmd not yet ack'd to scsi lyer */
         ATA_QCFLAG_DMAMAP       = (1 << 1), /* SG table is DMA mapped */
@@ -379,7 +383,7 @@ enum {
         ATA_HORKAGE_BRIDGE_OK   = (1 << 10),    /* no bridge limits */
         ATA_HORKAGE_ATAPI_MOD16_DMA = (1 << 11), /* use ATAPI DMA for commands
                                                     not multiple of 16 bytes */
-        ATA_HORKAGE_FIRMWARE_WARN = (1 << 12),  /* firwmare update warning */
+        ATA_HORKAGE_FIRMWARE_WARN = (1 << 12),  /* firmware update warning */
         ATA_HORKAGE_1_5_GBPS    = (1 << 13),    /* force 1.5 Gbps */
 
          /* DMA mask for user DMA control: User visible values; DO NOT
@@ -689,7 +693,10 @@ struct ata_port {
         struct Scsi_Host        *scsi_host; /* our co-allocated scsi host */
         struct ata_port_operations *ops;
         spinlock_t              *lock;
+        /* Flags owned by the EH context. Only EH should touch these once the
+           port is active */
         unsigned long           flags;  /* ATA_FLAG_xxx */
+        /* Flags that change dynamically, protected by ap->lock */
         unsigned int            pflags; /* ATA_PFLAG_xxx */
         unsigned int            print_id; /* user visible unique port ID */
         unsigned int            port_no; /* 0 based port no. inside the host */
@@ -795,6 +802,7 @@ struct ata_port_operations {
         ata_reset_fn_t          pmp_hardreset;
         ata_postreset_fn_t      pmp_postreset;
         void (*error_handler)(struct ata_port *ap);
+        void (*lost_interrupt)(struct ata_port *ap);
         void (*post_internal_cmd)(struct ata_queued_cmd *qc);
 
         /*
@@ -836,6 +844,8 @@ struct ata_port_operations {
         void (*bmdma_start)(struct ata_queued_cmd *qc);
         void (*bmdma_stop)(struct ata_queued_cmd *qc);
         u8   (*bmdma_status)(struct ata_port *ap);
+
+        void (*drain_fifo)(struct ata_queued_cmd *qc);
 #endif /* CONFIG_ATA_SFF */
 
         ssize_t (*em_show)(struct ata_port *ap, char *buf);
@@ -1008,6 +1018,9 @@ extern int ata_cable_sata(struct ata_port *ap);
 extern int ata_cable_ignore(struct ata_port *ap);
 extern int ata_cable_unknown(struct ata_port *ap);
 
+extern void ata_pio_queue_task(struct ata_port *ap, void *data,
+                               unsigned long delay);
+
 /* Timing helpers */
 extern unsigned int ata_pio_need_iordy(const struct ata_device *);
 extern const struct ata_timing *ata_timing_find_mode(u8 xfer_mode);
@@ -1572,6 +1585,7 @@ extern bool ata_sff_qc_fill_rtf(struct ata_queued_cmd *qc);
 extern unsigned int ata_sff_host_intr(struct ata_port *ap,
                                       struct ata_queued_cmd *qc);
 extern irqreturn_t ata_sff_interrupt(int irq, void *dev_instance);
+extern void ata_sff_lost_interrupt(struct ata_port *ap);
 extern void ata_sff_freeze(struct ata_port *ap);
 extern void ata_sff_thaw(struct ata_port *ap);
 extern int ata_sff_prereset(struct ata_link *link, unsigned long deadline);
@@ -1584,9 +1598,11 @@ extern int ata_sff_softreset(struct ata_link *link, unsigned int *classes,
 extern int sata_sff_hardreset(struct ata_link *link, unsigned int *class,
                                unsigned long deadline);
 extern void ata_sff_postreset(struct ata_link *link, unsigned int *classes);
+extern void ata_sff_drain_fifo(struct ata_queued_cmd *qc);
 extern void ata_sff_error_handler(struct ata_port *ap);
 extern void ata_sff_post_internal_cmd(struct ata_queued_cmd *qc);
 extern int ata_sff_port_start(struct ata_port *ap);
+extern int ata_sff_port_start32(struct ata_port *ap);
 extern void ata_sff_std_ports(struct ata_ioports *ioaddr);
 extern unsigned long ata_bmdma_mode_filter(struct ata_device *dev,
                                            unsigned long xfer_mask);