ide: add ide_set{_max}_pio() (take 4)

* Add IDE_HFLAG_ABUSE_{PREFETCH,FAST_DEVSEL,DMA_MODES} flags
  and set them in ht6560, cmd640, cmd64x and sc1200 host drivers.

* Add set_pio_mode_abuse() for checking if host driver has a non-standard
  ->tuneproc() implementation and use it in do_special().

* Add ide_set_pio() for setting PIO mode (it uses hwif->pio_mask to find
  the maximum PIO mode supported by the host), also add ide_set_max_pio()
  wrapper for ide_set_pio() to use for auto-tuning.  Convert users of
  ->tuneproc to use ide_set{_max}_pio() where possible.  This leaves only
  do_special(), set_using_pio(), ide_hwif_restore() and ide_set_pio() as
  a direct users of ->tuneproc.

* Remove no longer needed ide_get_best_pio_mode() calls and printk-s
  reporting PIO mode selected from ->tuneproc implementations.

* Rename ->tuneproc hook to ->set_pio_mode and make 'pio' argument const.

* Remove stale comment from ide_config_drive_speed().

v2:
* Fix "ata_" prefix (Noticed by Jeff).

v3:
* Minor cleanups/fixups per Sergei's suggestions.

v4:
* Fix compile problem in drivers/ide/pci/cmd640.c
  (Noticed by Andrew Morton).

