Patchwork [U-Boot,v2] mvsata: issue hard reset on initialization

login
register
mail settings
Submitter Michael Walle
Date May 11, 2011, 10:22 p.m.
Message ID <1305152566-6797-1-git-send-email-michael@walle.cc>
Download mbox | patch
Permalink /patch/95194/
State Accepted
Commit 70c55f5ab324d43093f1c8745462d92042b7306d
Delegated to: Albert ARIBAUD
Headers show

Comments

Michael Walle - May 11, 2011, 10:22 p.m.
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>
---
 drivers/block/mvsata_ide.c |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)
Michael Walle - May 19, 2011, 7:42 p.m.
Am Donnerstag 12 Mai 2011, 00:22:46 schrieb Michael Walle:
> Before the actual initialization do a hard reset of the SATA port and the
> connected device.
> 
> changes v1->v2:
>  - add comment for udelay


ping? :)
Albert ARIBAUD - May 23, 2011, 6:57 a.m.
Le 19/05/2011 21:42, Michael Walle a écrit :
> Am Donnerstag 12 Mai 2011, 00:22:46 schrieb Michael Walle:
>> Before the actual initialization do a hard reset of the SATA port and the
>> connected device.
>>
>> changes v1->v2:
>>   - add comment for udelay
>
>
> ping? :)

Apologies. Applied to u-boot-arm, thanks.

Amicalement,

Patch

diff --git a/drivers/block/mvsata_ide.c b/drivers/block/mvsata_ide.c
index 3d6993a..83574ed 100644
--- 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;