leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ide: don't enable IORDY at a probe time

Browse Source 
* Add 'unsigned long port_flags' field to ide_hwif_t.

* Add IDE_PFLAG_PROBING port flag and keep it set during probing.

* Fix ide_pio_need_iordy() to not enable IORDY at a probe time
  (IORDY may lead to controller lock up on certain controllers
   if the port is not occupied).

Loosely based on the recent libata's fix by Tejun, thanks to Alan
for the hint that IDE may also need it.

Signed-off-by: Bartlomiej Zolnierkiewicz <bzolnier@gmail.com>
This commit is contained in:
Bartlomiej Zolnierkiewicz 2009-06-15 18:52:54 +02:00
parent c9ef59ff01
commit 5880b5de71
3 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/ide/ide-probe.c
View File

@ -1378,6 +1378,9 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
ide_init_port(hwif, i & 1, d); ide_init_port(hwif, i & 1, d);
ide_port_cable_detect(hwif); ide_port_cable_detect(hwif);
hwif->port_flags |= IDE_PFLAG_PROBING;
ide_port_init_devices(hwif); ide_port_init_devices(hwif);
} }
@ -1388,6 +1391,8 @@ int ide_host_register(struct ide_host *host, const struct ide_port_info *d,
if (ide_probe_port(hwif) == 0) if (ide_probe_port(hwif) == 0)
hwif->present = 1; hwif->present = 1;
hwif->port_flags &= ~IDE_PFLAG_PROBING;
if ((hwif->host_flags & IDE_HFLAG_4DRIVES) == 0 || if ((hwif->host_flags & IDE_HFLAG_4DRIVES) == 0 ||
hwif->mate == NULL || hwif->mate->present == 0) { hwif->mate == NULL || hwif->mate->present == 0) {
if (ide_register_port(hwif)) { if (ide_register_port(hwif)) {
@ -1569,11 +1574,20 @@ EXPORT_SYMBOL_GPL(ide_host_remove);
void ide_port_scan(ide_hwif_t *hwif) void ide_port_scan(ide_hwif_t *hwif)
{ {
int rc;
ide_port_apply_params(hwif); ide_port_apply_params(hwif);
ide_port_cable_detect(hwif); ide_port_cable_detect(hwif);
hwif->port_flags |= IDE_PFLAG_PROBING;
ide_port_init_devices(hwif); ide_port_init_devices(hwif);
if (ide_probe_port(hwif) < 0) rc = ide_probe_port(hwif);
hwif->port_flags &= ~IDE_PFLAG_PROBING;
if (rc < 0)
return; return;
hwif->present = 1; hwif->present = 1;

6
drivers/ide/ide-xfer-mode.c
View File

@ -109,6 +109,12 @@ EXPORT_SYMBOL_GPL(ide_get_best_pio_mode);
int ide_pio_need_iordy(ide_drive_t *drive, const u8 pio) int ide_pio_need_iordy(ide_drive_t *drive, const u8 pio)
{ {
/*
* IORDY may lead to controller lock up on certain controllers
* if the port is not occupied.
*/
if (pio == 0 && (drive->hwif->port_flags & IDE_PFLAG_PROBING))
return 0;
return ata_id_pio_need_iordy(drive->id, pio); return ata_id_pio_need_iordy(drive->id, pio);
} }
EXPORT_SYMBOL_GPL(ide_pio_need_iordy); EXPORT_SYMBOL_GPL(ide_pio_need_iordy);

6
include/linux/ide.h
View File

@ -661,6 +661,10 @@ struct ide_dma_ops {
u8 (*dma_sff_read_status)(struct hwif_s *); u8 (*dma_sff_read_status)(struct hwif_s *);
}; };
enum {
IDE_PFLAG_PROBING = (1 << 0),
};
struct ide_host; struct ide_host;
typedef struct hwif_s { typedef struct hwif_s {
@ -677,6 +681,8 @@ typedef struct hwif_s {
ide_drive_t *devices[MAX_DRIVES + 1]; ide_drive_t *devices[MAX_DRIVES + 1];
unsigned long port_flags;
u8 major; /* our major number */ u8 major; /* our major number */
u8 index; /* 0 for ide0; 1 for ide1; ... */ u8 index; /* 0 for ide0; 1 for ide1; ... */
u8 channel; /* for dual-port chips: 0=primary, 1=secondary */ u8 channel; /* for dual-port chips: 0=primary, 1=secondary */