LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ahci: move link bring-up handling to separate function 

Move the link bring-up handling to a separate weak function in order to
allow platforms to override it. This is needed on highbank platform which
needs special phy handling.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
This commit is contained in:
Rob Herring 2013-08-24 10:10:51 -05:00 committed by Tom Rini
parent 2bdb10dbf5
commit 124e9fa132
1 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/block/ahci.c
View File

@ -107,6 +107,27 @@ static int waiting_for_cmd_completed(volatile u8 *offset,
return (i < timeout_msec) ? 0 : -1; return (i < timeout_msec) ? 0 : -1;
} }
int __weak ahci_link_up(struct ahci_probe_ent *probe_ent, u8 port)
{
u32 tmp;
int j = 0;
u8 *port_mmio = (u8 *)probe_ent->port[port].port_mmio;
/*
* Bring up SATA link.
* SATA link bringup time is usually less than 1 ms; only very
* rarely has it taken between 1-2 ms. Never seen it above 2 ms.
*/
while (j < WAIT_MS_LINKUP) {
tmp = readl(port_mmio + PORT_SCR_STAT);
tmp &= PORT_SCR_STAT_DET_MASK;
if (tmp == PORT_SCR_STAT_DET_PHYRDY)
return 0;
udelay(1000);
j++;
}
return 1;
}
static int ahci_host_init(struct ahci_probe_ent *probe_ent) static int ahci_host_init(struct ahci_probe_ent *probe_ent)
{ {
@ -117,7 +138,7 @@ static int ahci_host_init(struct ahci_probe_ent *probe_ent)
#endif #endif
volatile u8 *mmio = (volatile u8 *)probe_ent->mmio_base; volatile u8 *mmio = (volatile u8 *)probe_ent->mmio_base;
u32 tmp, cap_save, cmd; u32 tmp, cap_save, cmd;
int i, j; int i, j, ret;
volatile u8 *port_mmio; volatile u8 *port_mmio;
u32 port_map; u32 port_map;
@ -200,20 +221,9 @@ static int ahci_host_init(struct ahci_probe_ent *probe_ent)
cmd |= PORT_CMD_SPIN_UP; cmd |= PORT_CMD_SPIN_UP;
writel_with_flush(cmd, port_mmio + PORT_CMD); writel_with_flush(cmd, port_mmio + PORT_CMD);
/* Bring up SATA link. /* Bring up SATA link. */
* SATA link bringup time is usually less than 1 ms; only very ret = ahci_link_up(probe_ent, i);
* rarely has it taken between 1-2 ms. Never seen it above 2 ms. if (ret) {
*/
j = 0;
while (j < WAIT_MS_LINKUP) {
tmp = readl(port_mmio + PORT_SCR_STAT);
tmp &= PORT_SCR_STAT_DET_MASK;
if (tmp == PORT_SCR_STAT_DET_PHYRDY)
break;
udelay(1000);
j++;
}
if (j == WAIT_MS_LINKUP) {
printf("SATA link %d timeout.\n", i); printf("SATA link %d timeout.\n", i);
continue; continue;
} else { } else {