Merge branch 'upstream'

Conflicts:

	drivers/scsi/libata-core.c
	drivers/scsi/pdc_adma.c
	drivers/scsi/sata_mv.c
	drivers/scsi/sata_nv.c
	drivers/scsi/sata_promise.c
	drivers/scsi/sata_qstor.c
	drivers/scsi/sata_sx4.c
	drivers/scsi/sata_vsc.c
	include/linux/libata.h

1 files changed, 57 insertions, 35 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index b0171e9accc4..cc6cc08e8010 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -120,10 +120,12 @@ enum {
         ATA_SHT_USE_CLUSTERING  = 1,
 
         /* struct ata_device stuff */
-        ATA_DFLAG_LBA48         = (1 << 0), /* device supports LBA48 */
-        ATA_DFLAG_PIO           = (1 << 1), /* device currently in PIO mode */
-        ATA_DFLAG_LBA           = (1 << 2), /* device supports LBA */
-        ATA_DFLAG_CDB_INTR      = (1 << 3), /* device asserts INTRQ when ready for CDB */
+        ATA_DFLAG_LBA           = (1 << 0), /* device supports LBA */
+        ATA_DFLAG_LBA48         = (1 << 1), /* device supports LBA48 */
+        ATA_DFLAG_CDB_INTR      = (1 << 2), /* device asserts INTRQ when ready for CDB */
+        ATA_DFLAG_CFG_MASK      = (1 << 8) - 1,
+
+        ATA_DFLAG_PIO           = (1 << 8), /* device currently in PIO mode */
 
         ATA_DEV_UNKNOWN         = 0,    /* unknown device */
         ATA_DEV_ATA             = 1,    /* ATA device */
@@ -133,33 +135,35 @@ enum {
         ATA_DEV_NONE            = 5,    /* no device */
 
         /* struct ata_port flags */
-        ATA_FLAG_SLAVE_POSS     = (1 << 1), /* host supports slave dev */
+        ATA_FLAG_SLAVE_POSS     = (1 << 0), /* host supports slave dev */
                                             /* (doesn't imply presence) */
-        ATA_FLAG_PORT_DISABLED  = (1 << 2), /* port is disabled, ignore it */
-        ATA_FLAG_SATA           = (1 << 3),
-        ATA_FLAG_NO_LEGACY      = (1 << 4), /* no legacy mode check */
-        ATA_FLAG_SRST           = (1 << 5), /* (obsolete) use ATA SRST, not E.D.D. */
-        ATA_FLAG_MMIO           = (1 << 6), /* use MMIO, not PIO */
-        ATA_FLAG_SATA_RESET     = (1 << 7), /* (obsolete) use COMRESET */
-        ATA_FLAG_PIO_DMA        = (1 << 8), /* PIO cmds via DMA */
-        ATA_FLAG_PIO_POLLING    = (1 << 9), /* use polling PIO if LLD
-                                             * doesn't handle PIO interrupts */
-        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_FLAG_FLUSH_PORT_TASK = (1 << 15), /* Flush port task */
-        ATA_FLAG_IN_EH          = (1 << 16), /* EH in progress */
-
-        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_FLAG_SATA           = (1 << 1),
+        ATA_FLAG_NO_LEGACY      = (1 << 2), /* no legacy mode check */
+        ATA_FLAG_MMIO           = (1 << 3), /* use MMIO, not PIO */
+        ATA_FLAG_SRST           = (1 << 4), /* (obsolete) use ATA SRST, not E.D.D. */
+        ATA_FLAG_SATA_RESET     = (1 << 5), /* (obsolete) use COMRESET */
+        ATA_FLAG_NO_ATAPI       = (1 << 6), /* No ATAPI support */
+        ATA_FLAG_PIO_DMA        = (1 << 7), /* PIO cmds via DMA */
+        ATA_FLAG_PIO_LBA48      = (1 << 8), /* Host DMA engine is LBA28 only */
+        ATA_FLAG_IRQ_MASK       = (1 << 9), /* Mask IRQ in PIO xfers */
+        ATA_FLAG_PIO_POLLING    = (1 << 10), /* use polling PIO if LLD
+                                              * doesn't handle PIO interrupts */
+
+        ATA_FLAG_DEBUGMSG       = (1 << 17),
+        ATA_FLAG_FLUSH_PORT_TASK = (1 << 18), /* flush port task */
+
+        ATA_FLAG_DISABLED       = (1 << 19), /* port is disabled, ignore it */
+        ATA_FLAG_SUSPENDED      = (1 << 20), /* port is suspended */
+
+        /* bits 24:31 of ap->flags are reserved for LLDD specific flags */
+
+        /* struct ata_queued_cmd flags */
+        ATA_QCFLAG_ACTIVE       = (1 << 0), /* cmd not yet ack'd to scsi lyer */
+        ATA_QCFLAG_SG           = (1 << 1), /* have s/g table? */
+        ATA_QCFLAG_SINGLE       = (1 << 2), /* no s/g, just a single buffer */
         ATA_QCFLAG_DMAMAP       = ATA_QCFLAG_SG | ATA_QCFLAG_SINGLE,
-        ATA_QCFLAG_EH_SCHEDULED = (1 << 5), /* EH scheduled */
+        ATA_QCFLAG_IO           = (1 << 3), /* standard IO command */
+        ATA_QCFLAG_EH_SCHEDULED = (1 << 4), /* EH scheduled */
 
         /* host set flags */
         ATA_HOST_SIMPLEX        = (1 << 0),     /* Host is simplex, one DMA channel per host_set only */
@@ -205,10 +209,13 @@ enum {
         /* size of buffer to pad xfers ending on unaligned boundaries */
         ATA_DMA_PAD_SZ          = 4,
         ATA_DMA_PAD_BUF_SZ      = ATA_DMA_PAD_SZ * ATA_MAX_QUEUE,
-        
-        /* Masks for port functions */
+
+        /* masks for port functions */
         ATA_PORT_PRIMARY        = (1 << 0),
         ATA_PORT_SECONDARY      = (1 << 1),
+
+        /* how hard are we gonna try to probe/recover devices */
+        ATA_PROBE_MAX_TRIES     = 3,
 };
 
 enum hsm_task_states {
@@ -394,6 +401,7 @@ struct ata_port {
         unsigned int            mwdma_mask;
         unsigned int            udma_mask;
         unsigned int            cbl;    /* cable type; ATA_CBL_xxx */
+        unsigned int            sata_spd_limit; /* SATA PHY speed limit */
 
         struct ata_device       device[ATA_MAX_DEVICES];
 
@@ -519,9 +527,6 @@ extern void ata_host_set_remove(struct ata_host_set *host_set);
 extern int ata_scsi_detect(struct scsi_host_template *sht);
 extern int ata_scsi_ioctl(struct scsi_device *dev, int cmd, void __user *arg);
 extern int ata_scsi_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *));
-extern int ata_scsi_error(struct Scsi_Host *host);
-extern void ata_eh_qc_complete(struct ata_queued_cmd *qc);
-extern void ata_eh_qc_retry(struct ata_queued_cmd *qc);
 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 *);
@@ -570,7 +575,6 @@ 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);
-extern void ata_eng_timeout(struct ata_port *ap);
 extern void ata_scsi_simulate(struct ata_port *ap, struct ata_device *dev,
                               struct scsi_cmnd *cmd,
                               void (*done)(struct scsi_cmnd *));
