diff options
author | David S. Miller <davem@davemloft.net> | 2009-11-06 07:52:50 -0500 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2009-11-06 07:52:50 -0500 |
commit | 0fb18c4777ff424c1db694af98443a201fa4fc30 (patch) | |
tree | 21451127e368e53ee95557d5cf35f5f012f8ec52 /drivers/ide | |
parent | 9bd7496f5dd488e109e91d9d5743915fb4dfbfde (diff) |
Revert "ide: try to use PIO Mode 0 during probe if possible"
This reverts commit 6029336426a2b43e4bc6f4a84be8789a047d139e.
Ok, we really do need to revert this, even with Bart's sis5513.c
fix in there.
The problem is that several driver's ->set_pio_mode() method
depends upon the drive->media type being set properly. Most
of them use this to enable prefetching, which can only be done
for disk media.
But the commit being reverted here calls ->set_pio_mode() before
it's setup. Actually it considers everything disk because that
is the default media type set by ide_port_init_devices_data().
The set of drivers that depend upon the media type in their
->set_pio_method() are:
drivers/ide/alim15x3.c
drivers/ide/it8172.c
drivers/ide/it8213.c
drivers/ide/pdc202xx_old.c
drivers/ide/piix.c
drivers/ide/qd65xx.c
drivers/ide/sis5513.c
drivers/ide/slc90e66.c
And it is possible that we could fix this by guarding the prefetching
and other media dependent setting changes with a test on
IDE_PFLAG_PROBING in hwif->port_flags, that's simply too risky for
2.6.32-rcX and -stable.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/ide')
-rw-r--r-- | drivers/ide/ide-probe.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/drivers/ide/ide-probe.c b/drivers/ide/ide-probe.c index 63c53d65e875..4d76ba473097 100644 --- a/drivers/ide/ide-probe.c +++ b/drivers/ide/ide-probe.c | |||
@@ -1046,15 +1046,6 @@ static void ide_port_init_devices(ide_hwif_t *hwif) | |||
1046 | if (port_ops && port_ops->init_dev) | 1046 | if (port_ops && port_ops->init_dev) |
1047 | port_ops->init_dev(drive); | 1047 | port_ops->init_dev(drive); |
1048 | } | 1048 | } |
1049 | |||
1050 | ide_port_for_each_dev(i, drive, hwif) { | ||
1051 | /* | ||
1052 | * default to PIO Mode 0 before we figure out | ||
1053 | * the most suited mode for the attached device | ||
1054 | */ | ||
1055 | if (port_ops && port_ops->set_pio_mode) | ||
1056 | port_ops->set_pio_mode(drive, 0); | ||
1057 | } | ||
1058 | } | 1049 | } |
1059 | 1050 | ||
1060 | static void ide_init_port(ide_hwif_t *hwif, unsigned int port, | 1051 | static void ide_init_port(ide_hwif_t *hwif, unsigned int port, |