| Message ID | 20100118171729.14623.46024.sendpatchset@localhost |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
Bartlomiej Zolnierkiewicz wrote: > From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> > Subject: [PATCH] ide: use standard timing for XFER_PIO_SLOW mode in ide_timing_compute() > > Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> > --- > drivers/ide/ide-timings.c | 13 +++++++------ > 1 file changed, 7 insertions(+), 6 deletions(-) > > Index: b/drivers/ide/ide-timings.c > =================================================================== > --- a/drivers/ide/ide-timings.c > +++ b/drivers/ide/ide-timings.c > @@ -166,12 +166,13 @@ int ide_timing_compute(ide_drive_t *driv > if (id[ATA_ID_FIELD_VALID] & 2) { /* EIDE drive */ > memset(&p, 0, sizeof(p)); > > - if (speed <= XFER_PIO_2) > - p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO]; > - else if ((speed <= XFER_PIO_4) || > - (speed == XFER_PIO_5 && !ata_id_is_cfa(id))) > - p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO_IORDY]; > - else if (speed >= XFER_MW_DMA_0 && speed <= XFER_MW_DMA_2) > + if (speed >= XFER_PIO_0 && speed <= XFER_SW_DMA_0) { > Ah, I see what to fix now but I guess it's rather your call. :-) MBR, Sergei -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Date: Mon, 18 Jan 2010 18:17:29 +0100 > From: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> > Subject: [PATCH] ide: use standard timing for XFER_PIO_SLOW mode in ide_timing_compute() > > Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com> Applied. -- To unsubscribe from this list: send the line "unsubscribe linux-ide" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
Index: b/drivers/ide/ide-timings.c =================================================================== --- a/drivers/ide/ide-timings.c +++ b/drivers/ide/ide-timings.c @@ -166,12 +166,13 @@ int ide_timing_compute(ide_drive_t *driv if (id[ATA_ID_FIELD_VALID] & 2) { /* EIDE drive */ memset(&p, 0, sizeof(p)); - if (speed <= XFER_PIO_2) - p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO]; - else if ((speed <= XFER_PIO_4) || - (speed == XFER_PIO_5 && !ata_id_is_cfa(id))) - p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO_IORDY]; - else if (speed >= XFER_MW_DMA_0 && speed <= XFER_MW_DMA_2) + if (speed >= XFER_PIO_0 && speed <= XFER_SW_DMA_0) { + if (speed <= XFER_PIO_2) + p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO]; + else if ((speed <= XFER_PIO_4) || + (speed == XFER_PIO_5 && !ata_id_is_cfa(id))) + p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO_IORDY]; + } else if (speed >= XFER_MW_DMA_0 && speed <= XFER_MW_DMA_2) p.cycle = id[ATA_ID_EIDE_DMA_MIN]; ide_timing_merge(&p, t, t, IDE_TIMING_CYCLE | IDE_TIMING_CYC8B);