summaryrefslogtreecommitdiff
path: root/drivers/ide
diff options
context:
space:
mode:
authorBartlomiej Zolnierkiewicz <bzolnier@gmail.com>2010-01-18 07:21:41 +0000
committerDavid S. Miller <davem@davemloft.net>2010-01-19 01:52:32 -0800
commit23d874054663efaf18340dc554df1b935820cbab (patch)
treea7f9b6eba742efafe28ee6ff522a7062c3a7e9a5 /drivers/ide
parentf6d23c2e2e398dc96c58494be2934f0c11285e3a (diff)
downloadlinux-3.10-23d874054663efaf18340dc554df1b935820cbab.tar.gz
linux-3.10-23d874054663efaf18340dc554df1b935820cbab.tar.bz2
linux-3.10-23d874054663efaf18340dc554df1b935820cbab.zip
cmd64x: fix handling of address setup timings
Account for the requirements of the DMA mode currently used. Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide')
-rw-r--r--drivers/ide/cmd64x.c17
1 files changed, 10 insertions, 7 deletions
diff --git a/drivers/ide/cmd64x.c b/drivers/ide/cmd64x.c
index a65a6917125..5f80312e636 100644
--- a/drivers/ide/cmd64x.c
+++ b/drivers/ide/cmd64x.c
@@ -88,9 +88,6 @@ static void cmd64x_program_timings(ide_drive_t *drive, u8 mode)
pci_write_config_byte(dev, drwtim_regs[drive->dn],
(t.active << 4) | t.recover);
- if (mode >= XFER_SW_DMA_0)
- return;
-
/*
* The primary channel has individual address setup timing registers
* for each drive and the hardware selects the slowest timing itself.
@@ -100,11 +97,17 @@ static void cmd64x_program_timings(ide_drive_t *drive, u8 mode)
if (hwif->channel) {
ide_drive_t *pair = ide_get_pair_dev(drive);
- ide_set_drivedata(drive, (void *)(unsigned long)t.setup);
+ if (pair) {
+ struct ide_timing tp;
- if (pair)
- t.setup = max_t(u8, t.setup,
- (unsigned long)ide_get_drivedata(pair));
+ ide_timing_compute(pair, pair->pio_mode, &tp, T, 0);
+ ide_timing_merge(&t, &tp, &t, IDE_TIMING_SETUP);
+ if (pair->dma_mode) {
+ ide_timing_compute(pair, pair->dma_mode,
+ &tp, T, 0);
+ ide_timing_merge(&tp, &t, &t, IDE_TIMING_SETUP);
+ }
+ }
}
if (t.setup > 5) /* shouldn't actually happen... */