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

Commit 83a6d4ab authored by Sergei Shtylyov's avatar Sergei Shtylyov Committed by Bartlomiej Zolnierkiewicz
Browse files

cmd64x: init. code cleanup 



Fix two minor issues with PCI0646 chip reporting in the init_chipset() method:
"IRQ workaround enabled" message printed out not only for revision 0x01 and
"CMD646: chipset revision" printed twice (by IDE core and the driver itself).
Also, remove empty/pointless switch cases for the chips other than PCI0646,
duplicate write to the MRDMODE register when enabling interrupts and MEMORY
READ LINE cycles, and needless/misplaced initialization of the timing registers
in this method.
Switch to reading only the PCI revision ID register itself, not the whole 32
bits at its address in init_chipset() and init_hwif() methods; in addition,
get rid of the useless clearing of hwif->autodma and perform some cosmetic
style changes in the latter method.
Refactor ata66_cmd64x() by moving all the code into the 'switch' statement,
renaming/adding variables, and fixing the coding style.
While at it, finally get rid of the meaningless aliasing register #define's...

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

drivers/ide/pci/cmd64x.c

+45 −81
Original line number Original line Diff line number Diff line 
/*

/*

 * linux/drivers/ide/pci/cmd64x.c		Version 1.47	Mar 19, 2007

 * linux/drivers/ide/pci/cmd64x.c		Version 1.50	May 10, 2007

 *

 *

 * cmd64x.c: Enable interrupts at initialization time on Ultra/PCI machines.

 * cmd64x.c: Enable interrupts at initialization time on Ultra/PCI machines.

 *           Due to massive hardware bugs, UltraDMA is only supported

 *           Due to massive hardware bugs, UltraDMA is only supported
@@ -52,9 +52,6 @@ 
#define   ARTTIM23_DIS_RA2	0x04

#define   ARTTIM23_DIS_RA2	0x04

#define   ARTTIM23_DIS_RA3	0x08

#define   ARTTIM23_DIS_RA3	0x08

#define   ARTTIM23_INTR_CH1	0x10

#define   ARTTIM23_INTR_CH1	0x10

#define ARTTIM2		0x57

#define ARTTIM3		0x57

#define DRWTIM23	0x58

#define DRWTIM2		0x58

#define DRWTIM2		0x58

#define BRST		0x59

#define BRST		0x59

#define DRWTIM3		0x5b

#define DRWTIM3		0x5b
@@ -469,71 +466,43 @@ static int cmd646_1_ide_dma_end (ide_drive_t *drive) 




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

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

{

{

	u32 class_rev = 0;

	u8 mrdmode = 0;

	u8 mrdmode = 0;





	pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);

	if (dev->device == PCI_DEVICE_ID_CMD_646) {

	class_rev &= 0xff;

		u8 rev = 0;





	switch(dev->device) {

		pci_read_config_byte(dev, PCI_REVISION_ID, &rev);

		case PCI_DEVICE_ID_CMD_643:



			break;

		switch (rev) {

		case PCI_DEVICE_ID_CMD_646:

			printk(KERN_INFO "%s: chipset revision 0x%02X, ", name, class_rev);

			switch(class_rev) {

		case 0x07:

		case 0x07:

		case 0x05:

		case 0x05:

					printk("UltraDMA Capable");

			printk("%s: UltraDMA capable", name);

			break;

			break;

		case 0x03:

		case 0x03:

					printk("MultiWord DMA Force Limited");

		default:

			printk("%s: MultiWord DMA force limited", name);

			break;

			break;

		case 0x01:

		case 0x01:

				default:

			printk("%s: MultiWord DMA limited, "

					printk("MultiWord DMA Limited, IRQ workaround enabled");

			       "IRQ workaround enabled\n", name);

			break;

			break;

		}

		}

			printk("\n");

                        break;

		case PCI_DEVICE_ID_CMD_648:

		case PCI_DEVICE_ID_CMD_649:

			break;

		default:

			break;

	}

	}





	/* Set a good latency timer and cache line size value. */

	/* Set a good latency timer and cache line size value. */

	(void) pci_write_config_byte(dev, PCI_LATENCY_TIMER, 64);

	(void) pci_write_config_byte(dev, PCI_LATENCY_TIMER, 64);

	/* FIXME: pci_set_master() to ensure a good latency timer value */

	/* FIXME: pci_set_master() to ensure a good latency timer value */





	/* Setup interrupts. */

	/*

	(void) pci_read_config_byte(dev, MRDMODE, &mrdmode);

	 * Enable interrupts, select MEMORY READ LINE for reads.

	mrdmode &= ~(0x30);

	 *

	(void) pci_write_config_byte(dev, MRDMODE, mrdmode);

	 * NOTE: although not mentioned in the PCI0646U specs,



	 * bits 0-1 are write only and won't be read back as

	/* Use MEMORY READ LINE for reads.

	 * set or not -- PCI0646U2 specs clarify this point.

	 * NOTE: Although not mentioned in the PCI0646U specs,

	 *       these bits are write only and won't be read

	 *       back as set or not.  The PCI0646U2 specs clarify

	 *       this point.

	 */

	 */

	(void) pci_write_config_byte(dev, MRDMODE, mrdmode | 0x02);

	(void) pci_read_config_byte (dev, MRDMODE, &mrdmode);



	mrdmode &= ~0x30;

	/* Set reasonable active/recovery/address-setup values. */

	(void) pci_write_config_byte(dev, MRDMODE, (mrdmode | 0x02));

	(void) pci_write_config_byte(dev, ARTTIM0,  0x40);

	(void) pci_write_config_byte(dev, DRWTIM0,  0x3f);

	(void) pci_write_config_byte(dev, ARTTIM1,  0x40);

	(void) pci_write_config_byte(dev, DRWTIM1,  0x3f);

