Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev

* 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik/libata-dev: (82 commits)
  [PATCH] pata_ali: small fixes
  [PATCH] pata_via: VIA 8251 bridged systems are now out and about
  [PATCH] trivial piix: swap bogus dot for comma space
  [PATCH] sata_promise: PHYMODE4 fixup
  [PATCH] libata: always use polling IDENTIFY
  [libata] pata_cs5535: fix build
  [PATCH] ahci: do not powerdown during initialization
  [PATCH] libata: prepare ata_sg_clean() for invocation from EH
  [PATCH] libata: separate out rw ATA taskfile building into ata_build_rw_tf()
  [PATCH] libata: implement ata_exec_internal_sg()
  [PATCH] libata: make sure IRQ is cleared after ata_bmdma_freeze()
  [PATCH] libata: move BMDMA host status recording from EH to interrupt handler
  [PATCH] libata: make sure sdev doesn't go away while rescanning
  [PATCH] libata: don't request sense if the port is frozen
  [PATCH] libata: fix READ CAPACITY simulation
  [PATCH] libata: implement ATA_FLAG_SETXFER_POLLING and use it in pata_via, take #2
  [PATCH] libata: set IRQF_SHARED for legacy PCI IDE IRQs
  [PATCH] libata: remove unused HSM_ST_UNKNOWN
  [PATCH] libata: kill unnecessary sht->max_sectors initializations
  [PATCH] libata: add missing sht->slave_destroy
  ...

3 files changed, 40 insertions, 39 deletions

diff --git a/include/linux/ata.h b/include/linux/ata.h
index d89441907024..1df941648a57 100644
--- a/include/linux/ata.h
+++ b/include/linux/ata.h
@@ -200,8 +200,9 @@ enum {
         ATA_CBL_NONE            = 0,
         ATA_CBL_PATA40          = 1,
         ATA_CBL_PATA80          = 2,
-        ATA_CBL_PATA_UNK        = 3,
-        ATA_CBL_SATA            = 4,
+        ATA_CBL_PATA40_SHORT    = 3,            /* 40 wire cable to high UDMA spec */
+        ATA_CBL_PATA_UNK        = 4,
+        ATA_CBL_SATA            = 5,
 
         /* SATA Status and Control Registers */
         SCR_STATUS              = 0,
@@ -342,6 +343,15 @@ static inline int ata_id_is_cfa(const u16 *id)
         return 0;
 }
 
