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

Commit 3160d541 authored by Bartlomiej Zolnierkiewicz's avatar Bartlomiej Zolnierkiewicz
Browse files

sis5513: add ->udma_filter method for chipset_family >= ATA_133 



* Add sis5513_ata133_udma_filter() for chipset_family >= ATA_133,
  use it to filter UDMA6 mode if ATA133 bit is disabled.

* Remove no longer needed UDMA6 limiting logic from sis5513_tune_chipset().

* Bump driver version.

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 7670df73

drivers/ide/pci/sis5513.c

+18 −4
Original line number Diff line number Diff line 
/*

 * linux/drivers/ide/pci/sis5513.c	Version 0.25	Jun 10, 2007

 * linux/drivers/ide/pci/sis5513.c	Version 0.26	Jul 7, 2007

 *

 * Copyright (C) 1999-2000	Andre Hedrick <andre@linux-ide.org>

 * Copyright (C) 2002		Lionel Bouton <Lionel.Bouton@inet6.fr>, Maintainer
@@ -582,9 +582,6 @@ static int sis5513_tune_chipset (ide_drive_t *drive, u8 xferspeed) 
					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 {

				/* if ATA133 disable, we should not set speed above UDMA5 */

					if (speed > XFER_UDMA_5)

						speed = XFER_UDMA_5;

					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;

				}
@@ -640,6 +637,20 @@ static int sis5513_config_xfer_rate(ide_drive_t *drive) 
	return -1;

}



static u8 sis5513_ata133_udma_filter(ide_drive_t *drive)

{

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

	int drive_pci;

	u32 reg54 = 0, regdw = 0;



	pci_read_config_dword(dev, 0x54, &reg54);

	drive_pci = ((reg54 & 0x40000000) ? 0x70 : 0x40) + drive->dn * 4;

	pci_read_config_dword(dev, drive_pci, &regdw);



	/* if ATA133 disable, we should not set speed above UDMA5 */

	return (regdw & 0x08) ? ATA_UDMA6 : ATA_UDMA5;

}



/* Chip detection and general config */

static unsigned int __devinit init_chipset_sis5513 (struct pci_dev *dev, const char *name)

{
@@ -847,6 +858,9 @@ static void __devinit init_hwif_sis5513 (ide_hwif_t *hwif) 
	hwif->tuneproc = &sis5513_tuneproc;

	hwif->speedproc = &sis5513_tune_chipset;



	if (chipset_family >= ATA_133)

		hwif->udma_filter = sis5513_ata133_udma_filter;



	if (!(hwif->dma_base)) {

		hwif->drives[0].autotune = 1;

		hwif->drives[1].autotune = 1;