Skip to contentSkip to conversation

libata: cable logic

PATCH Applied Alan Cox 2 participants 2 messages Apr 8, 2008 – Apr 12, 2008 libata

lore
Share & tools
lore

Alan Cox

author
#0 lore raw

PATCH 1/1 libata: cable logic

The cable detect isolation patch inadvertently removed 40 wire short cable handling. Put it back

Signed-off-by Alan Cox <[email protected]>
drivers/ata/libata-core.c +4 -0
diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-rc8-mm1/drivers/ata/libata-core.c linux-2.6.25-rc8-mm1/drivers/ata/libata-core.c
@@ -4559,6 +4564,10 @@
 	/* If the controller thinks we are 80 wire, we are */
 	if (ap->cbl == ATA_CBL_PATA80 || ap->cbl == ATA_CBL_SATA)
 		return 0;
+	/* If the system is known to be 40 wire short cable (eg laptop),
+	   then we allow 80 wire modes even if the drive isn't sure */
+	if (ap->cbl == ATA_CBL_PATA40_SHORT)
+		return 0;
 	/* If the controller doesn't know we scan
 
 	   - Note: We look for all 40 wire detects at this point.
Applied
#1 lore raw
Quoted 9 lines · Alan Cox

The cable detect isolation patch inadvertently removed 40 wire short cable handling. Put it back

Signed-off-by Alan Cox <[email protected]>

diff -u --new-file --recursive --exclude-from /usr/src/exclude linux.vanilla-2.6.25-rc8-mm1/drivers/ata/libata-core.c linux-2.6.25-rc8-mm1/drivers/ata/libata-core.c

drivers/ata/libata-core.c line 4573

Quoted 10 lines
drivers/ata/libata-core.c +4 -0
@@ -4559,6 +4564,10 @@
 	/* If the controller thinks we are 80 wire, we are */
 	if (ap->cbl == ATA_CBL_PATA80 || ap->cbl == ATA_CBL_SATA)
 		return 0;
+	/* If the system is known to be 40 wire short cable (eg laptop),
+	   then we allow 80 wire modes even if the drive isn't sure */
+	if (ap->cbl == ATA_CBL_PATA40_SHORT)
+		return 0;
 	/* If the controller doesn't know we scan
 
 	   - Note: We look for all 40 wire detects at this point.

applied