1 files changed, 25 insertions, 10 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 41ea7dbc1755..9e5db2949c58 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -124,18 +124,25 @@ enum {
         ATA_FLAG_DEBUGMSG       = (1 << 10),
         ATA_FLAG_NO_ATAPI       = (1 << 11), /* No ATAPI support */
 
+        ATA_FLAG_SUSPENDED      = (1 << 12), /* port is suspended */
+
+        ATA_FLAG_PIO_LBA48      = (1 << 13), /* Host DMA engine is LBA28 only */
+        ATA_FLAG_IRQ_MASK       = (1 << 14), /* Mask IRQ in PIO xfers */
+
         ATA_QCFLAG_ACTIVE       = (1 << 1), /* cmd not yet ack'd to scsi lyer */
         ATA_QCFLAG_SG           = (1 << 3), /* have s/g table? */
         ATA_QCFLAG_SINGLE       = (1 << 4), /* no s/g, just a single buffer */
         ATA_QCFLAG_DMAMAP       = ATA_QCFLAG_SG | ATA_QCFLAG_SINGLE,
 
         /* various lengths of time */
-        ATA_TMOUT_EDD           = 5 * HZ,       /* hueristic */
+        ATA_TMOUT_EDD           = 5 * HZ,       /* heuristic */
         ATA_TMOUT_PIO           = 30 * HZ,
-        ATA_TMOUT_BOOT          = 30 * HZ,      /* hueristic */
-        ATA_TMOUT_BOOT_QUICK    = 7 * HZ,       /* hueristic */
+        ATA_TMOUT_BOOT          = 30 * HZ,      /* heuristic */
+        ATA_TMOUT_BOOT_QUICK    = 7 * HZ,       /* heuristic */
         ATA_TMOUT_CDB           = 30 * HZ,
         ATA_TMOUT_CDB_QUICK     = 5 * HZ,
+        ATA_TMOUT_INTERNAL      = 30 * HZ,
+        ATA_TMOUT_INTERNAL_QUICK = 5 * HZ,
 
         /* ATA bus states */
         BUS_UNKNOWN             = 0,
@@ -195,7 +202,7 @@ struct ata_port;
 struct ata_queued_cmd;
 
 /* typedefs */
-typedef int (*ata_qc_cb_t) (struct ata_queued_cmd *qc, unsigned int err_mask);
+typedef int (*ata_qc_cb_t) (struct ata_queued_cmd *qc);
 
 struct ata_ioports {
         unsigned long           cmd_addr;
@@ -280,9 +287,9 @@ struct ata_queued_cmd {
         /* DO NOT iterate over __sg manually, use ata_for_each_sg() */
         struct scatterlist      *__sg;
 
-        ata_qc_cb_t             complete_fn;
+        unsigned int            err_mask;
 
-        struct completion       *waiting;
+        ata_qc_cb_t             complete_fn;
 
         void                    *private_data;
 };
@@ -331,8 +338,6 @@ struct ata_port {
 
         u8                      ctl;    /* cache of ATA control register */
         u8                      last_ctl;       /* Cache last written value */
-        unsigned int            bus_state;
-        unsigned int            port_state;
         unsigned int            pio_mask;
         unsigned int            mwdma_mask;
         unsigned int            udma_mask;
@@ -436,6 +441,8 @@ extern void ata_std_ports(struct ata_ioports *ioaddr);
 extern int ata_pci_init_one (struct pci_dev *pdev, struct ata_port_info **port_info,
                              unsigned int n_ports);
 extern void ata_pci_remove_one (struct pci_dev *pdev);
+extern int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t state);
+extern int ata_pci_device_resume(struct pci_dev *pdev);
 #endif /* CONFIG_PCI */
 extern int ata_device_add(const struct ata_probe_ent *ent);
 extern void ata_host_set_remove(struct ata_host_set *host_set);
@@ -445,6 +452,10 @@ extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmn
 extern int ata_scsi_error(struct Scsi_Host *host);
 extern int ata_scsi_release(struct Scsi_Host *host);
 extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
+extern int ata_scsi_device_resume(struct scsi_device *);
+extern int ata_scsi_device_suspend(struct scsi_device *);
+extern int ata_device_resume(struct ata_port *, struct ata_device *);
+extern int ata_device_suspend(struct ata_port *, struct ata_device *);
 extern int ata_ratelimit(void);
 
 /*
@@ -478,9 +489,10 @@ extern void ata_bmdma_start (struct ata_queued_cmd *qc);
 extern void ata_bmdma_stop(struct ata_queued_cmd *qc);
 extern u8   ata_bmdma_status(struct ata_port *ap);
 extern void ata_bmdma_irq_clear(struct ata_port *ap);
-extern void ata_qc_complete(struct ata_queued_cmd *qc, unsigned int err_mask);
+extern void ata_qc_complete(struct ata_queued_cmd *qc);
 extern void ata_eng_timeout(struct ata_port *ap);
-extern void ata_scsi_simulate(u16 *id, struct scsi_cmnd *cmd,
+extern void ata_scsi_simulate(struct ata_port *ap, struct ata_device *dev,
+                              struct scsi_cmnd *cmd,
                               void (*done)(struct scsi_cmnd *));
 extern int ata_std_bios_param(struct scsi_device *sdev,
                               struct block_device *bdev,
@@ -490,6 +502,8 @@ extern int ata_scsi_slave_config(struct scsi_device *sdev);
 /*
  * Timing helpers
  */
+
+extern unsigned int ata_pio_need_iordy(const struct ata_device *);
 extern int ata_timing_compute(struct ata_device *, unsigned short,
                               struct ata_timing *, int, int);
 extern void ata_timing_merge(const struct ata_timing *,
@@ -670,6 +684,7 @@ static inline void ata_qc_reinit(struct ata_queued_cmd *qc)
         qc->cursect = qc->cursg = qc->cursg_ofs = 0;
         qc->nsect = 0;
         qc->nbytes = qc->curbytes = 0;
+        qc->err_mask = 0;
 
         ata_tf_init(qc->ap, &qc->tf, qc->dev->devno);
 }