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

Commit 54494f3a authored by Alan Cox's avatar Alan Cox Committed by Jeff Garzik
Browse files

pata_atiixp: propogate cable detection hack from drivers/ide to the new driver 



Signed-off-by: default avatarAlan Cox <alan@redhat.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 77280989

drivers/ata/pata_atiixp.c

+9 −2
Original line number Diff line number Diff line
@@ -36,15 +36,22 @@ enum { 
static int atiixp_pre_reset(struct ata_port *ap)

{

	struct pci_dev *pdev = to_pci_dev(ap->host->dev);

	static struct pci_bits atiixp_enable_bits[] = {

	static const struct pci_bits atiixp_enable_bits[] = {

		{ 0x48, 1, 0x01, 0x00 },

		{ 0x48, 1, 0x08, 0x00 }

	};

	u8 udma;



	if (!pci_test_config_bits(pdev, &atiixp_enable_bits[ap->port_no]))

		return -ENOENT;



	/* Hack from drivers/ide/pci. Really we want to know how to do the

	   raw detection not play follow the bios mode guess */

	pci_read_config_byte(pdev, ATIIXP_IDE_UDMA_MODE + ap->port_no, &udma);

	if ((udma & 0x07) >= 0x04 || (udma & 0x70) >= 0x40)

		ap->cbl = ATA_CBL_PATA80;

	else

		ap->cbl = ATA_CBL_PATA40;

	return ata_std_prereset(ap);

}