diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-02 17:38:12 +0200 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-02 17:38:12 +0200 |
| commit | a808be8a12d61cdacba350fdce2e448045be8202 (patch) | |
| tree | b08dda3fb0dee06724320a5b0079fbc51c09c35b /drivers/scsi | |
| parent | [libata] irq-pio: Fix merge mistake (diff) | |
| parent | [PATCH] libata: print SControl in SATA link status info message (diff) | |
| download | linux-a808be8a12d61cdacba350fdce2e448045be8202.tar.xz linux-a808be8a12d61cdacba350fdce2e448045be8202.zip | |
Merge branch 'upstream'
Diffstat (limited to 'drivers/scsi')
| -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 fc3e57f84268..56537293ad41 100644 --- a/drivers/scsi/libata-core.c +++ b/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); } } |