2 files changed, 66 insertions, 0 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index 93e7b99d7819..1e1140c9618b 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -1791,6 +1791,56 @@ err_out_nosup:
 }
 
 /**
+ *      ata_cable_40wire        -       return 40pin cable type
+ *      @ap: port
+ *
+ *      Helper method for drivers which want to hardwire 40 pin cable
+ *      detection.
+ */
+
+int ata_cable_40wire(struct ata_port *ap)
+{
+        return ATA_CBL_PATA40;
+}
+
+/**
+ *      ata_cable_80wire        -       return 40pin cable type
+ *      @ap: port
+ *
+ *      Helper method for drivers which want to hardwire 80 pin cable
+ *      detection.
+ */
+
+int ata_cable_80wire(struct ata_port *ap)
+{
+        return ATA_CBL_PATA80;
+}
+
+/**
+ *      ata_cable_unknown       -       return unknown PATA cable.
+ *      @ap: port
+ *
+ *      Helper method for drivers which have no PATA cable detection.
+ */
+
+int ata_cable_unknown(struct ata_port *ap)
+{
+        return ATA_CBL_PATA_UNK;
+}
+
+/**
+ *      ata_cable_sata  -       return SATA cable type
+ *      @ap: port
+ *
+ *      Helper method for drivers which have SATA cables
+ */
+
+int ata_cable_sata(struct ata_port *ap)
+{
+        return ATA_CBL_SATA;
+}
+
+/**
  *      ata_bus_probe - Reset and probe ATA bus
  *      @ap: Bus to probe
  *
@@ -1860,6 +1910,10 @@ int ata_bus_probe(struct ata_port *ap)
                         goto fail;
         }
 
+        /* Now ask for the cable type as PDIAG- should have been released */
+        if (ap->ops->cable_detect)
+                ap->cbl = ap->ops->cable_detect(ap);
+
         /* After the identify sequence we can now set up the devices. We do
            this in the normal order so that the user doesn't get confused */
 
@@ -6453,3 +6507,8 @@ EXPORT_SYMBOL_GPL(ata_dummy_irq_on);
 EXPORT_SYMBOL_GPL(ata_irq_ack);
 EXPORT_SYMBOL_GPL(ata_dummy_irq_ack);
 EXPORT_SYMBOL_GPL(ata_dev_try_classify);
+
+EXPORT_SYMBOL_GPL(ata_cable_40wire);
+EXPORT_SYMBOL_GPL(ata_cable_80wire);
+EXPORT_SYMBOL_GPL(ata_cable_unknown);
+EXPORT_SYMBOL_GPL(ata_cable_sata);
diff --git a/include/linux/libata.h b/include/linux/libata.h
index 84787cad860d..3451ef97a931 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -616,6 +616,8 @@ struct ata_port_operations {
 
         void (*post_set_mode) (struct ata_port *ap);
 
+        int (*cable_detect) (struct ata_port *ap);
+
         int  (*check_atapi_dma) (struct ata_queued_cmd *qc);
 
         void (*bmdma_setup) (struct ata_queued_cmd *qc);
@@ -834,6 +836,11 @@ extern u8 ata_dummy_irq_on(struct ata_port *ap);
 extern u8 ata_irq_ack(struct ata_port *ap, unsigned int chk_drq);
 extern u8 ata_dummy_irq_ack(struct ata_port *ap, unsigned int chk_drq);
 
+extern int ata_cable_40wire(struct ata_port *ap);
+extern int ata_cable_80wire(struct ata_port *ap);
+extern int ata_cable_sata(struct ata_port *ap);
+extern int ata_cable_unknown(struct ata_port *ap);
+
 /*
  * Timing helpers
  */