From: Randy Dunlap <randy_d_dunlap@linux.intel.com>

Add some extra debug-only output.

Signed-off-by: Randy Dunlap <randy_d_dunlap@linux.intel.com>
---
 drivers/scsi/ata_acpi.c    |   17 ++++++++++++-----
 drivers/scsi/libata-core.c |    6 +++---
 2 files changed, 15 insertions(+), 8 deletions(-)

--- linux-2615-rc5g3.orig/drivers/scsi/ata_acpi.c
+++ linux-2615-rc5g3/drivers/scsi/ata_acpi.c
@@ -183,9 +183,10 @@ static int get_sata_adr(struct device *d
 	winfo->drivenum = drive;
 
 	status = acpi_get_devices(NULL, get_devices, winfo, NULL);
-	if (ACPI_FAILURE(status))
+	if (ACPI_FAILURE(status)) {
+		DEBPRINT("acpi_get_devices failed\n");
 		err = -ENODEV;
-	else {
+	} else {
 		*dev_adr = winfo->sata_adr;
 		atadev->obj_handle = winfo->obj_handle;
 		err = 0;
@@ -219,19 +220,25 @@ int do_drive_SDD(struct ata_port *ap, un
 		__FUNCTION__, ap->id, ix, ap->port_no, ap->hard_port_no);
 
 	/* Don't continue if not a SATA device. */
-	if (!ata_id_is_sata(atadev->id))
+	if (!ata_id_is_sata(atadev->id)) {
+		DEBPRINT("ata_id_is_sata is False\n");
 		goto out;
+	}
 
 	/* Don't continue if device has no _ADR method.
 	 * _SDD is intended for known motherboard devices. */
 	err = pci_acpi_get_dev_handle(dev, &handle, &pcidevfn);
-	if (err < 0)
+	if (err < 0) {
+		DEBPRINT("get_dev_handle failed\n");
 		goto out;
+	}
 	/* Get this drive's _ADR info. */
 	dev_adr = SATA_ADR_RSVD;
 	err = get_sata_adr(dev, handle, pcidevfn, ix, ap, atadev, &dev_adr);
-	if (err < 0 || dev_adr == SATA_ADR_RSVD || !atadev->obj_handle)
+	if (err < 0 || dev_adr == SATA_ADR_RSVD || !atadev->obj_handle) {
+		DEBPRINT("get_sata_adr failed\n");
 		goto out;
+	}
 
 	/* Give the drive Identify data to the drive via the _SDD method */
 	/* _SDD: set up input parameters */
--- linux-2615-rc5g3.orig/drivers/scsi/libata-core.c
+++ linux-2615-rc5g3/drivers/scsi/libata-core.c
@@ -1185,11 +1185,11 @@ retry:
 
 	/* print device capabilities */
 	printk(KERN_DEBUG "ata%u: dev %u cfg "
-	       "49:%04x 82:%04x 83:%04x 84:%04x 85:%04x 86:%04x 87:%04x 88:%04x\n",
-	       ap->id, device, dev->id[49],
+	       "00:%04x 49:%04x 82:%04x 83:%04x 84:%04x 85:%04x 86:%04x 87:%04x 88:%04x 93:%04x\n",
+	       ap->id, device, dev->id[0], dev->id[49],
 	       dev->id[82], dev->id[83], dev->id[84],
 	       dev->id[85], dev->id[86], dev->id[87],
-	       dev->id[88]);
+	       dev->id[88], dev->id[93]);
 
 	/*
 	 * common ATA, ATAPI feature tests