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

Commit 68aaf815 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

it8213: PIO fixes (take 2) 



* Rename it8213_tuneproc() to it8213_tune_pio() and add it8213_tuneproc()
  wrapper.  Move finding of the best PIO mode to the new wrapper.

* Add setting of transfer mode on the device to it8213_tuneproc().

* Don't call it8213_dma_2_pio() for PIO modes in it8213_tune_chipset().

* Use it8213_tuneproc() in it8213_config_drive_for_dma().

v2:
* Remove PIO modes from it8213_dma_2_pio(), they are no longer needed there
  (Noticed by Sergei)

Acked-by: default avatarSergei Shtylyov <sshtylyov@ru.mvista.com>
Signed-off-by: default avatarBartlomiej Zolnierkiewicz <bzolnier@gmail.com>
parent bc0b0b5c

drivers/ide/pci/it8213.c

+17 −16
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
 *	it8213_dma_2_pio		-	return the PIO mode matching DMA

 *	@xfer_rate: transfer speed

 *

 *	Returns the nearest equivalent PIO timing for the PIO or DMA

 *	Returns the nearest equivalent PIO timing for the DMA

 *	mode requested by the controller.

 */
@@ -35,34 +35,28 @@ static u8 it8213_dma_2_pio (u8 xfer_rate) { 
		case XFER_UDMA_1:

		case XFER_UDMA_0:

		case XFER_MW_DMA_2:

		case XFER_PIO_4:

			return 4;

		case XFER_MW_DMA_1:

		case XFER_PIO_3:

			return 3;

		case XFER_SW_DMA_2:

		case XFER_PIO_2:

			return 2;

		case XFER_MW_DMA_0:

		case XFER_SW_DMA_1:

		case XFER_SW_DMA_0:

		case XFER_PIO_1:

		case XFER_PIO_0:

		case XFER_PIO_SLOW:

		default:

			return 0;

	}

}



/*

 *	it8213_tuneproc	-	tune a drive

 *	it8213_tune_pio	-	tune a drive

 *	@drive: drive to tune

 *	@pio: desired PIO mode

 *

 *	Set the interface PIO mode.

 */



static void it8213_tuneproc (ide_drive_t *drive, u8 pio)

static void it8213_tune_pio(ide_drive_t *drive, const u8 pio)

{

	ide_hwif_t *hwif	= HWIF(drive);

	struct pci_dev *dev	= hwif->pci_dev;
@@ -82,8 +76,6 @@ static void it8213_tuneproc (ide_drive_t *drive, u8 pio) 
					{ 2, 1 },

					{ 2, 3 }, };



	pio = ide_get_best_pio_mode(drive, pio, 4);



	spin_lock_irqsave(&tune_lock, flags);

	pci_read_config_word(dev, master_port, &master_data);
@@ -113,6 +105,13 @@ static void it8213_tuneproc (ide_drive_t *drive, u8 pio) 
	spin_unlock_irqrestore(&tune_lock, flags);

}



static void it8213_tuneproc(ide_drive_t *drive, u8 pio)

{

	pio = ide_get_best_pio_mode(drive, pio, 4);

	it8213_tune_pio(drive, pio);

	ide_config_drive_speed(drive, XFER_PIO_0 + pio);

}



/**

 *	it8213_tune_chipset	-	set controller timings

 *	@drive: Drive to set up
@@ -193,7 +192,12 @@ static int it8213_tune_chipset (ide_drive_t *drive, u8 xferspeed) 
		if (reg55 & w_flag)

			pci_write_config_byte(dev, 0x55, (u8) reg55 & ~w_flag);

	}

	it8213_tuneproc(drive, it8213_dma_2_pio(speed));



	if (speed > XFER_PIO_4)

		it8213_tune_pio(drive, it8213_dma_2_pio(speed));

	else

		it8213_tune_pio(drive, speed - XFER_PIO_0);



	return ide_config_drive_speed(drive, speed);

}
@@ -209,13 +213,10 @@ static int it8213_tune_chipset (ide_drive_t *drive, u8 xferspeed) 


static int it8213_config_drive_for_dma (ide_drive_t *drive)

{

	u8 pio;



	if (ide_tune_dma(drive))

		return 0;



	pio = ide_get_best_pio_mode(drive, 255, 4);

	it8213_tune_chipset(drive, XFER_PIO_0 + pio);

	it8213_tuneproc(drive, 255);



	return -1;

}