Merge branch 'master' into gfs2

[powerpc.git] / include / linux / libata.h

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 0ddf16c..d6a3d4b 100644 (file)
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -36,7 +36,15 @@
 #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
@@ -46,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 */
 
 
@@ -289,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 {
@@ -361,6 +374,14 @@ struct ata_probe_ent {
        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 {
@@ -468,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