2 files changed, 23 insertions, 37 deletions

diff --git a/drivers/scsi/ata_piix.c b/drivers/scsi/ata_piix.c
index 333d69dd84ef..887b2b9ee4aa 100644
--- a/drivers/scsi/ata_piix.c
+++ b/drivers/scsi/ata_piix.c
@@ -78,9 +78,7 @@ enum {
         ich5_sata               = 1,
         piix4_pata              = 2,
         ich6_sata               = 3,
-        ich6_sata_rm            = 4,
-        ich7_sata               = 5,
-        esb2_sata               = 6,
+        ich6_sata_ahci          = 4,
 
         PIIX_AHCI_DEVICE        = 6,
 };
@@ -111,11 +109,11 @@ static const struct pci_device_id piix_pci_tbl[] = {
         { 0x8086, 0x25a3, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },
         { 0x8086, 0x25b0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich5_sata },
         { 0x8086, 0x2651, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata },
-        { 0x8086, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_rm },
-        { 0x8086, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_rm },
-        { 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },
-        { 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich7_sata },
-        { 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, esb2_sata },
+        { 0x8086, 0x2652, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },
+        { 0x8086, 0x2653, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },
+        { 0x8086, 0x27c0, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },
+        { 0x8086, 0x27c4, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },
+        { 0x8086, 0x2680, PCI_ANY_ID, PCI_ANY_ID, 0, 0, ich6_sata_ahci },
 
         { }     /* terminate list */
 };
@@ -258,31 +256,7 @@ static struct ata_port_info piix_port_info[] = {
                 .port_ops       = &piix_sata_ops,
         },
 
-        /* ich6_sata_rm */
-        {
-                .sht            = &piix_sht,
-                .host_flags     = ATA_FLAG_SATA | ATA_FLAG_SRST |
-                                  PIIX_FLAG_COMBINED | PIIX_FLAG_CHECKINTR |
-                                  ATA_FLAG_SLAVE_POSS | PIIX_FLAG_AHCI,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
-                .udma_mask      = 0x7f, /* udma0-6 */
-                .port_ops       = &piix_sata_ops,
-        },
-
-        /* ich7_sata */
-        {
-                .sht            = &piix_sht,
-                .host_flags     = ATA_FLAG_SATA | ATA_FLAG_SRST |
-                                  PIIX_FLAG_COMBINED | PIIX_FLAG_CHECKINTR |
-                                  ATA_FLAG_SLAVE_POSS | PIIX_FLAG_AHCI,
-                .pio_mask       = 0x1f, /* pio0-4 */
-                .mwdma_mask     = 0x07, /* mwdma0-2 */
-                .udma_mask      = 0x7f, /* udma0-6 */
-                .port_ops       = &piix_sata_ops,
-        },
-
-        /* esb2_sata */
+        /* ich6_sata_ahci */
         {
                 .sht            = &piix_sht,
                 .host_flags     = ATA_FLAG_SATA | ATA_FLAG_SRST |
diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 665ae79e1fd6..9f27e8d0e774 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -1444,11 +1444,23 @@ void __sata_phy_reset(struct ata_port *ap)
         } while (time_before(jiffies, timeout));
 
         /* TODO: phy layer with polling, timeouts, etc. */
-        if (sata_dev_present(ap))
+        sstatus = scr_read(ap, SCR_STATUS);
+        if (sata_dev_present(ap)) {
+                const char *speed;
+                u32 tmp;
+
+                tmp = (sstatus >> 4) & 0xf;
+                if (tmp & (1 << 0))
+                        speed = "1.5";
+                else if (tmp & (1 << 1))
+                        speed = "3.0";
+                else
+                        speed = "<unknown>";
+                printk(KERN_INFO "ata%u: SATA link up %s Gbps (SStatus %X)\n",
+                       ap->id, speed, sstatus);
                 ata_port_probe(ap);
-        else {
-                sstatus = scr_read(ap, SCR_STATUS);
-                printk(KERN_INFO "ata%u: no device found (phy stat %08x)\n",
+        } else {
+                printk(KERN_INFO "ata%u: SATA link down (SStatus %X)\n",
                        ap->id, sstatus);
                 ata_port_disable(ap);
         }