diff options
author | Tejun Heo <htejun@gmail.com> | 2006-04-02 11:09:41 -0400 |
---|---|---|
committer | Jeff Garzik <jeff@garzik.org> | 2006-04-02 11:37:57 -0400 |
commit | 6d5f9732a16a74d75f8cdba5b00557662e83f466 (patch) | |
tree | dd29e5a0ea5eb1ca9ee51b62606036b0f9846e3a | |
parent | 1ad8e7f9eb051b040880e45337ed74bfd916ef7f (diff) |
[PATCH] libata: print SControl in SATA link status info message
Now that libata mangles with SControl, it's helpful to print out
SControl in link status message. Add it.
Signed-off-by: Jeff Garzik <jeff@garzik.org>
-rw-r--r-- | drivers/scsi/libata-core.c | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c index 8beba3cd9a56..966be3034bf0 100644 --- a/drivers/scsi/libata-core.c +++ b/drivers/scsi/libata-core.c | |||
@@ -1503,20 +1503,23 @@ void ata_port_probe(struct ata_port *ap) | |||
1503 | */ | 1503 | */ |
1504 | static void sata_print_link_status(struct ata_port *ap) | 1504 | static void sata_print_link_status(struct ata_port *ap) |
1505 | { | 1505 | { |
1506 | u32 sstatus, tmp; | 1506 | u32 sstatus, scontrol, tmp; |
1507 | 1507 | ||
1508 | if (!ap->ops->scr_read) | 1508 | if (!ap->ops->scr_read) |
1509 | return; | 1509 | return; |
1510 | 1510 | ||
1511 | sstatus = scr_read(ap, SCR_STATUS); | 1511 | sstatus = scr_read(ap, SCR_STATUS); |
1512 | scontrol = scr_read(ap, SCR_CONTROL); | ||
1512 | 1513 | ||
1513 | if (sata_dev_present(ap)) { | 1514 | if (sata_dev_present(ap)) { |
1514 | tmp = (sstatus >> 4) & 0xf; | 1515 | tmp = (sstatus >> 4) & 0xf; |
1515 | printk(KERN_INFO "ata%u: SATA link up %s (SStatus %X)\n", | 1516 | printk(KERN_INFO |
1516 | ap->id, sata_spd_string(tmp), sstatus); | 1517 | "ata%u: SATA link up %s (SStatus %X SControl %X)\n", |
1518 | ap->id, sata_spd_string(tmp), sstatus, scontrol); | ||
1517 | } else { | 1519 | } else { |
1518 | printk(KERN_INFO "ata%u: SATA link down (SStatus %X)\n", | 1520 | printk(KERN_INFO |
1519 | ap->id, sstatus); | 1521 | "ata%u: SATA link down (SStatus %X SControl %X)\n", |
1522 | ap->id, sstatus, scontrol); | ||
1520 | } | 1523 | } |
1521 | } | 1524 | } |
1522 | 1525 | ||