aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael-Luke Jones <mlj28@cam.ac.uk>2006-11-20 22:30:21 +0100
committerAdrian Bunk <bunk@stusta.de>2006-11-20 22:30:21 +0100
commitc61120c340f2916d331db65fe565868a90cd9779 (patch)
tree47fb0811f338e381ecfe0f2f46e73433ba4b6258
parent2c8e2c9fe5a7f6952b2c16d934ee9cc112643f0f (diff)
downloadlinux-linaro-stable-c61120c340f2916d331db65fe565868a90cd9779.tar.gz
Old IDE, fix SATA detection for cabling
This patch is identical to that introduced in 1a1276e7b6cba549553285f74e87f702bfff6fac to the Linus' 2.6 development tree by Alan Cox. 'This is based on the proposed patches flying around but also checks that the device in question is new enough to have word 93 rather thanb blindly assuming word 93 == 0 means SATA (see ATA-5, ATA-7)' -- Alan Cox Required for my SATA drive on an Asus Pundit-R to operate above 33MBps. Signed-off-by: Michael-Luke Jones <mlj28@cam.ac.uk> Signed-off-by: Adrian Bunk <bunk@stusta.de>
-rw-r--r--drivers/ide/ide-iops.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c
index b72dde70840a..10467dad335b 100644
--- a/drivers/ide/ide-iops.c
+++ b/drivers/ide/ide-iops.c
@@ -597,6 +597,10 @@ u8 eighty_ninty_three (ide_drive_t *drive)
{
if(HWIF(drive)->udma_four == 0)
return 0;
+
+ /* Check for SATA but only if we are ATA5 or higher */
+ if (drive->id->hw_config == 0 && (drive->id->major_rev_num & 0x7FE0))
+ return 1;
if (!(drive->id->hw_config & 0x6000))
return 0;
#ifndef CONFIG_IDEDMA_IVB