[PATCH] lock debugging: fix DEBUG_LOCKS_WARN_ON() & debug_locks_silent

[linux.git] / include / linux / ata.h

diff --git a/include/linux/ata.h b/include/linux/ata.h
index 991b858acc308c458229e200a75e45c8207d42f8..1df941648a573a449d6807917e7a8ab4207b5a03 100644 (file)
--- 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,
@@ -320,8 +321,8 @@ static inline unsigned int ata_id_major_version(const u16 *id)
 
 static inline int ata_id_current_chs_valid(const u16 *id)
 {
-       /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command 
-          has not been issued to the device then the values of 
+       /* For ATA-1 devices, if the INITIALIZE DEVICE PARAMETERS command
+          has not been issued to the device then the values of
           id[54] to id[56] are vendor specific. */
        return (id[53] & 0x01) && /* Current translation valid */
                id[54] &&  /* cylinders in current translation */
@@ -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;