diff mbox

[U-Boot,1/5] ahci: introduce ahci_reset()

Message ID 1418652179-15311-2-git-send-email-lifshitz@compulab.co.il
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Dmitry Lifshitz Dec. 15, 2014, 2:02 p.m. UTC 
Extract controller reset code from ahci_host_init() into separate
ahci_reset().

Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il>
---
 drivers/block/ahci.c |   47 ++++++++++++++++++++++++++++++-----------------
 include/ahci.h       |    1 +
 2 files changed, 31 insertions(+), 17 deletions(-)

Comments

Tom Rini Dec. 15, 2014, 5 p.m. UTC | #1 
On Mon, Dec 15, 2014 at 04:02:55PM +0200, Dmitry Lifshitz wrote:

> Extract controller reset code from ahci_host_init() into separate
> ahci_reset().
> 
> Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il>

Reviewed-by: Tom Rini <trini@ti.com>
Tom Rini Jan. 7, 2015, 3:12 p.m. UTC | #2 
On Mon, Dec 15, 2014 at 04:02:55PM +0200, Dmitry Lifshitz wrote:

> Extract controller reset code from ahci_host_init() into separate
> ahci_reset().
> 
> Signed-off-by: Dmitry Lifshitz <lifshitz@compulab.co.il>
> Reviewed-by: Tom Rini <trini@ti.com>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/drivers/block/ahci.c b/drivers/block/ahci.c
index c9a3beb..12ed5e3 100644
--- a/drivers/block/ahci.c
+++ b/drivers/block/ahci.c
@@ -137,6 +137,33 @@  static void sunxi_dma_init(volatile u8 *port_mmio)
 }
 #endif
 
+int ahci_reset(u32 base)
+{
+	int i = 1000;
+	u32 host_ctl_reg = base + HOST_CTL;
+	u32 tmp = readl(host_ctl_reg); /* global controller reset */
+
+	if ((tmp & HOST_RESET) == 0)
+		writel_with_flush(tmp | HOST_RESET, host_ctl_reg);
+
+	/*
+	 * reset must complete within 1 second, or
+	 * the hardware should be considered fried.
+	 */
+	do {
+		udelay(1000);
+		tmp = readl(host_ctl_reg);
+		i--;
+	} while ((i > 0) && (tmp & HOST_RESET));
+
+	if (i == 0) {
+		printf("controller reset failed (0x%x)\n", tmp);
+		return -1;
+	}
+
+	return 0;
+}
+
 static int ahci_host_init(struct ahci_probe_ent *probe_ent)
 {
 #ifndef CONFIG_SCSI_AHCI_PLAT
@@ -156,23 +183,9 @@  static int ahci_host_init(struct ahci_probe_ent *probe_ent)
 	cap_save &= ((1 << 28) | (1 << 17));
 	cap_save |= (1 << 27);  /* Staggered Spin-up. Not needed. */
 
-	/* global controller reset */
-	tmp = readl(mmio + HOST_CTL);
-	if ((tmp & HOST_RESET) == 0)
-		writel_with_flush(tmp | HOST_RESET, mmio + HOST_CTL);
-
-	/* reset must complete within 1 second, or
-	 * the hardware should be considered fried.
-	 */
-	i = 1000;
-	do {
-		udelay(1000);
-		tmp = readl(mmio + HOST_CTL);
-		if (!i--) {
-			debug("controller reset failed (0x%x)\n", tmp);
-			return -1;
-		}
-	} while (tmp & HOST_RESET);
+	ret = ahci_reset(probe_ent->mmio_base);
+	if (ret)
+		return ret;
 
 	writel_with_flush(HOST_AHCI_EN, mmio + HOST_CTL);
 	writel(cap_save, mmio + HOST_CAP);
diff --git a/include/ahci.h b/include/ahci.h
index 35b8a8c..e8dee53 100644
--- a/include/ahci.h
+++ b/include/ahci.h
@@ -161,5 +161,6 @@  struct ahci_probe_ent {
 };
 
 int ahci_init(u32 base);
+int ahci_reset(u32 base);
 
 #endif