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

Commit 428c6440 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

sis5513: factor out UDMA programming code 



* Factor out UDMA programming code from sis_set_dma_mode() to per
  chipset family helpers: sis_{ata33,ata133}_program_udma_timings().

* Add sis_program_udma_timings() helper.

* Remove unneeded casts to 'unsigned long'.

* Minor cleanups.

There should be no functionality changes caused by this patch.

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

drivers/ide/pci/sis5513.c

+45 −33
Original line number Diff line number Diff line
@@ -305,50 +305,62 @@ static void sis_set_pio_mode(ide_drive_t *drive, const u8 pio) 
	sis_program_timings(drive, XFER_PIO_0 + pio);

}



static void sis_set_dma_mode(ide_drive_t *drive, const u8 speed)

static void sis_ata133_program_udma_timings(ide_drive_t *drive, const u8 mode)

{

	ide_hwif_t *hwif	= HWIF(drive);

	struct pci_dev *dev	= hwif->pci_dev;



	/* Config chip for mode */

	switch(speed) {

		case XFER_UDMA_6:

		case XFER_UDMA_5:

		case XFER_UDMA_4:

		case XFER_UDMA_3:

		case XFER_UDMA_2:

		case XFER_UDMA_1:

		case XFER_UDMA_0:

			if (chipset_family >= ATA_133) {

	struct pci_dev *dev = drive->hwif->pci_dev;

	u32 regdw = 0;

				u8 drive_pci = sis_ata133_get_base(drive);

	u8 drive_pci = sis_ata133_get_base(drive), clk, idx;



	pci_read_config_dword(dev, drive_pci, &regdw);



	regdw |= 0x04;

	regdw &= 0xfffff00f;

	/* check if ATA133 enable */

				if (regdw & 0x08) {

					regdw |= (unsigned long)cycle_time_value[ATA_133][speed-XFER_UDMA_0] << 4;

					regdw |= (unsigned long)cvs_time_value[ATA_133][speed-XFER_UDMA_0] << 8;

				} else {

					regdw |= (unsigned long)cycle_time_value[ATA_100][speed-XFER_UDMA_0] << 4;

					regdw |= (unsigned long)cvs_time_value[ATA_100][speed-XFER_UDMA_0] << 8;

	clk = (regdw & 0x08) ? ATA_133 : ATA_100;

	idx = mode - XFER_UDMA_0;

	regdw |= cycle_time_value[clk][idx] << 4;

	regdw |= cvs_time_value[clk][idx] << 8;



	pci_write_config_dword(dev, drive_pci, regdw);

}

				pci_write_config_dword(dev, (unsigned long)drive_pci, regdw);

			} else {

				u8 drive_pci = 0x40 + drive->dn * 2, reg = 0;



static void sis_ata33_program_udma_timings(ide_drive_t *drive, const u8 mode)

{

	struct pci_dev *dev = drive->hwif->pci_dev;

	u8 drive_pci = 0x40 + drive->dn * 2, reg = 0, i = chipset_family;



	pci_read_config_byte(dev, drive_pci + 1, &reg);

				/* Force the UDMA bit on if we want to use UDMA */



	/* force the UDMA bit on if we want to use UDMA */

	reg |= 0x80;

	/* clean reg cycle time bits */

				reg &= ~((0xFF >> (8 - cycle_time_range[chipset_family]))

					 << cycle_time_offset[chipset_family]);

	reg &= ~((0xff >> (8 - cycle_time_range[i])) << cycle_time_offset[i]);

	/* set reg cycle time bits */

				reg |= cycle_time_value[chipset_family][speed-XFER_UDMA_0]

					<< cycle_time_offset[chipset_family];

	reg |= cycle_time_value[i][mode - XFER_UDMA_0] << cycle_time_offset[i];



	pci_write_config_byte(dev, drive_pci + 1, reg);

}



static void sis_program_udma_timings(ide_drive_t *drive, const u8 mode)

{

	if (chipset_family >= ATA_133)	/* ATA_133 */

		sis_ata133_program_udma_timings(drive, mode);

	else				/* ATA_33/66/100a/100/133a */

		sis_ata33_program_udma_timings(drive, mode);

}



static void sis_set_dma_mode(ide_drive_t *drive, const u8 speed)

{

	/* Config chip for mode */

	switch(speed) {

		case XFER_UDMA_6:

		case XFER_UDMA_5:

		case XFER_UDMA_4:

		case XFER_UDMA_3:

		case XFER_UDMA_2:

		case XFER_UDMA_1:

		case XFER_UDMA_0:

			sis_program_udma_timings(drive, speed);

			break;

		case XFER_MW_DMA_2:

		case XFER_MW_DMA_1: