From 7a4f7685fcb665d60d2178865c4dab5d612ba6cc Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Sun, 2 Apr 2006 11:38:12 -0400 Subject: [PATCH] --- yaml --- r: 29417 b: refs/heads/master c: a808be8a12d61cdacba350fdce2e448045be8202 h: refs/heads/master i: 29415: 3b05adda2caea4a9fd7681475e432f25cbdf52b2 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/libata-core.c | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 34fe4d83923f..6a5918ff5017 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c13b56a1130bbfacfb588de100e5a248383805a6 +refs/heads/master: a808be8a12d61cdacba350fdce2e448045be8202 diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c index fc3e57f84268..56537293ad41 100644 --- a/trunk/drivers/scsi/libata-core.c +++ b/trunk/drivers/scsi/libata-core.c @@ -1517,20 +1517,23 @@ void ata_port_probe(struct ata_port *ap) */ static void sata_print_link_status(struct ata_port *ap) { - u32 sstatus, tmp; + u32 sstatus, scontrol, tmp; if (!ap->ops->scr_read) return; sstatus = scr_read(ap, SCR_STATUS); + scontrol = scr_read(ap, SCR_CONTROL); if (sata_dev_present(ap)) { tmp = (sstatus >> 4) & 0xf; - printk(KERN_INFO "ata%u: SATA link up %s (SStatus %X)\n", - ap->id, sata_spd_string(tmp), sstatus); + printk(KERN_INFO + "ata%u: SATA link up %s (SStatus %X SControl %X)\n", + ap->id, sata_spd_string(tmp), sstatus, scontrol); } else { - printk(KERN_INFO "ata%u: SATA link down (SStatus %X)\n", - ap->id, sstatus); + printk(KERN_INFO + "ata%u: SATA link down (SStatus %X SControl %X)\n", + ap->id, sstatus, scontrol); } }