+static inline int ata_drive_40wire(const u16 *dev_id)
+{
+        if (ata_id_major_version(dev_id) >= 5 && ata_id_is_sata(dev_id))
+                return 0;       /* SATA */
+        if (dev_id[93] & 0x4000)
+                return 0;       /* 80 wire */
+        return 1;
+}
+
 static inline int atapi_cdb_len(const u16 *dev_id)
 {
         u16 tmp = dev_id[0] & 0x3;
diff --git a/include/linux/libata.h b/include/linux/libata.h
index abd2debebca2..202283b5df96 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -140,6 +140,7 @@ enum {
         ATA_DFLAG_LBA48         = (1 << 1), /* device supports LBA48 */
         ATA_DFLAG_CDB_INTR      = (1 << 2), /* device asserts INTRQ when ready for CDB */
         ATA_DFLAG_NCQ           = (1 << 3), /* device supports NCQ */
+        ATA_DFLAG_FLUSH_EXT     = (1 << 4), /* do FLUSH_EXT instead of FLUSH */
         ATA_DFLAG_CFG_MASK      = (1 << 8) - 1,
 
         ATA_DFLAG_PIO           = (1 << 8), /* device limited to PIO mode */
@@ -175,6 +176,7 @@ enum {
         ATA_FLAG_SKIP_D2H_BSY   = (1 << 12), /* can't wait for the first D2H
                                               * Register FIS clearing BSY */
         ATA_FLAG_DEBUGMSG       = (1 << 13),
+        ATA_FLAG_SETXFER_POLLING= (1 << 14), /* use polling for SETXFER */
 
         /* The following flag belongs to ap->pflags but is kept in
          * ap->flags because it's referenced in many LLDs and will be
@@ -283,6 +285,9 @@ enum {
         ATA_EHI_QUIET           = (1 << 3),  /* be quiet */
 
         ATA_EHI_DID_RESET       = (1 << 16), /* already reset this port */
+        ATA_EHI_PRINTINFO       = (1 << 17), /* print configuration info */
+        ATA_EHI_SETMODE         = (1 << 18), /* configure transfer mode */
+        ATA_EHI_POST_SETMODE    = (1 << 19), /* revaildating after setmode */
 
         ATA_EHI_RESET_MODIFIER_MASK = ATA_EHI_RESUME_LINK,
 
@@ -307,10 +312,11 @@ enum {
            (some horkage may be drive/controller pair dependant */
 
         ATA_HORKAGE_DIAGNOSTIC  = (1 << 0),     /* Failed boot diag */
+        ATA_HORKAGE_NODMA       = (1 << 1),     /* DMA problems */
+        ATA_HORKAGE_NONCQ       = (1 << 2),     /* Don't use NCQ */
 };
 
 enum hsm_task_states {
-        HSM_ST_UNKNOWN,         /* state unknown */
         HSM_ST_IDLE,            /* no command on going */
         HSM_ST,                 /* (waiting the device to) transfer data */
         HSM_ST_LAST,            /* (waiting the device to) complete command */
@@ -329,6 +335,7 @@ enum ata_completion_errors {
         AC_ERR_SYSTEM           = (1 << 6), /* system error */
         AC_ERR_INVALID          = (1 << 7), /* invalid argument */
         AC_ERR_OTHER            = (1 << 8), /* unknown */
+        AC_ERR_NODEV_HINT       = (1 << 9), /* polling device detection hint */
 };
 
 /* forward declarations */
@@ -700,6 +707,8 @@ extern int sata_phy_debounce(struct ata_port *ap, const unsigned long *param);
 extern int sata_phy_resume(struct ata_port *ap, const unsigned long *param);
 extern int ata_std_prereset(struct ata_port *ap);
 extern int ata_std_softreset(struct ata_port *ap, unsigned int *classes);
+extern int sata_port_hardreset(struct ata_port *ap,
+                               const unsigned long *timing);
 extern int sata_std_hardreset(struct ata_port *ap, unsigned int *class);
 extern void ata_std_postreset(struct ata_port *ap, unsigned int *classes);
 extern void ata_port_disable(struct ata_port *);
@@ -744,9 +753,8 @@ extern int ata_scsi_device_suspend(struct scsi_device *, pm_message_t mesg);
 extern int ata_host_suspend(struct ata_host *host, pm_message_t mesg);
 extern void ata_host_resume(struct ata_host *host);
 extern int ata_ratelimit(void);
-extern unsigned int ata_busy_sleep(struct ata_port *ap,
-                                   unsigned long timeout_pat,
-                                   unsigned long timeout);
+extern int ata_busy_sleep(struct ata_port *ap,
+                          unsigned long timeout_pat, unsigned long timeout);
 extern void ata_port_queue_task(struct ata_port *ap, void (*fn)(void *),
                                 void *data, unsigned long delay);
 extern u32 ata_wait_register(void __iomem *reg, u32 mask, u32 val,
@@ -787,6 +795,7 @@ extern void ata_id_string(const u16 *id, unsigned char *s,
                           unsigned int ofs, unsigned int len);
 extern void ata_id_c_string(const u16 *id, unsigned char *s,
                             unsigned int ofs, unsigned int len);
+extern unsigned long ata_device_blacklisted(const struct ata_device *dev);
 extern void ata_bmdma_setup (struct ata_queued_cmd *qc);
 extern void ata_bmdma_start (struct ata_queued_cmd *qc);
 extern void ata_bmdma_stop(struct ata_queued_cmd *qc);
@@ -1061,7 +1070,7 @@ static inline u8 ata_busy_wait(struct ata_port *ap, unsigned int bits,
                 udelay(10);
                 status = ata_chk_status(ap);
                 max--;
-        } while ((status & bits) && (max > 0));
+        } while (status != 0xff && (status & bits) && (max > 0));
 
         return status;
 }
@@ -1082,7 +1091,7 @@ static inline u8 ata_wait_idle(struct ata_port *ap)
 {
         u8 status = ata_busy_wait(ap, ATA_BUSY | ATA_DRQ, 1000);
 
-        if (status & (ATA_BUSY | ATA_DRQ)) {
+        if (status != 0xff && (status & (ATA_BUSY | ATA_DRQ))) {
                 unsigned long l = ap->ioaddr.status_addr;
                 if (ata_msg_warn(ap))
                         printk(KERN_WARNING "ATA: abnormal status 0x%X on port 0x%lX\n",
@@ -1148,37 +1157,6 @@ static inline void ata_qc_reinit(struct ata_queued_cmd *qc)
 }
 
 /**
- *      ata_irq_on - Enable interrupts on a port.
- *      @ap: Port on which interrupts are enabled.
- *
- *      Enable interrupts on a legacy IDE device using MMIO or PIO,
- *      wait for idle, clear any pending interrupts.
- *
- *      LOCKING:
- *      Inherited from caller.
- */
-
-static inline u8 ata_irq_on(struct ata_port *ap)
-{
-        struct ata_ioports *ioaddr = &ap->ioaddr;
-        u8 tmp;
-
-        ap->ctl &= ~ATA_NIEN;
-        ap->last_ctl = ap->ctl;
-
-        if (ap->flags & ATA_FLAG_MMIO)
-                writeb(ap->ctl, (void __iomem *) ioaddr->ctl_addr);
-        else
-                outb(ap->ctl, ioaddr->ctl_addr);
-        tmp = ata_wait_idle(ap);
-
-        ap->ops->irq_clear(ap);
-
-        return tmp;
-}
-
-
-/**
  *      ata_irq_ack - Acknowledge a device interrupt.
  *      @ap: Port on which interrupts are enabled.
  *
diff --git a/include/linux/pata_platform.h b/include/linux/pata_platform.h
new file mode 100644
index 000000000000..2d5fd647e0e9
--- /dev/null
+++ b/include/linux/pata_platform.h
@@ -0,0 +1,13 @@
+#ifndef __LINUX_PATA_PLATFORM_H
+#define __LINUX_PATA_PLATFORM_H
+
+struct pata_platform_info {
+        /*
+         * I/O port shift, for platforms with ports that are
+         * constantly spaced and need larger than the 1-byte
+         * spacing used by ata_std_ports().
+         */
+        unsigned int ioport_shift;
+};
+
+#endif /* __LINUX_PATA_PLATFORM_H */