diff options
author | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-11 17:53:59 -0400 |
---|---|---|
committer | Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> | 2007-10-11 17:53:59 -0400 |
commit | a8028fcb485522c0d7de9c5423812de9224b37c9 (patch) | |
tree | ffc5d22dab4fcb3abbbf83e9a1fefa792425b116 /drivers/ide/ppc/pmac.c | |
parent | 851dd33bcf23655eede62730c029e4f608f4084f (diff) |
ide: add missing ide_rate_filter() calls to ->speedproc()-s
* Fix icside, cris-ide, au1xxx-ide, amd74xx, via82cxxx and pmac host drivers
to use ide_rate_filter().
This results in the following modes (from user requests) being clipped down:
- invalid modes (values 0x46-0xFF) [ for all hosts ]
- unsupported by a host UDMA modes [ for hosts which support UDMA]
- all UDMA modes and MWDMA3-4 modes [ for hosts which don't support UDMA ]
- invalid modes (values 0x25-0x39) [ for hosts which don't support UDMA ]
* Host driver specific changes in behavior:
icside:
- no change
cris-ide
- clip unsupported UDMA3-6 modes down
- fix BUG() on trying to set unsupported UDMA3-6 modes
au1xxx-ide/pmac
- clip unsupported UDMA modes down
amd74xx/via82cxxx
- clip unsupported UDMA modes down
- fix random PIO timings being set for unsupported/invalid modes
- fix unsupported/invalid modes being set on the device
* While at it remove no longer needed checks from pmac.c driver.
Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Diffstat (limited to 'drivers/ide/ppc/pmac.c')
-rw-r--r-- | drivers/ide/ppc/pmac.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/drivers/ide/ppc/pmac.c b/drivers/ide/ppc/pmac.c index 2fb047b898aa..222adcb54823 100644 --- a/drivers/ide/ppc/pmac.c +++ b/drivers/ide/ppc/pmac.c | |||
@@ -928,6 +928,8 @@ pmac_ide_tune_chipset (ide_drive_t *drive, byte speed) | |||
928 | pmac_ide_hwif_t* pmif = (pmac_ide_hwif_t *)HWIF(drive)->hwif_data; | 928 | pmac_ide_hwif_t* pmif = (pmac_ide_hwif_t *)HWIF(drive)->hwif_data; |
929 | u32 *timings, *timings2; | 929 | u32 *timings, *timings2; |
930 | 930 | ||
931 | speed = ide_rate_filter(drive, speed); | ||
932 | |||
931 | if (pmif == NULL) | 933 | if (pmif == NULL) |
932 | return 1; | 934 | return 1; |
933 | 935 | ||
@@ -937,17 +939,9 @@ pmac_ide_tune_chipset (ide_drive_t *drive, byte speed) | |||
937 | switch(speed) { | 939 | switch(speed) { |
938 | #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC | 940 | #ifdef CONFIG_BLK_DEV_IDEDMA_PMAC |
939 | case XFER_UDMA_6: | 941 | case XFER_UDMA_6: |
940 | if (pmif->kind != controller_sh_ata6) | ||
941 | return 1; | ||
942 | case XFER_UDMA_5: | 942 | case XFER_UDMA_5: |
943 | if (pmif->kind != controller_un_ata6 && | ||
944 | pmif->kind != controller_k2_ata6 && | ||
945 | pmif->kind != controller_sh_ata6) | ||
946 | return 1; | ||
947 | case XFER_UDMA_4: | 943 | case XFER_UDMA_4: |
948 | case XFER_UDMA_3: | 944 | case XFER_UDMA_3: |
949 | if (drive->hwif->cbl != ATA_CBL_PATA80) | ||
950 | return 1; | ||
951 | case XFER_UDMA_2: | 945 | case XFER_UDMA_2: |
952 | case XFER_UDMA_1: | 946 | case XFER_UDMA_1: |
953 | case XFER_UDMA_0: | 947 | case XFER_UDMA_0: |