From 7c2012923cd800dd49a3effec3e4009fa456c00b Mon Sep 17 00:00:00 2001 From: Tejun Heo Date: Mon, 3 Apr 2006 00:09:41 +0900 Subject: [PATCH] --- yaml --- r: 29239 b: refs/heads/master c: 6d5f9732a16a74d75f8cdba5b00557662e83f466 h: refs/heads/master i: 29237: fabf2642d29c70f5cb374c42e0b4459f03cfa636 29235: 14be2720c8a71dfe5ba18eb4c894355770e2d0b8 29231: 0eee159ad024753b10fd4a179e2c18e08e524d05 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 44d963a3fbd9..ecdacdcec4c3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1ad8e7f9eb051b040880e45337ed74bfd916ef7f +refs/heads/master: 6d5f9732a16a74d75f8cdba5b00557662e83f466 diff --git a/trunk/drivers/scsi/libata-core.c b/trunk/drivers/scsi/libata-core.c index 8beba3cd9a56..966be3034bf0 100644 --- a/trunk/drivers/scsi/libata-core.c +++ b/trunk/drivers/scsi/libata-core.c @@ -1503,20 +1503,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); } }