* Improve some ->set_pio_mode comments.
Reviewed-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent 842c19ad
...@@ -680,12 +680,10 @@ static void cris_dma_off(ide_drive_t *drive) ...@@ -680,12 +680,10 @@ static void cris_dma_off(ide_drive_t *drive)
{ {
} }
static void tune_cris_ide(ide_drive_t *drive, u8 pio) static void cris_set_pio_mode(ide_drive_t *drive, const u8 pio)
{ {
int setup, strobe, hold; int setup, strobe, hold;
pio = ide_get_best_pio_mode(drive, pio, 4);
switch(pio) switch(pio)
{ {
case 0: case 0:
...@@ -727,7 +725,7 @@ static int speed_cris_ide(ide_drive_t *drive, const u8 speed) ...@@ -727,7 +725,7 @@ static int speed_cris_ide(ide_drive_t *drive, const u8 speed)
int cyc = 0, dvs = 0, strobe = 0, hold = 0; int cyc = 0, dvs = 0, strobe = 0, hold = 0;
if (speed >= XFER_PIO_0 && speed <= XFER_PIO_4) { if (speed >= XFER_PIO_0 && speed <= XFER_PIO_4) {
tune_cris_ide(drive, speed - XFER_PIO_0); cris_set_pio_mode(drive, speed - XFER_PIO_0);
return ide_config_drive_speed(drive, speed); return ide_config_drive_speed(drive, speed);
} }
...@@ -797,7 +795,7 @@ init_e100_ide (void) ...@@ -797,7 +795,7 @@ init_e100_ide (void)
ide_register_hw(&hw, 1, &hwif); ide_register_hw(&hw, 1, &hwif);
hwif->mmio = 1; hwif->mmio = 1;
hwif->chipset = ide_etrax100; hwif->chipset = ide_etrax100;
hwif->tuneproc = &tune_cris_ide; hwif->set_pio_mode = &cris_set_pio_mode;
hwif->speedproc = &speed_cris_ide; hwif->speedproc = &speed_cris_ide;
hwif->ata_input_data = &cris_ide_input_data; hwif->ata_input_data = &cris_ide_input_data;
hwif->ata_output_data = &cris_ide_output_data; hwif->ata_output_data = &cris_ide_output_data;
......
...@@ -201,8 +201,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request * ...@@ -201,8 +201,7 @@ static ide_startstop_t ide_start_power_step(ide_drive_t *drive, struct request *
return do_rw_taskfile(drive, args); return do_rw_taskfile(drive, args);
case idedisk_pm_restore_pio: /* Resume step 1 (restore PIO) */ case idedisk_pm_restore_pio: /* Resume step 1 (restore PIO) */
if (drive->hwif->tuneproc != NULL) ide_set_max_pio(drive);
drive->hwif->tuneproc(drive, 255);
/* /*
* skip idedisk_pm_idle for ATAPI devices * skip idedisk_pm_idle for ATAPI devices
*/ */
...@@ -788,6 +787,30 @@ static ide_startstop_t ide_disk_special(ide_drive_t *drive) ...@@ -788,6 +787,30 @@ static ide_startstop_t ide_disk_special(ide_drive_t *drive)
return ide_started; return ide_started;
} }
/*
* handle HDIO_SET_PIO_MODE ioctl abusers here, eventually it will go away
*/
static int set_pio_mode_abuse(ide_hwif_t *hwif, u8 req_pio)
{
switch (req_pio) {
case 202:
case 201:
case 200:
case 102:
case 101:
case 100:
return (hwif->host_flags & IDE_HFLAG_ABUSE_DMA_MODES) ? 1 : 0;
case 9:
case 8:
return (hwif->host_flags & IDE_HFLAG_ABUSE_PREFETCH) ? 1 : 0;
case 7:
case 6:
return (hwif->host_flags & IDE_HFLAG_ABUSE_FAST_DEVSEL) ? 1 : 0;
default:
return 0;
}
}
/** /**
* do_special - issue some special commands * do_special - issue some special commands
* @drive: drive the command is for * @drive: drive the command is for
...@@ -805,9 +828,17 @@ static ide_startstop_t do_special (ide_drive_t *drive) ...@@ -805,9 +828,17 @@ static ide_startstop_t do_special (ide_drive_t *drive)
printk("%s: do_special: 0x%02x\n", drive->name, s->all); printk("%s: do_special: 0x%02x\n", drive->name, s->all);
#endif #endif
if (s->b.set_tune) { if (s->b.set_tune) {
ide_hwif_t *hwif = drive->hwif;
u8 req_pio = drive->tune_req;
s->b.set_tune = 0; s->b.set_tune = 0;
if (HWIF(drive)->tuneproc != NULL)
HWIF(drive)->tuneproc(drive, drive->tune_req); if (set_pio_mode_abuse(drive->hwif, req_pio)) {
if (hwif->set_pio_mode)
hwif->set_pio_mode(drive, req_pio);
} else
ide_set_pio(drive, req_pio);
return ide_stopped; return ide_stopped;
} else { } else {
if (drive->media == ide_disk) if (drive->media == ide_disk)
......
...@@ -780,12 +780,6 @@ int ide_driveid_update (ide_drive_t *drive) ...@@ -780,12 +780,6 @@ int ide_driveid_update (ide_drive_t *drive)
/* /*
* Similar to ide_wait_stat(), except it never calls ide_error internally. * Similar to ide_wait_stat(), except it never calls ide_error internally.
* This is a kludge to handle the new ide_config_drive_speed() function,
* and should not otherwise be used anywhere. Eventually, the tuneproc's
* should be updated to return ide_startstop_t, in which case we can get
* rid of this abomination again. :) -ml
*
* It is gone..........
* *
* const char *msg == consider adding for verbose errors. * const char *msg == consider adding for verbose errors.
*/ */
......
...@@ -325,6 +325,35 @@ u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode) ...@@ -325,6 +325,35 @@ u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode)
EXPORT_SYMBOL_GPL(ide_get_best_pio_mode); EXPORT_SYMBOL_GPL(ide_get_best_pio_mode);
/* req_pio == "255" for auto-tune */
void ide_set_pio(ide_drive_t *drive, u8 req_pio)
{
ide_hwif_t *hwif = drive->hwif;
u8 host_pio, pio;
if (hwif->set_pio_mode == NULL)
return;
BUG_ON(hwif->pio_mask == 0x00);
host_pio = fls(hwif->pio_mask) - 1;
pio = ide_get_best_pio_mode(drive, req_pio, host_pio);
/*
* TODO:
* - report device max PIO mode
* - check req_pio != 255 against device max PIO mode
*/
printk(KERN_DEBUG "%s: host max PIO%d wanted PIO%d%s selected PIO%d\n",
drive->name, host_pio, req_pio,
req_pio == 255 ? "(auto-tune)" : "", pio);
hwif->set_pio_mode(drive, pio);
}
EXPORT_SYMBOL_GPL(ide_set_pio);
/** /**
* ide_toggle_bounce - handle bounce buffering * ide_toggle_bounce - handle bounce buffering
* @drive: drive to update * @drive: drive to update
......
...@@ -827,10 +827,8 @@ static void probe_hwif(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif)) ...@@ -827,10 +827,8 @@ static void probe_hwif(ide_hwif_t *hwif, void (*fixup)(ide_hwif_t *hwif))
ide_drive_t *drive = &hwif->drives[unit]; ide_drive_t *drive = &hwif->drives[unit];
if (drive->present) { if (drive->present) {
if (hwif->tuneproc != NULL && if (drive->autotune == IDE_TUNE_AUTO)
drive->autotune == IDE_TUNE_AUTO) ide_set_max_pio(drive);
/* auto-tune PIO mode */
hwif->tuneproc(drive, 255);
if (drive->autotune != IDE_TUNE_DEFAULT && if (drive->autotune != IDE_TUNE_DEFAULT &&
drive->autotune != IDE_TUNE_AUTO) drive->autotune != IDE_TUNE_AUTO)
......
...@@ -396,7 +396,7 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif) ...@@ -396,7 +396,7 @@ static void ide_hwif_restore(ide_hwif_t *hwif, ide_hwif_t *tmp_hwif)
hwif->cds = tmp_hwif->cds; hwif->cds = tmp_hwif->cds;
#endif #endif
hwif->tuneproc = tmp_hwif->tuneproc; hwif->set_pio_mode = tmp_hwif->set_pio_mode;
hwif->speedproc = tmp_hwif->speedproc; hwif->speedproc = tmp_hwif->speedproc;
hwif->mdma_filter = tmp_hwif->mdma_filter; hwif->mdma_filter = tmp_hwif->mdma_filter;
hwif->udma_filter = tmp_hwif->udma_filter; hwif->udma_filter = tmp_hwif->udma_filter;
...@@ -867,8 +867,9 @@ int set_pio_mode(ide_drive_t *drive, int arg) ...@@ -867,8 +867,9 @@ int set_pio_mode(ide_drive_t *drive, int arg)
if (arg < 0 || arg > 255) if (arg < 0 || arg > 255)
return -EINVAL; return -EINVAL;
if (!HWIF(drive)->tuneproc) if (drive->hwif->set_pio_mode == NULL)
return -ENOSYS; return -ENOSYS;
if (drive->special.b.set_tune) if (drive->special.b.set_tune)
return -EBUSY; return -EBUSY;
ide_init_drive_cmd(&rq); ide_init_drive_cmd(&rq);
......
...@@ -68,8 +68,6 @@ static RegInitializer initData[] __initdata = { ...@@ -68,8 +68,6 @@ static RegInitializer initData[] __initdata = {
{0x35, 0x03}, {0x00, 0x00} {0x35, 0x03}, {0x00, 0x00}
}; };
#define ALI_MAX_PIO 4
/* timing parameter registers for each drive */ /* timing parameter registers for each drive */
static struct { u8 reg1, reg2, reg3, reg4; } regTab[4] = { static struct { u8 reg1, reg2, reg3, reg4; } regTab[4] = {
{0x03, 0x26, 0x04, 0x27}, /* drive 0 */ {0x03, 0x26, 0x04, 0x27}, /* drive 0 */
...@@ -109,7 +107,7 @@ static void outReg (u8 data, u8 reg) ...@@ -109,7 +107,7 @@ static void outReg (u8 data, u8 reg)
* This function computes timing parameters * This function computes timing parameters
* and sets controller registers accordingly. * and sets controller registers accordingly.
*/ */
static void ali14xx_tune_drive (ide_drive_t *drive, u8 pio) static void ali14xx_set_pio_mode(ide_drive_t *drive, const u8 pio)
{ {
int driveNum; int driveNum;
int time1, time2; int time1, time2;
...@@ -117,8 +115,6 @@ static void ali14xx_tune_drive (ide_drive_t *drive, u8 pio) ...@@ -117,8 +115,6 @@ static void ali14xx_tune_drive (ide_drive_t *drive, u8 pio)
unsigned long flags; unsigned long flags;
int bus_speed = system_bus_clock(); int bus_speed = system_bus_clock();
pio = ide_get_best_pio_mode(drive, pio, ALI_MAX_PIO);
/* calculate timing, according to PIO mode */ /* calculate timing, according to PIO mode */
time1 = ide_pio_cycle_time(drive, pio); time1 = ide_pio_cycle_time(drive, pio);
time2 = ide_pio_timings[pio].active_time; time2 = ide_pio_timings[pio].active_time;
...@@ -212,12 +208,12 @@ static int __init ali14xx_probe(void) ...@@ -212,12 +208,12 @@ static int __init ali14xx_probe(void)
hwif->chipset = ide_ali14xx; hwif->chipset = ide_ali14xx;
hwif->pio_mask = ATA_PIO4; hwif->pio_mask = ATA_PIO4;
hwif->tuneproc = &ali14xx_tune_drive; hwif->set_pio_mode = &ali14xx_set_pio_mode;
hwif->mate = mate; hwif->mate = mate;
mate->chipset = ide_ali14xx; mate->chipset = ide_ali14xx;
mate->pio_mask = ATA_PIO4; mate->pio_mask = ATA_PIO4;
mate->tuneproc = &ali14xx_tune_drive; mate->set_pio_mode = &ali14xx_set_pio_mode;
mate->mate = hwif; mate->mate = hwif;
mate->channel = 1; mate->channel = 1;
......
...@@ -67,12 +67,10 @@ static void sub22 (char b, char c) ...@@ -67,12 +67,10 @@ static void sub22 (char b, char c)
} }
} }
static void tune_dtc2278 (ide_drive_t *drive, u8 pio) static void dtc2278_set_pio_mode(ide_drive_t *drive, const u8 pio)
{ {
unsigned long flags; unsigned long flags;
pio = ide_get_best_pio_mode(drive, pio, 4);
if (pio >= 3) { if (pio >= 3) {
spin_lock_irqsave(&ide_lock, flags); spin_lock_irqsave(&ide_lock, flags);
/* /*
...@@ -124,7 +122,7 @@ static int __init dtc2278_probe(void) ...@@ -124,7 +122,7 @@ static int __init dtc2278_probe(void)
hwif->serialized = 1; hwif->serialized = 1;
hwif->chipset = ide_dtc2278; hwif->chipset = ide_dtc2278;
hwif->pio_mask = ATA_PIO4; hwif->pio_mask = ATA_PIO4;
hwif->tuneproc = &tune_dtc2278; hwif->set_pio_mode = &dtc2278_set_pio_mode;
hwif->drives[0].no_unmask = 1; hwif->drives[0].no_unmask = 1;
hwif->drives[1].no_unmask = 1; hwif->drives[1].no_unmask = 1;
hwif->mate = mate; hwif->mate = mate;
......
...@@ -199,7 +199,7 @@ static int __init try_to_init_ht6560b(void) ...@@ -199,7 +199,7 @@ static int __init try_to_init_ht6560b(void)
return 1; return 1;
} }
static u8 ht_pio2timings(ide_drive_t *drive, u8 pio) static u8 ht_pio2timings(ide_drive_t *drive, const u8 pio)
{ {
int active_time, recovery_time; int active_time, recovery_time;
int active_cycles, recovery_cycles; int active_cycles, recovery_cycles;
...@@ -208,7 +208,6 @@ static u8 ht_pio2timings(ide_drive_t *drive, u8 pio) ...@@ -208,7 +208,6 @@ static u8 ht_pio2timings(ide_drive_t *drive, u8 pio)
if (pio) { if (pio) {
unsigned int cycle_time; unsigned int cycle_time;
pio = ide_get_best_pio_mode(drive, pio, 5);
cycle_time = ide_pio_cycle_time(drive, pio); cycle_time = ide_pio_cycle_time(drive, pio);
/* /*
...@@ -277,7 +276,7 @@ static void ht_set_prefetch(ide_drive_t *drive, u8 state) ...@@ -277,7 +276,7 @@ static void ht_set_prefetch(ide_drive_t *drive, u8 state)
#endif #endif
} }
static void tune_ht6560b (ide_drive_t *drive, u8 pio) static void ht6560b_set_pio_mode(ide_drive_t *drive, const u8 pio)
{ {
unsigned long flags; unsigned long flags;
u8 timing; u8 timing;
...@@ -333,15 +332,17 @@ int __init ht6560b_init(void) ...@@ -333,15 +332,17 @@ int __init ht6560b_init(void)
hwif->chipset = ide_ht6560b; hwif->chipset = ide_ht6560b;
hwif->selectproc = &ht6560b_selectproc; hwif->selectproc = &ht6560b_selectproc;
hwif->host_flags = IDE_HFLAG_ABUSE_PREFETCH;
hwif->pio_mask = ATA_PIO5; hwif->pio_mask = ATA_PIO5;
hwif->tuneproc = &tune_ht6560b; hwif->set_pio_mode = &ht6560b_set_pio_mode;
hwif->serialized = 1; /* is this needed? */ hwif->serialized = 1; /* is this needed? */
hwif->mate = mate; hwif->mate = mate;
mate->chipset = ide_ht6560b; mate->chipset = ide_ht6560b;
mate->selectproc = &ht6560b_selectproc; mate->selectproc = &ht6560b_selectproc;
mate->host_flags = IDE_HFLAG_ABUSE_PREFETCH;
mate->pio_mask = ATA_PIO5; mate->pio_mask = ATA_PIO5;
mate->tuneproc = &tune_ht6560b; mate->set_pio_mode = &ht6560b_set_pio_mode;
mate->serialized = 1; /* is this needed? */ mate->serialized = 1; /* is this needed? */
mate->mate = hwif; mate->mate = hwif;
mate->channel = 1; mate->channel = 1;
......
...@@ -224,15 +224,14 @@ static void qd_set_timing (ide_drive_t *drive, u8 timing) ...@@ -224,15 +224,14 @@ static void qd_set_timing (ide_drive_t *drive, u8 timing)
printk(KERN_DEBUG "%s: %#x\n", drive->name, timing); printk(KERN_DEBUG "%s: %#x\n", drive->name, timing);
} }
/* static void qd6500_set_pio_mode(ide_drive_t *drive, const u8 pio)
* qd6500_tune_drive
*/
static void qd6500_tune_drive (ide_drive_t *drive, u8 pio)
{ {
int active_time = 175; int active_time = 175;
int recovery_time = 415; /* worst case values from the dos driver */ int recovery_time = 415; /* worst case values from the dos driver */
/*
* FIXME: use "pio" value
*/
if (drive->id && !qd_find_disk_type(drive, &active_time, &recovery_time) if (drive->id && !qd_find_disk_type(drive, &active_time, &recovery_time)
&& drive->id->tPIO && (drive->id->field_valid & 0x02) && drive->id->tPIO && (drive->id->field_valid & 0x02)
&& drive->id->eide_pio >= 240) { && drive->id->eide_pio >= 240) {
...@@ -246,11 +245,7 @@ static void qd6500_tune_drive (ide_drive_t *drive, u8 pio) ...@@ -246,11 +245,7 @@ static void qd6500_tune_drive (ide_drive_t *drive, u8 pio)
qd_set_timing(drive, qd6500_compute_timing(HWIF(drive), active_time, recovery_time)); qd_set_timing(drive, qd6500_compute_timing(HWIF(drive), active_time, recovery_time));
} }
/* static void qd6580_set_pio_mode(ide_drive_t *drive, const u8 pio)
* qd6580_tune_drive
*/
static void qd6580_tune_drive (ide_drive_t *drive, u8 pio)
{ {
int base = HWIF(drive)->select_data; int base = HWIF(drive)->select_data;
unsigned int cycle_time; unsigned int cycle_time;
...@@ -258,7 +253,6 @@ static void qd6580_tune_drive (ide_drive_t *drive, u8 pio) ...@@ -258,7 +253,6 @@ static void qd6580_tune_drive (ide_drive_t *drive, u8 pio)
int recovery_time = 415; /* worst case values from the dos driver */ int recovery_time = 415; /* worst case values from the dos driver */
if (drive->id && !qd_find_disk_type(drive, &active_time, &recovery_time)) { if (drive->id && !qd_find_disk_type(drive, &active_time, &recovery_time)) {
pio = ide_get_best_pio_mode(drive, pio, 4);
cycle_time = ide_pio_cycle_time(drive, pio); cycle_time = ide_pio_cycle_time(drive, pio);
switch (pio) { switch (pio) {
...@@ -335,8 +329,7 @@ static int __init qd_testreg(int port) ...@@ -335,8 +329,7 @@ static int __init qd_testreg(int port)
*/ */
static void __init qd_setup(ide_hwif_t *hwif, int base, int config, static void __init qd_setup(ide_hwif_t *hwif, int base, int config,
unsigned int data0, unsigned int data1, unsigned int data0, unsigned int data1)
void (*tuneproc) (ide_drive_t *, u8 pio))
{ {
hwif->chipset = ide_qd65xx; hwif->chipset = ide_qd65xx;
hwif->channel = hwif->index; hwif->channel = hwif->index;
...@@ -347,8 +340,6 @@ static void __init qd_setup(ide_hwif_t *hwif, int base, int config, ...@@ -347,8 +340,6 @@ static void __init qd_setup(ide_hwif_t *hwif, int base, int config,
hwif->drives[0].io_32bit = hwif->drives[0].io_32bit =
hwif->drives[1].io_32bit = 1; hwif->drives[1].io_32bit = 1;
hwif->pio_mask = ATA_PIO4; hwif->pio_mask = ATA_PIO4;
hwif->tuneproc = tuneproc;
probe_hwif_init(hwif);
} }
/* /*
...@@ -361,7 +352,7 @@ static void __exit qd_unsetup(ide_hwif_t *hwif) ...@@ -361,7 +352,7 @@ static void __exit qd_unsetup(ide_hwif_t *hwif)
{ {
u8 config = hwif->config_data; u8 config = hwif->config_data;
int base = hwif->select_data; int base = hwif->select_data;
void *tuneproc = (void *) hwif->tuneproc; void *set_pio_mode = (void *)hwif->set_pio_mode;
if (hwif->chipset != ide_qd65xx) if (hwif->chipset != ide_qd65xx)
return; return;
...@@ -369,12 +360,12 @@ static void __exit qd_unsetup(ide_hwif_t *hwif) ...@@ -369,12 +360,12 @@ static void __exit qd_unsetup(ide_hwif_t *hwif)
printk(KERN_NOTICE "%s: back to defaults\n", hwif->name); printk(KERN_NOTICE "%s: back to defaults\n", hwif->name);
hwif->selectproc = NULL; hwif->selectproc = NULL;
hwif->tuneproc = NULL; hwif->set_pio_mode = NULL;
if (tuneproc == (void *) qd6500_tune_drive) { if (set_pio_mode == (void *)qd6500_set_pio_mode) {
// will do it for both // will do it for both
qd_write_reg(QD6500_DEF_DATA, QD_TIMREG(&hwif->drives[0])); qd_write_reg(QD6500_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
} else if (tuneproc == (void *) qd6580_tune_drive) { } else if (set_pio_mode == (void *)qd6580_set_pio_mode) {
if (QD_CONTROL(hwif) & QD_CONTR_SEC_DISABLED) { if (QD_CONTROL(hwif) & QD_CONTR_SEC_DISABLED) {
qd_write_reg(QD6580_DEF_DATA, QD_TIMREG(&hwif->drives[0])); qd_write_reg(QD6580_DEF_DATA, QD_TIMREG(&hwif->drives[0]));
qd_write_reg(QD6580_DEF_DATA2, QD_TIMREG(&hwif->drives[1])); qd_write_reg(QD6580_DEF_DATA2, QD_TIMREG(&hwif->drives[1]));
...@@ -424,8 +415,11 @@ static int __init qd_probe(int base) ...@@ -424,8 +415,11 @@ static int __init qd_probe(int base)
return 1; return 1;
} }
qd_setup(hwif, base, config, QD6500_DEF_DATA, QD6500_DEF_DATA, qd_setup(hwif, base, config, QD6500_DEF_DATA, QD6500_DEF_DATA);
&qd6500_tune_drive);
hwif->set_pio_mode = &qd6500_set_pio_mode;
probe_hwif_init(hwif);
ide_proc_register_port(hwif); ide_proc_register_port(hwif);
...@@ -455,8 +449,12 @@ static int __init qd_probe(int base) ...@@ -455,8 +449,12 @@ static int __init qd_probe(int base)
printk(KERN_INFO "%s: qd6580: single IDE board\n", printk(KERN_INFO "%s: qd6580: single IDE board\n",
hwif->name); hwif->name);
qd_setup(hwif, base, config | (control << 8), qd_setup(hwif, base, config | (control << 8),
QD6580_DEF_DATA, QD6580_DEF_DATA2, QD6580_DEF_DATA, QD6580_DEF_DATA2);
&qd6580_tune_drive);
hwif->set_pio_mode = &qd6580_set_pio_mode;
probe_hwif_init(hwif);
qd_write_reg(QD_DEF_CONTR,QD_CONTROL_PORT); qd_write_reg(QD_DEF_CONTR,QD_CONTROL_PORT);
ide_proc_register_port(hwif); ide_proc_register_port(hwif);
...@@ -472,11 +470,19 @@ static int __init qd_probe(int base) ...@@ -472,11 +470,19 @@ static int __init qd_probe(int base)
hwif->name, mate->name); hwif->name, mate->name);
qd_setup(hwif, base, config | (control << 8), qd_setup(hwif, base, config | (control << 8),
QD6580_DEF_DATA, QD6580_DEF_DATA, QD6580_DEF_DATA, QD6580_DEF_DATA);
&qd6580_tune_drive);
hwif->set_pio_mode = &qd6580_set_pio_mode;
probe_hwif_init(hwif);
qd_setup(mate, base, config | (control << 8), qd_setup(mate, base, config | (control << 8),
QD6580_DEF_DATA2, QD6580_DEF_DATA2, QD6580_DEF_DATA2, QD6580_DEF_DATA2);
&qd6580_tune_drive);
mate->set_pio_mode = &qd6580_set_pio_mode;
probe_hwif_init(mate);
qd_write_reg(QD_DEF_CONTR,QD_CONTROL_PORT); qd_write_reg(QD_DEF_CONTR,QD_CONTROL_PORT);
ide_proc_register_port(hwif); ide_proc_register_port(hwif);
......
...@@ -105,12 +105,11 @@ static void umc_set_speeds (u8 speeds[]) ...@@ -105,12 +105,11 @@ static void umc_set_speeds (u8 speeds[])
speeds[0], speeds[1], speeds[2], speeds[3]); speeds[0], speeds[1], speeds[2], speeds[3]);
} }
static void tune_umc (ide_drive_t *drive, u8 pio) static void umc_set_pio_mode(ide_drive_t *drive, const u8 pio)
{ {
unsigned long flags; unsigned long flags;
ide_hwgroup_t *hwgroup = ide_hwifs[HWIF(drive)->index^1].hwgroup; ide_hwgroup_t *hwgroup = ide_hwifs[HWIF(drive)->index^1].hwgroup;
pio = ide_get_best_pio_mode(drive, pio, 4);
printk("%s: setting umc8672 to PIO mode%d (speed %d)\n", printk("%s: setting umc8672 to PIO mode%d (speed %d)\n",
drive->name, pio, pio_to_umc[pio]); drive->name, pio, pio_to_umc[pio]);
spin_lock_irqsave(&ide_lock, flags); spin_lock_irqsave(&ide_lock, flags);
...@@ -150,12 +149,12 @@ static int __init umc8672_probe(void) ...@@ -150,12 +149,12 @@ static int __init umc8672_probe(void)
hwif->chipset = ide_umc8672; hwif->chipset = ide_umc8672;
hwif->pio_mask = ATA_PIO4; hwif->pio_mask = ATA_PIO4;
hwif->tuneproc = &tune_umc; hwif->set_pio_mode = &umc_set_pio_mode;
hwif->mate = mate; hwif->mate = mate;
mate->chipset = ide_umc8672; mate->chipset = ide_umc8672;
mate->pio_mask = ATA_PIO4; mate->pio_mask = ATA_PIO4;
mate->tuneproc = &tune_umc; mate->set_pio_mode = &umc_set_pio_mode;
mate->mate = hwif; mate->mate = hwif;
mate->channel = 1; mate->channel = 1;
......
...@@ -99,18 +99,12 @@ void auide_outsw(unsigned long port, void *addr, u32 count) ...@@ -99,18 +99,12 @@ void auide_outsw(unsigned long port, void *addr, u32 count)
#endif #endif
static void auide_tune_drive(ide_drive_t *drive, byte pio) static void au1xxx_set_pio_mode(ide_drive_t *drive, const u8 pio)
{ {
int mem_sttime; int mem_sttime;
int mem_stcfg; int mem_stcfg;
u8 speed; u8 speed;
/* get the best pio mode for the drive */
pio = ide_get_best_pio_mode(drive, pio, 4);
printk(KERN_INFO "%s: setting Au1XXX IDE to PIO mode%d\n",
drive->name, pio);
mem_sttime = 0; mem_sttime = 0;
mem_stcfg = au_readl(MEM_STCFG2); mem_stcfg = au_readl(MEM_STCFG2);
...@@ -184,7 +178,7 @@ static int auide_tune_chipset(ide_drive_t *drive, const u8 speed) ...@@ -184,7 +178,7 @@ static int auide_tune_chipset(ide_drive_t *drive, const u8 speed)
mem_stcfg = au_readl(MEM_STCFG2); mem_stcfg = au_readl(MEM_STCFG2);
if (speed >= XFER_PIO_0 && speed <= XFER_PIO_4) { if (speed >= XFER_PIO_0 && speed <= XFER_PIO_4) {
auide_tune_drive(drive, speed - XFER_PIO_0); au1xxx_set_pio_mode(drive, speed - XFER_PIO_0);
return 0; return 0;
} }
...@@ -712,7 +706,7 @@ static int au_ide_probe(struct device *dev) ...@@ -712,7 +706,7 @@ static int au_ide_probe(struct device *dev)
hwif->OUTSW = auide_outsw; hwif->OUTSW = auide_outsw;
#endif #endif
hwif->tuneproc = &auide_tune_drive; hwif->set_pio_mode = &au1xxx_set_pio_mode;
hwif->speedproc = &auide_tune_chipset; hwif->speedproc = &auide_tune_chipset;
#ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA #ifdef CONFIG_BLK_DEV_IDE_AU1XXX_MDMA2_DBDMA
......
...@@ -138,9 +138,8 @@ static int aec6260_tune_chipset(ide_drive_t *drive, const u8 speed) ...@@ -138,9 +138,8 @@ static int aec6260_tune_chipset(ide_drive_t *drive, const u8 speed)
return(ide_config_drive_speed(drive, speed)); return(ide_config_drive_speed(drive, speed));
} }
static void aec62xx_tune_drive (ide_drive_t *drive, u8 pio) static void aec_set_pio_mode(ide_drive_t *drive, const u8 pio)
{ {
pio = ide_get_best_pio_mode(drive, pio, 4);
(void) HWIF(drive)->speedproc(drive, pio + XFER_PIO_0); (void) HWIF(drive)->speedproc(drive, pio + XFER_PIO_0);
} }
...@@ -150,7 +149,7 @@ static int aec62xx_config_drive_xfer_rate (ide_drive_t *drive) ...@@ -150,7 +149,7 @@ static int aec62xx_config_drive_xfer_rate (ide_drive_t *drive)
return 0; return 0;
if (ide_use_fast_pio(drive)) if (ide_use_fast_pio(drive))
aec62xx_tune_drive(drive, 255); ide_set_max_pio(drive);
return -1; return -1;
} }
...@@ -201,7 +200,7 @@ static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif) ...@@ -201,7 +200,7 @@ static void __devinit init_hwif_aec62xx(ide_hwif_t *hwif)
u8 reg54 = 0, mask = hwif->channel ? 0xf0 : 0x0f; u8 reg54 = 0, mask = hwif->channel ? 0xf0 : 0x0f;