diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-07-09 17:17:58 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-07-09 17:17:58 -0400 |
commit | 49521f97ccd3c2bf6e71a91cea8fe65d170fa4fb (patch) | |
tree | f61c34da6092f2f1a97a78da567afc59ad40850b /drivers/ide/ide-iops.c | |
parent | 75b1d97535327d0428c6bffd9d5407e65546fd5d (diff) |
ide: add short cables support
This patch allows users to override both host and device side cable detection
with "ideX=ata66" kernel parameter. Thanks to this it should be now possible
to use UDMA > 2 modes on systems (laptops mainly) which use short 40-pin cable
instead of 80-pin one.
Next patches add automatic detection of some systems using short cables.
Changes:
* Rename hwif->udma_four to hwif->cbl and make it u8.
* Convert all existing users accordingly (use ATA_CBL_* defines while at it).
* Add ATA_CBL_PATA40_SHORT support to ide-iops.c:eighty_ninty_three().
* Use ATA_CBL_PATA40_SHORT for "ideX=ata66" kernel parameter.
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Reviewed-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Diffstat (limited to 'drivers/ide/ide-iops.c')
-rw-r--r-- | drivers/ide/ide-iops.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/drivers/ide/ide-iops.c b/drivers/ide/ide-iops.c index f0be5f665a0e..92578b6832e9 100644 --- a/drivers/ide/ide-iops.c +++ b/drivers/ide/ide-iops.c | |||
@@ -574,7 +574,10 @@ u8 eighty_ninty_three (ide_drive_t *drive) | |||
574 | ide_hwif_t *hwif = drive->hwif; | 574 | ide_hwif_t *hwif = drive->hwif; |
575 | struct hd_driveid *id = drive->id; | 575 | struct hd_driveid *id = drive->id; |
576 | 576 | ||
577 | if (hwif->udma_four == 0) | 577 | if (hwif->cbl == ATA_CBL_PATA40_SHORT) |
578 | return 1; | ||
579 | |||
580 | if (hwif->cbl != ATA_CBL_PATA80) | ||
578 | goto no_80w; | 581 | goto no_80w; |
579 | 582 | ||
580 | /* Check for SATA but only if we are ATA5 or higher */ | 583 | /* Check for SATA but only if we are ATA5 or higher */ |
@@ -600,7 +603,8 @@ no_80w: | |||
600 | 603 | ||
601 | printk(KERN_WARNING "%s: %s side 80-wire cable detection failed, " | 604 | printk(KERN_WARNING "%s: %s side 80-wire cable detection failed, " |
602 | "limiting max speed to UDMA33\n", | 605 | "limiting max speed to UDMA33\n", |
603 | drive->name, hwif->udma_four ? "drive" : "host"); | 606 | drive->name, |
607 | hwif->cbl == ATA_CBL_PATA80 ? "drive" : "host"); | ||
604 | 608 | ||
605 | drive->udma33_warned = 1; | 609 | drive->udma33_warned = 1; |
606 | 610 | ||