1 files changed, 145 insertions, 47 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 20b1cf527c6..d6a3d4b345f 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -30,12 +30,23 @@
 #include <linux/interrupt.h>
 #include <linux/pci.h>
 #include <linux/dma-mapping.h>
+#include <asm/scatterlist.h>
 #include <asm/io.h>
 #include <linux/ata.h>
 #include <linux/workqueue.h>
 #include <scsi/scsi_host.h>
 
 /*
+ * Define if arch has non-standard setup.  This is a _PCI_ standard
+ * not a legacy or ISA standard.
+ */
+#ifdef CONFIG_ATA_NONSTANDARD
+#include <asm/libata-portmap.h>
+#else
+#include <asm-generic/libata-portmap.h>
+#endif
+
+/*
  * compile-time options: to be removed as soon as all the drivers are
  * converted to the new debugging mechanism
  */
@@ -43,7 +54,7 @@
 #undef ATA_VERBOSE_DEBUG        /* yet more debugging output */
 #undef ATA_IRQ_TRAP             /* define to ack screaming irqs */
 #undef ATA_NDEBUG               /* define to disable quick runtime checks */
-#undef ATA_ENABLE_PATA          /* define to enable PATA support in some
+#define ATA_ENABLE_PATA         /* define to enable PATA support in some
                                  * low-level drivers */
 
 
