Attachment #13400 for bug #9261





static unsigned long hpt370a_filter(struct ata_device *adev, unsigned long mask)
{
	if (adev->class == ATA_DEV_ATA) {
		if (hpt_dma_blacklisted(adev, "UDMA100", bad_ata100_5))
			mask &= ~ (0x1F << ATA_SHIFT_UDMA);
	}

		{ 0x50, 1, 0x04, 0x04 },
		{ 0x54, 1, 0x04, 0x04 }
	};
	u16 mcr3;
	u8 ata66;
	struct ata_port *ap = link->ap;
	struct pci_dev *pdev = to_pci_dev(ap->host->dev);
	unsigned int mcrbase = 0x50 + 4 * ap->port_no;

	if (!pci_test_config_bits(pdev, &hpt37x_enable_bits[ap->port_no]))
		return -ENOENT;

	/* Do the extra channel work */
	pci_read_config_word(pdev, mcrbase + 2, &mcr3);
	pci_read_config_word(pdev, 0x56, &mcr6);
	/* Set bit 15 of 0x52 to enable TCBLID as input
	   Set bit 15 of 0x56 to enable FCBLID as input
	 */
	pci_write_config_word(pdev, mcrbase + 2, mcr3 | 0x8000);
	pci_write_config_word(pdev, 0x56, mcr6 | 0x8000);
	pci_read_config_byte(pdev, 0x5A, &ata66);
	/* Reset TCBLID/FCBLID to output */
	pci_write_config_word(pdev, 0x52, mcr3);
	pci_write_config_word(pdev, 0x56, mcr6);

	if (ata66 & (2 >> ap->port_no))
		ap->cbl = ATA_CBL_PATA40;
	else
		ap->cbl = ATA_CBL_PATA80;

	/* Never went stable */
	return 0;
}

static u32 hpt374_read_freq(struct pci_dev *pdev)
{
	u32 freq;
	unsigned long io_base = pci_resource_start(pdev, 4);
	if (PCI_FUNC(pdev->devfn) & 1) {
		struct pci_dev *pdev_0 = pci_get_slot(pdev->bus, pdev->devfn - 1);
		io_base = pci_resource_start(pdev_0, 4);
		freq = inl(io_base + 0x90);
		pci_dev_put(pdev_0);
	}
	else
		freq = inl(io_base + 0x90);
	return freq;
}

/**
 *	hpt37x_init_one		-	Initialise an HPT37X/302
 *	@dev: PCI device

		.flags = ATA_FLAG_SLAVE_POSS,
		.pio_mask = 0x1f,
		.mwdma_mask = 0x07,
		.udma_mask = ATA_UDMA5,
		.port_ops = &hpt370_port_ops
	};
	/* HPT370A - UDMA100 */

		.flags = ATA_FLAG_SLAVE_POSS,
		.pio_mask = 0x1f,
		.mwdma_mask = 0x07,
		.udma_mask = ATA_UDMA5,
		.port_ops = &hpt370a_port_ops
	};
	/* HPT371, 372 and friends - UDMA133 */

		outb(0x0e, iobase + 0x9c);

	/* Some devices do not let this value be accessed via PCI space
	   according to the old driver. In addition we must use the value
	   from FN 0 on the HPT374 */

	if (chip_table == &hpt374)
		freq = hpt374_read_freq(dev);
	else
		freq = inl(iobase + 0x90);

	freq = inl(iobase + 0x90);
	if ((freq >> 12) != 0xABCDE) {
		int i;
		u8 sr;

Return to bug 9261

Lines 295-301 Link Here

(-)linux.vanilla-2.6.24-rc1/drivers/ata/pata_hpt37x.c (-13 / +31 lines)
295		295
296	static unsigned long hpt370a_filter(struct ata_device *adev, unsigned long mask)	296	static unsigned long hpt370a_filter(struct ata_device *adev, unsigned long mask)
297	{	297	{
298	if (adev->class != ATA_DEV_ATA) {	298	if (adev->class == ATA_DEV_ATA) {
299	if (hpt_dma_blacklisted(adev, "UDMA100", bad_ata100_5))	299	if (hpt_dma_blacklisted(adev, "UDMA100", bad_ata100_5))
300	mask &= ~ (0x1F << ATA_SHIFT_UDMA);	300	mask &= ~ (0x1F << ATA_SHIFT_UDMA);
301	}	301	}
Lines 359-386 Link Here
359	{ 0x50, 1, 0x04, 0x04 },	359	{ 0x50, 1, 0x04, 0x04 },
360	{ 0x54, 1, 0x04, 0x04 }	360	{ 0x54, 1, 0x04, 0x04 }
361	};	361	};
362	u16 mcr3, mcr6;	362	u16 mcr3;
363	u8 ata66;	363	u8 ata66;
364	struct ata_port *ap = link->ap;	364	struct ata_port *ap = link->ap;
365	struct pci_dev *pdev = to_pci_dev(ap->host->dev);	365	struct pci_dev *pdev = to_pci_dev(ap->host->dev);
		366	unsigned int mcrbase = 0x50 + 4 * ap->port_no;
366		367
367	if (!pci_test_config_bits(pdev, &hpt37x_enable_bits[ap->port_no]))	368	if (!pci_test_config_bits(pdev, &hpt37x_enable_bits[ap->port_no]))
368	return -ENOENT;	369	return -ENOENT;
369		370
370	/* Do the extra channel work */	371	/* Do the extra channel work */
371	pci_read_config_word(pdev, 0x52, &mcr3);	372	pci_read_config_word(pdev, mcrbase + 2, &mcr3);
372	pci_read_config_word(pdev, 0x56, &mcr6);
373	/* Set bit 15 of 0x52 to enable TCBLID as input	373	/* Set bit 15 of 0x52 to enable TCBLID as input
374	Set bit 15 of 0x56 to enable FCBLID as input
375	*/	374	*/
376	pci_write_config_word(pdev, 0x52, mcr3 \| 0x8000);	375	pci_write_config_word(pdev, mcrbase + 2, mcr3 \| 0x8000);
377	pci_write_config_word(pdev, 0x56, mcr6 \| 0x8000);
378	pci_read_config_byte(pdev, 0x5A, &ata66);	376	pci_read_config_byte(pdev, 0x5A, &ata66);
379	/* Reset TCBLID/FCBLID to output */	377	/* Reset TCBLID/FCBLID to output */
380	pci_write_config_word(pdev, 0x52, mcr3);	378	pci_write_config_word(pdev, 0x52, mcr3);
381	pci_write_config_word(pdev, 0x56, mcr6);
382		379
383	if (ata66 & (1 << ap->port_no))	380	if (ata66 & (2 >> ap->port_no))
384	ap->cbl = ATA_CBL_PATA40;	381	ap->cbl = ATA_CBL_PATA40;
385	else	382	else
386	ap->cbl = ATA_CBL_PATA80;	383	ap->cbl = ATA_CBL_PATA80;
Lines 844-849 Link Here
844	/* Never went stable */	841	/* Never went stable */
845	return 0;	842	return 0;
846	}	843	}
		844
		845	static u32 hpt374_read_freq(struct pci_dev *pdev)
		846	{
		847	u32 freq;
		848	unsigned long io_base = pci_resource_start(pdev, 4);
		849	if (PCI_FUNC(pdev->devfn) & 1) {
		850	struct pci_dev *pdev_0 = pci_get_slot(pdev->bus, pdev->devfn - 1);
		851	io_base = pci_resource_start(pdev_0, 4);
		852	freq = inl(io_base + 0x90);
		853	pci_dev_put(pdev_0);
		854	}
		855	else
		856	freq = inl(io_base + 0x90);
		857	return freq;
		858	}
		859