#ifdef __i386__

	(void) pci_write_config_byte(dev, ARTTIM23, 0x1c);

#else

	(void) pci_write_config_byte(dev, ARTTIM23, 0x5c);

#endif

	(void) pci_write_config_byte(dev, DRWTIM23, 0x3f);

	(void) pci_write_config_byte(dev, DRWTIM3,  0x3f);

#ifdef CONFIG_PPC

	(void) pci_write_config_byte(dev, UDIDETCR0, 0xf0);

#endif /* CONFIG_PPC */





#if defined(DISPLAY_CMD64X_TIMINGS) && defined(CONFIG_IDE_PROC_FS)

#if defined(DISPLAY_CMD64X_TIMINGS) && defined(CONFIG_IDE_PROC_FS)
@@ -550,27 +519,25 @@ static unsigned int __devinit init_chipset_cmd64x(struct pci_dev *dev, const cha 




static unsigned int __devinit ata66_cmd64x(ide_hwif_t *hwif)

static unsigned int __devinit ata66_cmd64x(ide_hwif_t *hwif)

{

{

	u8 ata66 = 0, mask = (hwif->channel) ? 0x02 : 0x01;

	struct pci_dev  *dev	= hwif->pci_dev;

	u8 bmidecsr = 0, mask	= hwif->channel ? 0x02 : 0x01;





	switch(hwif->pci_dev->device) {

	switch (dev->device) {

		case PCI_DEVICE_ID_CMD_643:

	case PCI_DEVICE_ID_CMD_648:

		case PCI_DEVICE_ID_CMD_646:

	case PCI_DEVICE_ID_CMD_649:

			return ata66;

 		pci_read_config_byte(dev, BMIDECSR, &bmidecsr);

		return (bmidecsr & mask) ? 1 : 0;

	default:

	default:

			break;

		return 0;

	}

	}

	pci_read_config_byte(hwif->pci_dev, BMIDECSR, &ata66);

	return (ata66 & mask) ? 1 : 0;

}

}





static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)

static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif)

{

{

	struct pci_dev *dev	= hwif->pci_dev;

	struct pci_dev *dev	= hwif->pci_dev;

	unsigned int class_rev;

	u8 rev			= 0;





	hwif->autodma = 0;

	pci_read_config_byte(dev, PCI_REVISION_ID, &rev);

	pci_read_config_dword(dev, PCI_CLASS_REVISION, &class_rev);

	class_rev &= 0xff;





	hwif->tuneproc  = &cmd64x_tune_drive;

	hwif->tuneproc  = &cmd64x_tune_drive;

	hwif->speedproc = &cmd64x_tune_chipset;

	hwif->speedproc = &cmd64x_tune_chipset;
@@ -581,7 +548,7 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif) 
		return;

		return;





	hwif->atapi_dma  = 1;

	hwif->atapi_dma  = 1;



	hwif->mwdma_mask = 0x07;

	hwif->ultra_mask = hwif->cds->udma_mask;

	hwif->ultra_mask = hwif->cds->udma_mask;





	/*

	/*
@@ -596,13 +563,12 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif) 
	 *

	 *

	 * So we only do UltraDMA on revision 0x05 and 0x07 chipsets.

	 * So we only do UltraDMA on revision 0x05 and 0x07 chipsets.

	 */

	 */

	if (dev->device == PCI_DEVICE_ID_CMD_646 && class_rev < 5)

	if (dev->device == PCI_DEVICE_ID_CMD_646 && rev < 5)

		hwif->ultra_mask = 0x00;

		hwif->ultra_mask = 0x00;





	hwif->mwdma_mask = 0x07;



	hwif->ide_dma_check = &cmd64x_config_drive_for_dma;

	hwif->ide_dma_check = &cmd64x_config_drive_for_dma;

	if (!(hwif->udma_four))



	if (!hwif->udma_four)

		hwif->udma_four = ata66_cmd64x(hwif);

		hwif->udma_four = ata66_cmd64x(hwif);





	switch (dev->device) {

	switch (dev->device) {
@@ -614,10 +580,10 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif) 
		break;

		break;

	case PCI_DEVICE_ID_CMD_646:

	case PCI_DEVICE_ID_CMD_646:

		hwif->chipset = ide_cmd646;

		hwif->chipset = ide_cmd646;

		if (class_rev == 0x01) {

		if (rev == 0x01) {

			hwif->ide_dma_end = &cmd646_1_ide_dma_end;

			hwif->ide_dma_end = &cmd646_1_ide_dma_end;

			break;

			break;

		} else if (class_rev >= 0x03)

		} else if (rev >= 0x03)

			goto alt_irq_bits;

			goto alt_irq_bits;

		/* fall thru */

		/* fall thru */

	default:

	default:
@@ -626,11 +592,9 @@ static void __devinit init_hwif_cmd64x(ide_hwif_t *hwif) 
		break;

		break;

	}

	}







	if (!noautodma)

	if (!noautodma)

		hwif->autodma = 1;

		hwif->autodma = 1;

	hwif->drives[0].autodma = hwif->autodma;

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

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

}

}





static int __devinit init_setup_cmd64x(struct pci_dev *dev, ide_pci_device_t *d)

static int __devinit init_setup_cmd64x(struct pci_dev *dev, ide_pci_device_t *d)