]> err.no Git - linux-2.6/commitdiff
[PATCH] Old IDE, fix SATA detection for cabling
authorAlan Cox <alan@lxorguk.ukuu.org.uk>
Wed, 28 Jun 2006 11:26:58 +0000 (04:26 -0700)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 28 Jun 2006 21:59:06 +0000 (14:59 -0700)
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)

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/ide/ide-iops.c

index 97a49e77a8f1f5d30d906847f202ad85ea2f08c8..32117f0ec5c00727f41fde8e0765d85449a4652b 100644 (file)
@@ -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