Commit 0fb18c47 authored Nov 06, 2009 by David S. Miller

Revert "ide: try to use PIO Mode 0 during probe if possible"



This reverts commit 60293364.

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>

parent 9bd7496f

drivers/ide/ide-probe.c

+0 −9

Original line number	Diff line number	Diff line
		@@ -1046,15 +1046,6 @@ static void ide_port_init_devices(ide_hwif_t *hwif)
		if (port_ops && port_ops->init_dev)
		port_ops->init_dev(drive);
		}

		ide_port_for_each_dev(i, drive, hwif) {
		/*
		* default to PIO Mode 0 before we figure out
		* the most suited mode for the attached device
		*/
		if (port_ops && port_ops->set_pio_mode)
		port_ops->set_pio_mode(drive, 0);
		}
		}

		static void ide_init_port(ide_hwif_t *hwif, unsigned int port,

Admin message