@@ -111,8 +122,6 @@ enum {
         /* tag ATA_MAX_QUEUE - 1 is reserved for internal commands */
         ATA_MAX_QUEUE           = 32,
         ATA_TAG_INTERNAL        = ATA_MAX_QUEUE - 1,
-        ATA_MAX_SECTORS         = 200,  /* FIXME */
-        ATA_MAX_SECTORS_LBA48   = 65535,
         ATA_MAX_BUS             = 2,
         ATA_DEF_BUSY_WAIT       = 10000,
         ATA_SHORT_PAUSE         = (HZ >> 6) + 1,
@@ -130,6 +139,7 @@ enum {
         ATA_DFLAG_CFG_MASK      = (1 << 8) - 1,
 
         ATA_DFLAG_PIO           = (1 << 8), /* device currently in PIO mode */
+        ATA_DFLAG_SUSPENDED     = (1 << 9), /* device suspended */
         ATA_DFLAG_INIT_MASK     = (1 << 16) - 1,
 
         ATA_DFLAG_DETACH        = (1 << 16),
@@ -159,22 +169,28 @@ enum {
         ATA_FLAG_HRST_TO_RESUME = (1 << 11), /* hardreset to resume phy */
         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_FLUSH_PORT_TASK = (1 << 14), /* flush port task */
 
-        ATA_FLAG_EH_PENDING     = (1 << 15), /* EH pending */
-        ATA_FLAG_EH_IN_PROGRESS = (1 << 16), /* EH in progress */
-        ATA_FLAG_FROZEN         = (1 << 17), /* port is frozen */
-        ATA_FLAG_RECOVERED      = (1 << 18), /* recovery action performed */
-        ATA_FLAG_LOADING        = (1 << 19), /* boot/loading probe */
-        ATA_FLAG_UNLOADING      = (1 << 20), /* module is unloading */
-        ATA_FLAG_SCSI_HOTPLUG   = (1 << 21), /* SCSI hotplug scheduled */
+        /* The following flag belongs to ap->pflags but is kept in
+         * ap->flags because it's referenced in many LLDs and will be
+         * removed in not-too-distant future.
+         */
+        ATA_FLAG_DISABLED       = (1 << 23), /* port is disabled, ignore it */
 
-        ATA_FLAG_DISABLED       = (1 << 22), /* port is disabled, ignore it */
-        ATA_FLAG_SUSPENDED      = (1 << 23), /* port is suspended (power) */
+        /* bits 24:31 of ap->flags are reserved for LLD specific flags */
 
-        /* bits 24:31 of ap->flags are reserved for LLDD specific flags */
+        /* struct ata_port pflags */
+        ATA_PFLAG_EH_PENDING    = (1 << 0), /* EH pending */
+        ATA_PFLAG_EH_IN_PROGRESS = (1 << 1), /* EH in progress */
+        ATA_PFLAG_FROZEN        = (1 << 2), /* port is frozen */
+        ATA_PFLAG_RECOVERED     = (1 << 3), /* recovery action performed */
+        ATA_PFLAG_LOADING       = (1 << 4), /* boot/loading probe */
+        ATA_PFLAG_UNLOADING     = (1 << 5), /* module is unloading */
+        ATA_PFLAG_SCSI_HOTPLUG  = (1 << 6), /* SCSI hotplug scheduled */
+
+        ATA_PFLAG_FLUSH_PORT_TASK = (1 << 16), /* flush port task */
+        ATA_PFLAG_SUSPENDED     = (1 << 17), /* port is suspended (power) */
+        ATA_PFLAG_PM_PENDING    = (1 << 18), /* PM operation pending */
 
         /* struct ata_queued_cmd flags */
         ATA_QCFLAG_ACTIVE       = (1 << 0), /* cmd not yet ack'd to scsi lyer */
@@ -189,8 +205,8 @@ enum {
         ATA_QCFLAG_EH_SCHEDULED = (1 << 18), /* EH scheduled (obsolete) */
 
         /* host set flags */
-        ATA_HOST_SIMPLEX        = (1 << 0),     /* Host is simplex, one DMA channel per host_set only */
-        
+        ATA_HOST_SIMPLEX        = (1 << 0),     /* Host is simplex, one DMA channel per host only */
+
         /* various lengths of time */
         ATA_TMOUT_BOOT          = 30 * HZ,      /* heuristic */
         ATA_TMOUT_BOOT_QUICK    = 7 * HZ,       /* heuristic */
@@ -217,8 +233,8 @@ enum {
         /* encoding various smaller bitmaps into a single
          * unsigned int bitmap
          */
-        ATA_BITS_PIO            = 5,
-        ATA_BITS_MWDMA          = 3,
+        ATA_BITS_PIO            = 7,
+        ATA_BITS_MWDMA          = 5,
         ATA_BITS_UDMA           = 8,
 
         ATA_SHIFT_PIO           = 0,
@@ -247,15 +263,24 @@ enum {
         ATA_EH_REVALIDATE       = (1 << 0),
         ATA_EH_SOFTRESET        = (1 << 1),
         ATA_EH_HARDRESET        = (1 << 2),
+        ATA_EH_SUSPEND          = (1 << 3),
+        ATA_EH_RESUME           = (1 << 4),
+        ATA_EH_PM_FREEZE        = (1 << 5),
 
         ATA_EH_RESET_MASK       = ATA_EH_SOFTRESET | ATA_EH_HARDRESET,
-        ATA_EH_PERDEV_MASK      = ATA_EH_REVALIDATE,
+        ATA_EH_PERDEV_MASK      = ATA_EH_REVALIDATE | ATA_EH_SUSPEND |
+                                  ATA_EH_RESUME | ATA_EH_PM_FREEZE,
 
         /* ata_eh_info->flags */
         ATA_EHI_HOTPLUGGED      = (1 << 0),  /* could have been hotplugged */
+        ATA_EHI_RESUME_LINK     = (1 << 1),  /* resume link (reset modifier) */
+        ATA_EHI_NO_AUTOPSY      = (1 << 2),  /* no autopsy */
+        ATA_EHI_QUIET           = (1 << 3),  /* be quiet */
 
         ATA_EHI_DID_RESET       = (1 << 16), /* already reset this port */
 
+        ATA_EHI_RESET_MODIFIER_MASK = ATA_EHI_RESUME_LINK,
+
         /* max repeat if error condition is still set after ->error_handler */
         ATA_EH_MAX_REPEAT       = 5,
 
@@ -272,6 +297,11 @@ enum {
          * most devices.
          */
         ATA_SPINUP_WAIT         = 8000,
+        
+        /* Horkage types. May be set by libata or controller on drives
+           (some horkage may be drive/controller pair dependant */
+
+        ATA_HORKAGE_DIAGNOSTIC  = (1 << 0),     /* Failed boot diag */
 };
 
 enum hsm_task_states {
@@ -333,23 +363,32 @@ struct ata_probe_ent {
         struct scsi_host_template *sht;
         struct ata_ioports      port[ATA_MAX_PORTS];
         unsigned int            n_ports;
-        unsigned int            hard_port_no;
+        unsigned int            dummy_port_mask;
         unsigned int            pio_mask;
         unsigned int            mwdma_mask;
         unsigned int            udma_mask;
-        unsigned int            legacy_mode;
         unsigned long           irq;
+        unsigned long           irq2;
         unsigned int            irq_flags;
-        unsigned long           host_flags;
-        unsigned long           host_set_flags;
+        unsigned long           port_flags;
+        unsigned long           _host_flags;
         void __iomem            *mmio_base;
         void                    *private_data;
+
+        /* port_info for the secondary port.  Together with irq2, it's
+         * used to implement non-uniform secondary port.  Currently,
+         * the only user is ata_piix combined mode.  This workaround
+         * will be removed together with ata_probe_ent when init model
+         * is updated.
+         */
+        const struct ata_port_info *pinfo2;
 };
 
-struct ata_host_set {
+struct ata_host {
         spinlock_t              lock;
         struct device           *dev;
         unsigned long           irq;
+        unsigned long           irq2;
         void __iomem            *mmio_base;
         unsigned int            n_ports;
         void                    *private_data;
@@ -357,7 +396,6 @@ struct ata_host_set {
         unsigned long           flags;
         int                     simplex_claimed;        /* Keep seperate in case we
                                                            ever need to do this locked */
-        struct ata_host_set     *next;          /* for legacy mode */
         struct ata_port         *ports[0];
 };
 
@@ -403,7 +441,7 @@ struct ata_queued_cmd {
         void                    *private_data;
 };
 
-struct ata_host_stats {
+struct ata_port_stats {
         unsigned long           unhandled_irq;
         unsigned long           idle_irq;
         unsigned long           rw_reqbuf;
@@ -451,6 +489,7 @@ struct ata_device {
 
         /* error history */
         struct ata_ering        ering;
+        unsigned int            horkage;        /* List of broken features */
 };
 
 /* Offset into struct ata_device.  Fields above it are maintained
@@ -481,13 +520,13 @@ struct ata_eh_context {
 };
 
 struct ata_port {
-        struct Scsi_Host        *host;  /* our co-allocated scsi host */
+        struct Scsi_Host        *scsi_host; /* our co-allocated scsi host */
         const struct ata_port_operations *ops;
         spinlock_t              *lock;
         unsigned long           flags;  /* ATA_FLAG_xxx */
+        unsigned int            pflags; /* ATA_PFLAG_xxx */
         unsigned int            id;     /* unique id req'd by scsi midlyr */
         unsigned int            port_no; /* unique port #; from zero */
-        unsigned int            hard_port_no;   /* hardware port #; from zero */
 
         struct ata_prd          *prd;    /* our SG list */
         dma_addr_t              prd_dma; /* and its DMA mapping */
@@ -506,7 +545,7 @@ struct ata_port {
         unsigned int            hw_sata_spd_limit;
         unsigned int            sata_spd_limit; /* SATA PHY speed limit */
 
-        /* record runtime error info, protected by host_set lock */
+        /* record runtime error info, protected by host lock */
         struct ata_eh_info      eh_info;
         /* EH context owned by EH */
         struct ata_eh_context   eh_context;
@@ -520,8 +559,8 @@ struct ata_port {
         unsigned int            active_tag;
         u32                     sactive;
 
-        struct ata_host_stats   stats;
-        struct ata_host_set     *host_set;
+        struct ata_port_stats   stats;
+        struct ata_host         *host;
         struct device           *dev;
 
         struct work_struct      port_task;
@@ -534,6 +573,9 @@ struct ata_port {
         struct list_head        eh_done_q;
         wait_queue_head_t       eh_wait_q;
 
+        pm_message_t            pm_mesg;
+        int                     *pm_result;
+
         void                    *private_data;
 
         u8                      sector_buf[ATA_SECT_SIZE]; /* owned by EH */
@@ -588,10 +630,13 @@ struct ata_port_operations {
         void (*scr_write) (struct ata_port *ap, unsigned int sc_reg,
                            u32 val);
 
+        int (*port_suspend) (struct ata_port *ap, pm_message_t mesg);
+        int (*port_resume) (struct ata_port *ap);
+
         int (*port_start) (struct ata_port *ap);
         void (*port_stop) (struct ata_port *ap);
 
-        void (*host_stop) (struct ata_host_set *host_set);
+        void (*host_stop) (struct ata_host *host);
 
         void (*bmdma_stop) (struct ata_queued_cmd *qc);
         u8   (*bmdma_status) (struct ata_port *ap);
@@ -599,7 +644,7 @@ struct ata_port_operations {
 
 struct ata_port_info {
         struct scsi_host_template       *sht;
-        unsigned long           host_flags;
+        unsigned long           flags;
         unsigned long           pio_mask;
         unsigned long           mwdma_mask;
         unsigned long           udma_mask;
@@ -621,9 +666,25 @@ struct ata_timing {
 
 #define FIT(v,vmin,vmax)        max_t(short,min_t(short,v,vmax),vmin)
 
-extern const unsigned long sata_deb_timing_boot[];
-extern const unsigned long sata_deb_timing_eh[];
-extern const unsigned long sata_deb_timing_before_fsrst[];
+extern const unsigned long sata_deb_timing_normal[];
+extern const unsigned long sata_deb_timing_hotplug[];
+extern const unsigned long sata_deb_timing_long[];
+
+extern const struct ata_port_operations ata_dummy_port_ops;
+
+static inline const unsigned long *
+sata_ehc_deb_timing(struct ata_eh_context *ehc)
+{
+        if (ehc->i.flags & ATA_EHI_HOTPLUGGED)
+                return sata_deb_timing_hotplug;
+        else
+                return sata_deb_timing_normal;
+}
+
+static inline int ata_port_is_dummy(struct ata_port *ap)
+{
+        return ap->ops == &ata_dummy_port_ops;
+}
 
 extern void ata_port_probe(struct ata_port *);
 extern void __sata_phy_reset(struct ata_port *ap);
@@ -643,17 +704,30 @@ 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 void ata_pci_device_do_suspend(struct pci_dev *pdev, pm_message_t mesg);
+extern void ata_pci_device_do_resume(struct pci_dev *pdev);
+extern int ata_pci_device_suspend(struct pci_dev *pdev, pm_message_t mesg);
 extern int ata_pci_device_resume(struct pci_dev *pdev);
 extern int ata_pci_clear_simplex(struct pci_dev *pdev);
 #endif /* CONFIG_PCI */
 extern int ata_device_add(const struct ata_probe_ent *ent);
 extern void ata_port_detach(struct ata_port *ap);
-extern void ata_host_set_remove(struct ata_host_set *host_set);
+extern void ata_host_init(struct ata_host *, struct device *,
+                          unsigned long, const struct ata_port_operations *);
+extern void ata_host_remove(struct ata_host *host);
 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_release(struct Scsi_Host *host);
+extern void ata_sas_port_destroy(struct ata_port *);
+extern struct ata_port *ata_sas_port_alloc(struct ata_host *,
+                                           struct ata_port_info *, struct Scsi_Host *);
+extern int ata_sas_port_init(struct ata_port *);
+extern int ata_sas_port_start(struct ata_port *ap);
+extern void ata_sas_port_stop(struct ata_port *ap);
+extern int ata_sas_slave_configure(struct scsi_device *, struct ata_port *);
+extern int ata_sas_queuecmd(struct scsi_cmnd *cmd, void (*done)(struct scsi_cmnd *),
+                            struct ata_port *ap);
 extern unsigned int ata_host_intr(struct ata_port *ap, struct ata_queued_cmd *qc);
 extern int sata_scr_valid(struct ata_port *ap);
 extern int sata_scr_read(struct ata_port *ap, int reg, u32 *val);
@@ -662,9 +736,9 @@ extern int sata_scr_write_flush(struct ata_port *ap, int reg, u32 val);
 extern int ata_port_online(struct ata_port *ap);
 extern int ata_port_offline(struct ata_port *ap);
 extern int ata_scsi_device_resume(struct scsi_device *);
-extern int ata_scsi_device_suspend(struct scsi_device *, pm_message_t state);
-extern int ata_device_resume(struct ata_device *);
-extern int ata_device_suspend(struct ata_device *, pm_message_t state);
+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,
@@ -689,7 +763,7 @@ extern u8 ata_altstatus(struct ata_port *ap);
 extern void ata_exec_command(struct ata_port *ap, const struct ata_taskfile *tf);
 extern int ata_port_start (struct ata_port *ap);
 extern void ata_port_stop (struct ata_port *ap);
-extern void ata_host_stop (struct ata_host_set *host_set);
+extern void ata_host_stop (struct ata_host *host);
 extern irqreturn_t ata_interrupt (int irq, void *dev_instance, struct pt_regs *regs);
 extern void ata_mmio_data_xfer(struct ata_device *adev, unsigned char *buf,
                                unsigned int buflen, int write_data);
@@ -775,7 +849,7 @@ struct pci_bits {
         unsigned long           val;
 };
 
-extern void ata_pci_host_stop (struct ata_host_set *host_set);
+extern void ata_pci_host_stop (struct ata_host *host);
 extern struct ata_probe_ent *
 ata_pci_init_native_mode(struct pci_dev *pdev, struct ata_port_info **port, int portmask);
 extern int pci_test_config_bits(struct pci_dev *pdev, const struct pci_bits *bits);
@@ -824,19 +898,24 @@ extern void ata_do_eh(struct ata_port *ap, ata_prereset_fn_t prereset,
         (ehi)->desc_len = 0; \
 } while (0)
 
-static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi)
+static inline void __ata_ehi_hotplugged(struct ata_eh_info *ehi)
 {
         if (ehi->flags & ATA_EHI_HOTPLUGGED)
                 return;
 
-        ehi->flags |= ATA_EHI_HOTPLUGGED;
+        ehi->flags |= ATA_EHI_HOTPLUGGED | ATA_EHI_RESUME_LINK;
         ehi->hotplug_timestamp = jiffies;
 
-        ehi->err_mask |= AC_ERR_ATA_BUS;
         ehi->action |= ATA_EH_SOFTRESET;
         ehi->probe_mask |= (1 << ATA_MAX_DEVICES) - 1;
 }
 
+static inline void ata_ehi_hotplugged(struct ata_eh_info *ehi)
+{
+        __ata_ehi_hotplugged(ehi);
+        ehi->err_mask |= AC_ERR_ATA_BUS;
+}
+
 /*
  * qc helpers
  */
@@ -887,6 +966,9 @@ static inline unsigned int ata_tag_internal(unsigned int tag)
         return tag == ATA_MAX_QUEUE - 1;
 }
 
+/*
+ * device helpers
+ */
 static inline unsigned int ata_class_enabled(unsigned int class)
 {
         return class == ATA_DEV_ATA || class == ATA_DEV_ATAPI;
@@ -917,6 +999,22 @@ static inline unsigned int ata_dev_absent(const struct ata_device *dev)
         return ata_class_absent(dev->class);
 }
 
+static inline unsigned int ata_dev_ready(const struct ata_device *dev)
+{
+        return ata_dev_enabled(dev) && !(dev->flags & ATA_DFLAG_SUSPENDED);
+}
+
+/*
+ * port helpers
+ */
+static inline int ata_port_max_devices(const struct ata_port *ap)
+{
+        if (ap->flags & ATA_FLAG_SLAVE_POSS)
+                return 2;
+        return 1;
+}
+
+
 static inline u8 ata_chk_status(struct ata_port *ap)
 {
         return ap->ops->check_status(ap);