From: Michael-Luke Jones Date: Sun, 10 Sep 2006 15:46:35 +0000 (+0100) Subject: Backport: Old IDE, fix SATA detection for cabling X-Git-Tag: v2.6.17.14~13 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63a17cfcfce2888f55f16e2d1e1c587351fffa38;p=thirdparty%2Fkernel%2Fstable.git Backport: 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 Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index b72dde70840a7..10467dad335b7 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