Commit 1a1276e7 authored by Alan Cox's avatar Alan Cox Committed by Linus Torvalds

[PATCH] Old IDE, fix SATA detection for cabling

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: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 1e866f0b
...@@ -597,6 +597,10 @@ u8 eighty_ninty_three (ide_drive_t *drive) ...@@ -597,6 +597,10 @@ u8 eighty_ninty_three (ide_drive_t *drive)
{ {
if(HWIF(drive)->udma_four == 0) if(HWIF(drive)->udma_four == 0)
return 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)) if (!(drive->id->hw_config & 0x6000))
return 0; return 0;
#ifndef CONFIG_IDEDMA_IVB #ifndef CONFIG_IDEDMA_IVB
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment