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 <rob.herring@calxeda.com> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
650e2daa9f
commit
a3f74d928c
|
@ -385,14 +385,21 @@ static int ahci_init_port(struct ahci_port *ahci_port)
|
|||
ahci_port_info(ahci_port, "Spinning up device...\n");
|
||||
|
||||
ret = wait_on_timeout(WAIT_SPINUP,
|
||||
(readl(port_mmio + PORT_TFDATA) &
|
||||
(ATA_STATUS_BUSY | ATA_STATUS_DRQ)) == 0);
|
||||
((readl(port_mmio + PORT_TFDATA) &
|
||||
(ATA_STATUS_BUSY | ATA_STATUS_DRQ)) == 0)
|
||||
|| !((readl(port_mmio + PORT_SCR_STAT) & 0xf) == 1));
|
||||
if (ret) {
|
||||
ahci_port_info(ahci_port, "timeout.\n");
|
||||
ret = -ENODEV;
|
||||
goto err_init;
|
||||
}
|
||||
|
||||
if ((readl(port_mmio + PORT_SCR_STAT) & 0xf) == 1) {
|
||||
ahci_port_info(ahci_port, "down.\n");
|
||||
ret = -ENODEV;
|
||||
goto err_init;
|
||||
}
|
||||
|
||||
ahci_port_info(ahci_port, "ok.\n");
|
||||
|
||||
val = ahci_port_read(ahci_port, PORT_SCR_ERR);
|
||||
|
|
Loading…
Reference in New Issue