Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 30dfd12f authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Bartlomiej Zolnierkiewicz
Browse files

piix: tuneproc() fixes/cleanups 



Fix/cleanup the driver's tuneproc() and ratemask() methods:

- PPE, IE, and TIME bits need to be cleared beforehand for the slave drive as
  well as master (Alan probably just forgot about it);

- this driver only supports PIO modes up to 4, so must pass the correct limit
  to ide_get_best_pio_mode();

- use min_t() macro instead of min();

- simplify slave vs master drive evaluation;

- do come coding and formatting cleanups...

Signed-off-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent d2872239

drivers/ide/pci/piix.c

+10 −11
Original line number Diff line number Diff line 
/*

 *  linux/drivers/ide/pci/piix.c	Version 0.45	May 12, 2006

 *  linux/drivers/ide/pci/piix.c	Version 0.46	December 3, 2006

 *

 *  Copyright (C) 1998-1999 Andrzej Krzysztofowicz, Author and Maintainer

 *  Copyright (C) 1998-2000 Andre Hedrick <andre@linux-ide.org>
@@ -163,7 +163,7 @@ static u8 piix_ratemask (ide_drive_t *drive) 
	 *	if the drive cannot see an 80pin cable.

	 */

	if (!eighty_ninty_three(drive))

		mode = min(mode, (u8)1);

		mode = min_t(u8, mode, 1);

	return mode;

}
@@ -216,7 +216,7 @@ static void piix_tune_drive (ide_drive_t *drive, u8 pio) 
{

	ide_hwif_t *hwif	= HWIF(drive);

	struct pci_dev *dev	= hwif->pci_dev;

	int is_slave		= (&hwif->drives[1] == drive);

	int is_slave		= drive->dn & 1;

	int master_port		= hwif->channel ? 0x42 : 0x40;

	int slave_port		= 0x44;

	unsigned long flags;
@@ -233,7 +233,7 @@ static void piix_tune_drive (ide_drive_t *drive, u8 pio) 
					{ 2, 1 },

					{ 2, 3 }, };



	pio = ide_get_best_pio_mode(drive, pio, 5, NULL);

	pio = ide_get_best_pio_mode(drive, pio, 4, NULL);



	/*

	 * Master vs slave is synchronized above us but the slave register is
@@ -243,25 +243,24 @@ static void piix_tune_drive (ide_drive_t *drive, u8 pio) 
	spin_lock_irqsave(&tune_lock, flags);

	pci_read_config_word(dev, master_port, &master_data);



	if (pio >= 2)

	if (pio > 1)

		control |= 1;	/* Programmable timing on */

	if (drive->media == ide_disk)

		control |= 4;	/* Prefetch, post write */

	if (pio >= 3)

	if (pio > 2)

		control |= 2;	/* IORDY */

	if (is_slave) {

		master_data = master_data | 0x4000;

		master_data |=  0x4000;

		master_data &= ~0x0070;

		if (pio > 1) {

			/* enable PPE, IE and TIME */

			master_data = master_data | (control << 4);

		} else {

			master_data &= ~0x0070;

		}

		pci_read_config_byte(dev, slave_port, &slave_data);

		slave_data = slave_data & (hwif->channel ? 0x0f : 0xf0);

		slave_data = slave_data | (((timings[pio][0] << 2) | timings[pio][1]) << (hwif->channel ? 4 : 0));

	} else {

		master_data = master_data & 0xccf8;

		master_data &= ~0x3307;

		if (pio > 1) {

			/* enable PPE, IE and TIME */

			master_data = master_data | control;