847	/**	860	/**
848	* hpt37x_init_one - Initialise an HPT37X/302	861	* hpt37x_init_one - Initialise an HPT37X/302
849	* @dev: PCI device	862	* @dev: PCI device
Lines 902-908 Link Here
902	.flags = ATA_FLAG_SLAVE_POSS,	915	.flags = ATA_FLAG_SLAVE_POSS,
903	.pio_mask = 0x1f,	916	.pio_mask = 0x1f,
904	.mwdma_mask = 0x07,	917	.mwdma_mask = 0x07,
905	.udma_mask = 0x0f,	918	.udma_mask = ATA_UDMA5,
906	.port_ops = &hpt370_port_ops	919	.port_ops = &hpt370_port_ops
907	};	920	};
908	/* HPT370A - UDMA100 */	921	/* HPT370A - UDMA100 */
Lines 911-917 Link Here
911	.flags = ATA_FLAG_SLAVE_POSS,	924	.flags = ATA_FLAG_SLAVE_POSS,
912	.pio_mask = 0x1f,	925	.pio_mask = 0x1f,
913	.mwdma_mask = 0x07,	926	.mwdma_mask = 0x07,
914	.udma_mask = 0x0f,	927	.udma_mask = ATA_UDMA5,
915	.port_ops = &hpt370a_port_ops	928	.port_ops = &hpt370a_port_ops
916	};	929	};
917	/* HPT371, 372 and friends - UDMA133 */	930	/* HPT371, 372 and friends - UDMA133 */
Lines 1047-1055 Link Here
1047	outb(0x0e, iobase + 0x9c);	1060	outb(0x0e, iobase + 0x9c);
1048		1061
1049	/* Some devices do not let this value be accessed via PCI space	1062	/* Some devices do not let this value be accessed via PCI space
1050	according to the old driver */	1063	according to the old driver. In addition we must use the value
		1064	from FN 0 on the HPT374 */
		1065
		1066	if (chip_table == &hpt374)
		1067	freq = hpt374_read_freq(dev);
		1068	else
		1069	freq = inl(iobase + 0x90);
1051		1070
1052	freq = inl(iobase + 0x90);
1053	if ((freq >> 12) != 0xABCDE) {	1071	if ((freq >> 12) != 0xABCDE) {
1054	int i;	1072	int i;
1055	u8 sr;	1073	u8 sr;