From: Alan Cox <alan@lxorguk.ukuu.org.uk>
Date: Thu, 26 Jul 2007 17:37:28 +0000 (+0100)
Subject: libata pata_amd: ACPI checks for 80wire cable
X-Git-Tag: v2.6.24-rc1~1391^2~88
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e708eb9bc0515f36d77477877e74b6b9056b5879;p=linux-2.6-omap-h63xx.git

libata pata_amd: ACPI checks for 80wire cable

We can make use of this on the pata_amd driver as many Nvidia devices
don't have reliable cable detect.

Signed-off-by: Alan Cox <alan@redhat.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>
---

diff --git a/drivers/ata/pata_amd.c b/drivers/ata/pata_amd.c
index 46f829c838b..c95922f8cc5 100644
--- a/drivers/ata/pata_amd.c
+++ b/drivers/ata/pata_amd.c
@@ -270,6 +270,9 @@ static int nv_cable_detect(struct ata_port *ap)
  	pci_read_config_word(pdev, 0x62 - 2 * ap->port_no, &udma);
  	if ((udma & 0xC4) == 0xC4 || (udma & 0xC400) == 0xC400)
 		cbl = ATA_CBL_PATA80;
+	/* And a triple check across suspend/resume with ACPI around */
+	if (ata_acpi_cbl_80wire(ap))
+		cbl = ATA_CBL_PATA80;
 	return cbl;
 }