luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libata: fix CFA handling in ide_timing_compute()

Browse Source 
Use standard cycle timing for CFA PIO5 and PIO6 modes.

Based on commit 74638c8 for IDE subsystem.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@redhat.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2010-01-18 18:13:57 +01:00 committed by Jeff Garzik
parent 02d1d6160f
commit 9e8808a99c
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
drivers/ata/libata-core.c
View File

@ -3211,6 +3211,7 @@ const struct ata_timing *ata_timing_find_mode(u8 xfer_mode)
int ata_timing_compute(struct ata_device *adev, unsigned short speed, int ata_timing_compute(struct ata_device *adev, unsigned short speed,
struct ata_timing *t, int T, int UT) struct ata_timing *t, int T, int UT)
{ {
const u16 *id = adev->id;
const struct ata_timing *s; const struct ata_timing *s;
struct ata_timing p; struct ata_timing p;
@ -3228,14 +3229,18 @@ int ata_timing_compute(struct ata_device *adev, unsigned short speed,
* PIO/MW_DMA cycle timing. * PIO/MW_DMA cycle timing.
*/ */
if (adev->id[ATA_ID_FIELD_VALID] & 2) { /* EIDE drive */ if (id[ATA_ID_FIELD_VALID] & 2) { /* EIDE drive */
memset(&p, 0, sizeof(p)); memset(&p, 0, sizeof(p));
if (speed >= XFER_PIO_0 && speed <= XFER_SW_DMA_0) { if (speed >= XFER_PIO_0 && speed <= XFER_SW_DMA_0) {
if (speed <= XFER_PIO_2) p.cycle = p.cyc8b = adev->id[ATA_ID_EIDE_PIO]; if (speed <= XFER_PIO_2)
else p.cycle = p.cyc8b = adev->id[ATA_ID_EIDE_PIO_IORDY]; p.cycle = p.cyc8b = id[ATA_ID_EIDE_PIO];
} else if (speed >= XFER_MW_DMA_0 && speed <= XFER_MW_DMA_2) { else if ((speed <= XFER_PIO_4) ||
p.cycle = adev->id[ATA_ID_EIDE_DMA_MIN]; (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];
ata_timing_merge(&p, t, t, ATA_TIMING_CYCLE | ATA_TIMING_CYC8B); ata_timing_merge(&p, t, t, ATA_TIMING_CYCLE | ATA_TIMING_CYC8B);
} }