@@ -625,6 +629,14 @@ extern int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bit
 extern unsigned long ata_pci_default_filter(const struct ata_port *, struct ata_device *, unsigned long);
 #endif /* CONFIG_PCI */
 
+/*
+ * EH
+ */
+extern int ata_scsi_error(struct Scsi_Host *host);
+extern void ata_eng_timeout(struct ata_port *ap);
+extern void ata_eh_qc_complete(struct ata_queued_cmd *qc);
+extern void ata_eh_qc_retry(struct ata_queued_cmd *qc);
+
 
 static inline int
 ata_sg_is_last(struct scatterlist *sg, struct ata_queued_cmd *qc)
@@ -678,6 +690,11 @@ static inline unsigned int ata_class_disabled(unsigned int class)
         return class == ATA_DEV_ATA_UNSUP || class == ATA_DEV_ATAPI_UNSUP;
 }
 
+static inline unsigned int ata_class_absent(unsigned int class)
+{
+        return !ata_class_enabled(class) && !ata_class_disabled(class);
+}
+
 static inline unsigned int ata_dev_enabled(const struct ata_device *dev)
 {
         return ata_class_enabled(dev->class);
@@ -688,6 +705,11 @@ static inline unsigned int ata_dev_disabled(const struct ata_device *dev)
         return ata_class_disabled(dev->class);
 }
 
+static inline unsigned int ata_dev_absent(const struct ata_device *dev)
+{
+        return ata_class_absent(dev->class);
+}
+
 static inline u8 ata_chk_status(struct ata_port *ap)
 {
         return ap->ops->check_status(ap);