From 178210847f7d8492c6aa1d39867d99538be0e7d4 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Sat, 24 Aug 2013 10:10:52 -0500 Subject: [PATCH] ahci: handle COMINIT received during spin-up Some Intel SSDs can send a COMINIT after the initial COMRESET. This causes the link to go down and we need to re-initialize the link. Signed-off-by: Rob Herring --- drivers/block/ahci.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/drivers/block/ahci.c b/drivers/block/ahci.c index 5e7d01ba61..a7044f2ea7 100644 --- a/drivers/block/ahci.c +++ b/drivers/block/ahci.c @@ -243,8 +243,20 @@ static int ahci_host_init(struct ahci_probe_ent *probe_ent) if (!(tmp & (ATA_STAT_BUSY | ATA_STAT_DRQ))) break; udelay(1000); + tmp = readl(port_mmio + PORT_SCR_STAT); + tmp &= PORT_SCR_STAT_DET_MASK; + if (tmp == PORT_SCR_STAT_DET_PHYRDY) + break; j++; } + + tmp = readl(port_mmio + PORT_SCR_STAT) & PORT_SCR_STAT_DET_MASK; + if (tmp == PORT_SCR_STAT_DET_COMINIT) { + debug("SATA link %d down (COMINIT received), retrying...\n", i); + i--; + continue; + } + printf("Target spinup took %d ms.\n", j); if (j == WAIT_MS_SPINUP) debug("timeout.\n"); -- 2.30.2