mvsata: issue hard reset on initialization

Before the actual initialization do a hard reset of the SATA port and the
connected device.

changes v1->v2:
 - add comment for udelay

Signed-off-by: Michael Walle <michael@walle.cc>
Cc: Prafulla Wadaskar <prafulla@marvell.com>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>

diff --git a/drivers/block/mvsata_ide.c b/drivers/block/mvsata_ide.c
index e0e40975937f3b972c62e8fe14e00022992c939f..1be395fb45baf5d85e44fb434e574fde4c931e31 100644 (file)
--- a/drivers/block/mvsata_ide.c
+++ b/drivers/block/mvsata_ide.c
@@ -33,7 +33,9 @@
 
 /* SATA port registers */
 struct mvsata_port_registers {
-       u32 reserved1[192];
+       u32 reserved0[10];
+       u32 edma_cmd;
+       u32 reserved1[181];
        /* offset 0x300 : ATA Interface registers */
        u32 sstatus;
        u32 serror;
@@ -76,6 +78,7 @@ struct mvsata_port_registers {
  * and for SStatus DETection.
  */
 
+#define MVSATA_EDMA_CMD_ATA_RST                0x00000004
 #define MVSATA_SCONTROL_DET_MASK               0x0000000F
 #define MVSATA_SCONTROL_DET_NONE               0x00000000
 #define MVSATA_SCONTROL_DET_INIT               0x00000001
@@ -115,6 +118,11 @@ static int mvsata_ide_initialize_port(struct mvsata_port_registers *port)
        u32 status;
        u32 timeleft = 10000; /* wait at most 10 ms for SATA reset to complete */
 
+       /* Hard reset */
+       writel(MVSATA_EDMA_CMD_ATA_RST, &port->edma_cmd);
+       udelay(25); /* taken from original marvell port */
+       writel(0, &port->edma_cmd);
+
        /* Set control IPM to 3 (no low power) and DET to 1 (initialize) */
        control = readl(&port->scontrol);
        control = (control & ~MVSATA_SCONTROL_MASK) | MVSATA_PORT_INIT;