GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-26 00:21:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

ide: add ide_dev_has_iordy() helper (take 4)

Browse source 
* Add ide_dev_has_iordy() helper and use it sl82c105 host driver.

* Remove no longer needed ide_pio_data_t.use_iordy field.

v2/v3:
* Fix issues noticed by Sergei:
  - correct patch description
  - fix comment in ide_get_best_pio_mode()

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

Acked-by: Sergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Jeff Garzik <jeff@garzik.org>
Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2007-07-20 01:11:55 +02:00
parent 342cdb6d47
commit 2229833c13
3 changed files with 13 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
drivers/ide/ide-lib.c
View file

@ -267,18 +267,15 @@ u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode, ide_p
{ {
int pio_mode; int pio_mode;
int cycle_time = 0; int cycle_time = 0;
int use_iordy = 0;
struct hd_driveid* id = drive->id; struct hd_driveid* id = drive->id;
int overridden = 0; int overridden = 0;
if (mode_wanted != 255) { if (mode_wanted != 255) {
pio_mode = mode_wanted; pio_mode = mode_wanted;
use_iordy = (pio_mode > 2);
} else if (!drive->id) { } else if (!drive->id) {
pio_mode = 0; pio_mode = 0;
} else if ((pio_mode = ide_scan_pio_blacklist(id->model)) != -1) { } else if ((pio_mode = ide_scan_pio_blacklist(id->model)) != -1) {
printk(KERN_INFO "%s: is on PIO blacklist\n", drive->name); printk(KERN_INFO "%s: is on PIO blacklist\n", drive->name);
use_iordy = (pio_mode > 2);
} else { } else {
pio_mode = id->tPIO; pio_mode = id->tPIO;
if (pio_mode > 2) { /* 2 is maximum allowed tPIO value */ if (pio_mode > 2) { /* 2 is maximum allowed tPIO value */
@ -286,8 +283,7 @@ u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode, ide_p
overridden = 1; overridden = 1;
} }
if (id->field_valid & 2) { /* drive implements ATA2? */ if (id->field_valid & 2) { /* drive implements ATA2? */
if (id->capability & 8) { /* drive supports use_iordy? */ if (id->capability & 8) { /* IORDY supported? */
use_iordy = 1;
cycle_time = id->eide_pio_iordy; cycle_time = id->eide_pio_iordy;
if (id->eide_pio_modes & 7) { if (id->eide_pio_modes & 7) {
overridden = 0; overridden = 0;
@ -325,7 +321,6 @@ u8 ide_get_best_pio_mode (ide_drive_t *drive, u8 mode_wanted, u8 max_mode, ide_p
if (d) { if (d) {
d->pio_mode = pio_mode; d->pio_mode = pio_mode;
d->cycle_time = cycle_time ? cycle_time : ide_pio_timings[pio_mode].cycle_time; d->cycle_time = cycle_time ? cycle_time : ide_pio_timings[pio_mode].cycle_time;
d->use_iordy = use_iordy;
} }
return pio_mode; return pio_mode;
} }

10
drivers/ide/pci/sl82c105.c
View file

@ -52,9 +52,10 @@
* Convert a PIO mode and cycle time to the required on/off times * Convert a PIO mode and cycle time to the required on/off times
* for the interface. This has protection against runaway timings. * for the interface. This has protection against runaway timings.
*/ */
static unsigned int get_pio_timings(ide_pio_data_t *p) static unsigned int get_pio_timings(ide_drive_t *drive, ide_pio_data_t *p)
{ {
unsigned int cmd_on, cmd_off; unsigned int cmd_on, cmd_off;
u8 iordy = 0;
cmd_on = (ide_pio_timings[p->pio_mode].active_time + 29) / 30; cmd_on = (ide_pio_timings[p->pio_mode].active_time + 29) / 30;
cmd_off = (p->cycle_time - 30 * cmd_on + 29) / 30; cmd_off = (p->cycle_time - 30 * cmd_on + 29) / 30;
@ -65,7 +66,10 @@ static unsigned int get_pio_timings(ide_pio_data_t *p)
if (cmd_off == 0) if (cmd_off == 0)
cmd_off = 1; cmd_off = 1;
return (cmd_on - 1) << 8 | (cmd_off - 1) | (p->use_iordy ? 0x40 : 0x00); if (p->pio_mode > 2 || ide_dev_has_iordy(drive->id))
iordy = 0x40;
return (cmd_on - 1) << 8 | (cmd_off - 1) | iordy;
} }
/* /*
@ -82,7 +86,7 @@ static u8 sl82c105_tune_pio(ide_drive_t *drive, u8 pio)
pio = ide_get_best_pio_mode(drive, pio, 5, &p); pio = ide_get_best_pio_mode(drive, pio, 5, &p);
drv_ctrl = get_pio_timings(&p); drv_ctrl = get_pio_timings(drive, &p);
/* /*
* Store the PIO timings so that we can restore them * Store the PIO timings so that we can restore them

6
include/linux/ide.h
View file

@ -1363,6 +1363,11 @@ extern void ide_toggle_bounce(ide_drive_t *drive, int on);
extern int ide_set_xfer_rate(ide_drive_t *drive, u8 rate); extern int ide_set_xfer_rate(ide_drive_t *drive, u8 rate);
int ide_use_fast_pio(ide_drive_t *); int ide_use_fast_pio(ide_drive_t *);
static inline int ide_dev_has_iordy(struct hd_driveid *id)
{
return ((id->field_valid & 2) && (id->capability & 8)) ? 1 : 0;
}
u8 ide_dump_status(ide_drive_t *, const char *, u8); u8 ide_dump_status(ide_drive_t *, const char *, u8);
typedef struct ide_pio_timings_s { typedef struct ide_pio_timings_s {
@ -1374,7 +1379,6 @@ typedef struct ide_pio_timings_s {
typedef struct ide_pio_data_s { typedef struct ide_pio_data_s {
u8 pio_mode; u8 pio_mode;
u8 use_iordy;
unsigned int cycle_time; unsigned int cycle_time;
} ide_pio_data_t; } ide_pio_data_t;