]> git.sur5r.net Git - u-boot/blobdiff - drivers/ata/dwc_ahsata.c
dm: core: Add a way to find an ofnode by compatible string
[u-boot] / drivers / ata / dwc_ahsata.c
index 2eb9c81957678c704020e812b463952b8e2aac23..4c5b98482fff72c746d8a33ea099b945e0b19008 100644 (file)
@@ -1,24 +1,25 @@
+// SPDX-License-Identifier: GPL-2.0+
 /*
  * Copyright (C) 2010-2011 Freescale Semiconductor, Inc.
  * Terry Lv <r65388@freescale.com>
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
-#include <libata.h>
+#include <common.h>
 #include <ahci.h>
+#include <dm.h>
+#include <dwc_ahsata.h>
 #include <fis.h>
-#include <sata.h>
-
-#include <common.h>
+#include <libata.h>
 #include <malloc.h>
-#include <linux/ctype.h>
-#include <linux/errno.h>
+#include <memalign.h>
+#include <sata.h>
 #include <asm/io.h>
-#include <linux/bitops.h>
 #include <asm/arch/clock.h>
 #include <asm/arch/sys_proto.h>
-#include "dwc_ahsata.h"
+#include <linux/bitops.h>
+#include <linux/ctype.h>
+#include <linux/errno.h>
+#include "dwc_ahsata_priv.h"
 
 struct sata_port_regs {
        u32 clb;
@@ -78,8 +79,6 @@ struct sata_host_regs {
 
 #define writel_with_flush(a, b)        do { writel(a, b); readl(b); } while (0)
 
-static int is_ready;
-
 static inline void __iomem *ahci_port_base(void __iomem *base, u32 port)
 {
        return base + 0x100 + (port * 0x80);
@@ -102,11 +101,10 @@ static int waiting_for_cmd_completed(u8 *offset,
 
 static int ahci_setup_oobr(struct ahci_uc_priv *uc_priv, int clk)
 {
-       struct sata_host_regs *host_mmio =
-               (struct sata_host_regs *)uc_priv->mmio_base;
+       struct sata_host_regs *host_mmio = uc_priv->mmio_base;
 
-       writel(SATA_HOST_OOBR_WE, &(host_mmio->oobr));
-       writel(0x02060b14, &(host_mmio->oobr));
+       writel(SATA_HOST_OOBR_WE, &host_mmio->oobr);
+       writel(0x02060b14, &host_mmio->oobr);
 
        return 0;
 }
@@ -116,20 +114,18 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv)
        u32 tmp, cap_save, num_ports;
        int i, j, timeout = 1000;
        struct sata_port_regs *port_mmio = NULL;
-       struct sata_host_regs *host_mmio =
-               (struct sata_host_regs *)uc_priv->mmio_base;
+       struct sata_host_regs *host_mmio = uc_priv->mmio_base;
        int clk = mxc_get_clock(MXC_SATA_CLK);
 
-       cap_save = readl(&(host_mmio->cap));
+       cap_save = readl(&host_mmio->cap);
        cap_save |= SATA_HOST_CAP_SSS;
 
        /* global controller reset */
-       tmp = readl(&(host_mmio->ghc));
+       tmp = readl(&host_mmio->ghc);
        if ((tmp & SATA_HOST_GHC_HR) == 0)
-               writel_with_flush(tmp | SATA_HOST_GHC_HR, &(host_mmio->ghc));
+               writel_with_flush(tmp | SATA_HOST_GHC_HR, &host_mmio->ghc);
 
-       while ((readl(&(host_mmio->ghc)) & SATA_HOST_GHC_HR)
-               && --timeout)
+       while ((readl(&host_mmio->ghc) & SATA_HOST_GHC_HR) && --timeout)
                ;
 
        if (timeout <= 0) {
@@ -138,15 +134,14 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv)
        }
 
        /* Set timer 1ms */
-       writel(clk / 1000, &(host_mmio->timer1ms));
+       writel(clk / 1000, &host_mmio->timer1ms);
 
        ahci_setup_oobr(uc_priv, 0);
 
-       writel_with_flush(SATA_HOST_GHC_AE, &(host_mmio->ghc));
-       writel(cap_save, &(host_mmio->cap));
+       writel_with_flush(SATA_HOST_GHC_AE, &host_mmio->ghc);
+       writel(cap_save, &host_mmio->cap);
        num_ports = (cap_save & SATA_HOST_CAP_NP_MASK) + 1;
-       writel_with_flush((1 << num_ports) - 1,
-                               &(host_mmio->pi));
+       writel_with_flush((1 << num_ports) - 1, &host_mmio->pi);
 
        /*
         * Determine which Ports are implemented by the DWC_ahsata,
@@ -154,8 +149,8 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv)
         * software to determine how many Ports are available and
         * which Port registers need to be initialized.
         */
-       uc_priv->cap = readl(&(host_mmio->cap));
-       uc_priv->port_map = readl(&(host_mmio->pi));
+       uc_priv->cap = readl(&host_mmio->cap);
+       uc_priv->port_map = readl(&host_mmio->pi);
 
        /* Determine how many command slots the HBA supports */
        uc_priv->n_ports = (uc_priv->cap & SATA_HOST_CAP_NP_MASK) + 1;
@@ -165,11 +160,10 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv)
 
        for (i = 0; i < uc_priv->n_ports; i++) {
                uc_priv->port[i].port_mmio = ahci_port_base(host_mmio, i);
-               port_mmio =
-                       (struct sata_port_regs *)uc_priv->port[i].port_mmio;
+               port_mmio = uc_priv->port[i].port_mmio;
 
                /* Ensure that the DWC_ahsata is in idle state */
-               tmp = readl(&(port_mmio->cmd));
+               tmp = readl(&port_mmio->cmd);
 
                /*
                 * When P#CMD.ST, P#CMD.CR, P#CMD.FRE and P#CMD.FR
@@ -184,7 +178,7 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv)
                         * 0 when read.
                         */
                        tmp &= ~SATA_PORT_CMD_ST;
-                       writel_with_flush(tmp, &(port_mmio->cmd));
+                       writel_with_flush(tmp, &port_mmio->cmd);
 
                        /*
                         * spec says 500 msecs for each bit, so
@@ -193,7 +187,7 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv)
                        mdelay(500);
 
                        timeout = 1000;
-                       while ((readl(&(port_mmio->cmd)) & SATA_PORT_CMD_CR)
+                       while ((readl(&port_mmio->cmd) & SATA_PORT_CMD_CR)
                                && --timeout)
                                ;
 
@@ -204,12 +198,12 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv)
                }
 
                /* Spin-up device */
-               tmp = readl(&(port_mmio->cmd));
-               writel((tmp | SATA_PORT_CMD_SUD), &(port_mmio->cmd));
+               tmp = readl(&port_mmio->cmd);
+               writel((tmp | SATA_PORT_CMD_SUD), &port_mmio->cmd);
 
                /* Wait for spin-up to finish */
                timeout = 1000;
-               while (!(readl(&(port_mmio->cmd)) | SATA_PORT_CMD_SUD)
+               while (!(readl(&port_mmio->cmd) | SATA_PORT_CMD_SUD)
                        && --timeout)
                        ;
                if (timeout <= 0) {
@@ -219,7 +213,7 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv)
 
                for (j = 0; j < 100; ++j) {
                        mdelay(10);
-                       tmp = readl(&(port_mmio->ssts));
+                       tmp = readl(&port_mmio->ssts);
                        if (((tmp & SATA_PORT_SSTS_DET_MASK) == 0x3) ||
                                ((tmp & SATA_PORT_SSTS_DET_MASK) == 0x1))
                                break;
@@ -227,7 +221,7 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv)
 
                /* Wait for COMINIT bit 26 (DIAG_X) in SERR */
                timeout = 1000;
-               while (!(readl(&(port_mmio->serr)) | SATA_PORT_SERR_DIAG_X)
+               while (!(readl(&port_mmio->serr) | SATA_PORT_SERR_DIAG_X)
                        && --timeout)
                        ;
                if (timeout <= 0) {
@@ -240,33 +234,33 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv)
                 * register, by writing ones to each implemented\
                 * bit location.
                 */
-               tmp = readl(&(port_mmio->serr));
+               tmp = readl(&port_mmio->serr);
                debug("P#SERR 0x%x\n",
                                tmp);
-               writel(tmp, &(port_mmio->serr));
+               writel(tmp, &port_mmio->serr);
 
                /* Ack any pending irq events for this port */
-               tmp = readl(&(host_mmio->is));
+               tmp = readl(&host_mmio->is);
                debug("IS 0x%x\n", tmp);
                if (tmp)
-                       writel(tmp, &(host_mmio->is));
+                       writel(tmp, &host_mmio->is);
 
-               writel(1 << i, &(host_mmio->is));
+               writel(1 << i, &host_mmio->is);
 
                /* set irq mask (enables interrupts) */
-               writel(DEF_PORT_IRQ, &(port_mmio->ie));
+               writel(DEF_PORT_IRQ, &port_mmio->ie);
 
                /* register linkup ports */
-               tmp = readl(&(port_mmio->ssts));
+               tmp = readl(&port_mmio->ssts);
                debug("Port %d status: 0x%x\n", i, tmp);
                if ((tmp & SATA_PORT_SSTS_DET_MASK) == 0x03)
                        uc_priv->link_port_map |= (0x01 << i);
        }
 
-       tmp = readl(&(host_mmio->ghc));
+       tmp = readl(&host_mmio->ghc);
        debug("GHC 0x%x\n", tmp);
-       writel(tmp | SATA_HOST_GHC_IE, &(host_mmio->ghc));
-       tmp = readl(&(host_mmio->ghc));
+       writel(tmp | SATA_HOST_GHC_IE, &host_mmio->ghc);
+       tmp = readl(&host_mmio->ghc);
        debug("GHC 0x%x\n", tmp);
 
        return 0;
@@ -274,13 +268,12 @@ static int ahci_host_init(struct ahci_uc_priv *uc_priv)
 
 static void ahci_print_info(struct ahci_uc_priv *uc_priv)
 {
-       struct sata_host_regs *host_mmio =
-               (struct sata_host_regs *)uc_priv->mmio_base;
+       struct sata_host_regs *host_mmio = uc_priv->mmio_base;
        u32 vers, cap, impl, speed;
        const char *speed_s;
        const char *scc_s;
 
-       vers = readl(&(host_mmio->vs));
+       vers = readl(&host_mmio->vs);
        cap = uc_priv->cap;
        impl = uc_priv->port_map;
 
@@ -325,43 +318,10 @@ static void ahci_print_info(struct ahci_uc_priv *uc_priv)
                cap & (1 << 13) ? "part " : "");
 }
 
-static int ahci_init_one(int pdev)
-{
-       int rc;
-       struct ahci_uc_priv *uc_priv = NULL;
-
-       uc_priv = malloc(sizeof(struct ahci_uc_priv));
-       memset(uc_priv, 0, sizeof(struct ahci_uc_priv));
-       uc_priv->dev = pdev;
-
-       uc_priv->host_flags = ATA_FLAG_SATA
-                               | ATA_FLAG_NO_LEGACY
-                               | ATA_FLAG_MMIO
-                               | ATA_FLAG_PIO_DMA
-                               | ATA_FLAG_NO_ATAPI;
-
-       uc_priv->mmio_base = (void __iomem *)CONFIG_DWC_AHSATA_BASE_ADDR;
-
-       /* initialize adapter */
-       rc = ahci_host_init(uc_priv);
-       if (rc)
-               goto err_out;
-
-       ahci_print_info(uc_priv);
-
-       /* Save the uc_private struct to block device struct */
-       sata_dev_desc[pdev].priv = (void *)uc_priv;
-
-       return 0;
-
-err_out:
-       return rc;
-}
-
 static int ahci_fill_sg(struct ahci_uc_priv *uc_priv, u8 port,
                        unsigned char *buf, int buf_len)
 {
-       struct ahci_ioports *pp = &(uc_priv->port[port]);
+       struct ahci_ioports *pp = &uc_priv->port[port];
        struct ahci_sg *ahci_sg = pp->cmd_tbl_sg;
        u32 sg_count, max_bytes;
        int i;
@@ -409,13 +369,12 @@ static int ahci_exec_ata_cmd(struct ahci_uc_priv *uc_priv, u8 port,
                             struct sata_fis_h2d *cfis, u8 *buf, u32 buf_len,
                             s32 is_write)
 {
-       struct ahci_ioports *pp = &(uc_priv->port[port]);
-       struct sata_port_regs *port_mmio =
-                       (struct sata_port_regs *)pp->port_mmio;
+       struct ahci_ioports *pp = &uc_priv->port[port];
+       struct sata_port_regs *port_mmio = pp->port_mmio;
        u32 opts;
        int sg_count = 0, cmd_slot = 0;
 
-       cmd_slot = AHCI_GET_CMD_SLOT(readl(&(port_mmio->ci)));
+       cmd_slot = AHCI_GET_CMD_SLOT(readl(&port_mmio->ci));
        if (32 == cmd_slot) {
                printf("Can't find empty command slot!\n");
                return 0;
@@ -439,10 +398,10 @@ static int ahci_exec_ata_cmd(struct ahci_uc_priv *uc_priv, u8 port,
        ahci_fill_cmd_slot(pp, cmd_slot, opts);
 
        flush_cache((int)(pp->cmd_slot), AHCI_PORT_PRIV_DMA_SZ);
-       writel_with_flush(1 << cmd_slot, &(port_mmio->ci));
+       writel_with_flush(1 << cmd_slot, &port_mmio->ci);
 
-       if (waiting_for_cmd_completed((u8 *)&(port_mmio->ci),
-                               10000, 0x1 << cmd_slot)) {
+       if (waiting_for_cmd_completed((u8 *)&port_mmio->ci, 10000,
+                                     0x1 << cmd_slot)) {
                printf("timeout exit!\n");
                return -1;
        }
@@ -456,10 +415,8 @@ static int ahci_exec_ata_cmd(struct ahci_uc_priv *uc_priv, u8 port,
        return buf_len;
 }
 
-static void ahci_set_feature(u8 dev, u8 port)
+static void ahci_set_feature(struct ahci_uc_priv *uc_priv, u8 port)
 {
-       struct ahci_uc_priv *uc_priv =
-               (struct ahci_uc_priv *)sata_dev_desc[dev].priv;
        struct sata_fis_h2d h2d __aligned(ARCH_DMA_MINALIGN);
        struct sata_fis_h2d *cfis = &h2d;
 
@@ -475,15 +432,14 @@ static void ahci_set_feature(u8 dev, u8 port)
 
 static int ahci_port_start(struct ahci_uc_priv *uc_priv, u8 port)
 {
-       struct ahci_ioports *pp = &(uc_priv->port[port]);
-       struct sata_port_regs *port_mmio =
-               (struct sata_port_regs *)pp->port_mmio;
+       struct ahci_ioports *pp = &uc_priv->port[port];
+       struct sata_port_regs *port_mmio = pp->port_mmio;
        u32 port_status;
        u32 mem;
        int timeout = 10000000;
 
        debug("Enter start port: %d\n", port);
-       port_status = readl(&(port_mmio->ssts));
+       port_status = readl(&port_mmio->ssts);
        debug("Port %d status: %x\n", port, port_status);
        if ((port_status & 0xf) != 0x03) {
                printf("No Link on this port!\n");
@@ -523,17 +479,17 @@ static int ahci_port_start(struct ahci_uc_priv *uc_priv, u8 port)
 
        mem += AHCI_CMD_TBL_HDR;
 
-       writel_with_flush(0x00004444, &(port_mmio->dmacr));
+       writel_with_flush(0x00004444, &port_mmio->dmacr);
        pp->cmd_tbl_sg = (struct ahci_sg *)mem;
-       writel_with_flush((u32)pp->cmd_slot, &(port_mmio->clb));
-       writel_with_flush(pp->rx_fis, &(port_mmio->fb));
+       writel_with_flush((u32)pp->cmd_slot, &port_mmio->clb);
+       writel_with_flush(pp->rx_fis, &port_mmio->fb);
 
        /* Enable FRE */
-       writel_with_flush((SATA_PORT_CMD_FRE | readl(&(port_mmio->cmd))),
-                       &(port_mmio->cmd));
+       writel_with_flush((SATA_PORT_CMD_FRE | readl(&port_mmio->cmd)),
+                         &port_mmio->cmd);
 
        /* Wait device ready */
-       while ((readl(&(port_mmio->tfd)) & (SATA_PORT_TFD_STS_ERR |
+       while ((readl(&port_mmio->tfd) & (SATA_PORT_TFD_STS_ERR |
                SATA_PORT_TFD_STS_DRQ | SATA_PORT_TFD_STS_BSY))
                && --timeout)
                ;
@@ -545,17 +501,15 @@ static int ahci_port_start(struct ahci_uc_priv *uc_priv, u8 port)
 
        writel_with_flush(PORT_CMD_ICC_ACTIVE | PORT_CMD_FIS_RX |
                          PORT_CMD_POWER_ON | PORT_CMD_SPIN_UP |
-                         PORT_CMD_START, &(port_mmio->cmd));
+                         PORT_CMD_START, &port_mmio->cmd);
 
        debug("Exit start port %d\n", port);
 
        return 0;
 }
 
-static void dwc_ahsata_print_info(int dev)
+static void dwc_ahsata_print_info(struct blk_desc *pdev)
 {
-       struct blk_desc *pdev = &(sata_dev_desc[dev]);
-
        printf("SATA Device Info:\n\r");
 #ifdef CONFIG_SYS_64BIT_LBA
        printf("S/N: %s\n\rProduct model number: %s\n\r"
@@ -568,10 +522,8 @@ static void dwc_ahsata_print_info(int dev)
 #endif
 }
 
-static void dwc_ahsata_identify(int dev, u16 *id)
+static void dwc_ahsata_identify(struct ahci_uc_priv *uc_priv, u16 *id)
 {
-       struct ahci_uc_priv *uc_priv =
-               (struct ahci_uc_priv *)sata_dev_desc[dev].priv;
        struct sata_fis_h2d h2d __aligned(ARCH_DMA_MINALIGN);
        struct sata_fis_h2d *cfis = &h2d;
        u8 port = uc_priv->hard_port_no;
@@ -587,21 +539,16 @@ static void dwc_ahsata_identify(int dev, u16 *id)
        ata_swap_buf_le16(id, ATA_ID_WORDS);
 }
 
-static void dwc_ahsata_xfer_mode(int dev, u16 *id)
+static void dwc_ahsata_xfer_mode(struct ahci_uc_priv *uc_priv, u16 *id)
 {
-       struct ahci_uc_priv *uc_priv =
-               (struct ahci_uc_priv *)sata_dev_desc[dev].priv;
-
        uc_priv->pio_mask = id[ATA_ID_PIO_MODES];
        uc_priv->udma_mask = id[ATA_ID_UDMA_MODES];
        debug("pio %04x, udma %04x\n\r", uc_priv->pio_mask, uc_priv->udma_mask);
 }
 
-static u32 dwc_ahsata_rw_cmd(int dev, u32 start, u32 blkcnt,
-                               u8 *buffer, int is_write)
+static u32 dwc_ahsata_rw_cmd(struct ahci_uc_priv *uc_priv, u32 start,
+                            u32 blkcnt, u8 *buffer, int is_write)
 {
-       struct ahci_uc_priv *uc_priv =
-               (struct ahci_uc_priv *)sata_dev_desc[dev].priv;
        struct sata_fis_h2d h2d __aligned(ARCH_DMA_MINALIGN);
        struct sata_fis_h2d *cfis = &h2d;
        u8 port = uc_priv->hard_port_no;
@@ -629,10 +576,8 @@ static u32 dwc_ahsata_rw_cmd(int dev, u32 start, u32 blkcnt,
                return 0;
 }
 
-static void dwc_ahsata_flush_cache(int dev)
+static void dwc_ahsata_flush_cache(struct ahci_uc_priv *uc_priv)
 {
-       struct ahci_uc_priv *uc_priv =
-               (struct ahci_uc_priv *)sata_dev_desc[dev].priv;
        struct sata_fis_h2d h2d __aligned(ARCH_DMA_MINALIGN);
        struct sata_fis_h2d *cfis = &h2d;
        u8 port = uc_priv->hard_port_no;
@@ -646,11 +591,9 @@ static void dwc_ahsata_flush_cache(int dev)
        ahci_exec_ata_cmd(uc_priv, port, cfis, NULL, 0, 0);
 }
 
-static u32 dwc_ahsata_rw_cmd_ext(int dev, u32 start, lbaint_t blkcnt,
-                               u8 *buffer, int is_write)
+static u32 dwc_ahsata_rw_cmd_ext(struct ahci_uc_priv *uc_priv, u32 start,
+                                lbaint_t blkcnt, u8 *buffer, int is_write)
 {
-       struct ahci_uc_priv *uc_priv =
-               (struct ahci_uc_priv *)sata_dev_desc[dev].priv;
        struct sata_fis_h2d h2d __aligned(ARCH_DMA_MINALIGN);
        struct sata_fis_h2d *cfis = &h2d;
        u8 port = uc_priv->hard_port_no;
@@ -683,10 +626,8 @@ static u32 dwc_ahsata_rw_cmd_ext(int dev, u32 start, lbaint_t blkcnt,
                return 0;
 }
 
-static void dwc_ahsata_flush_cache_ext(int dev)
+static void dwc_ahsata_flush_cache_ext(struct ahci_uc_priv *uc_priv)
 {
-       struct ahci_uc_priv *uc_priv =
-               (struct ahci_uc_priv *)sata_dev_desc[dev].priv;
        struct sata_fis_h2d h2d __aligned(ARCH_DMA_MINALIGN);
        struct sata_fis_h2d *cfis = &h2d;
        u8 port = uc_priv->hard_port_no;
@@ -700,11 +641,8 @@ static void dwc_ahsata_flush_cache_ext(int dev)
        ahci_exec_ata_cmd(uc_priv, port, cfis, NULL, 0, 0);
 }
 
-static void dwc_ahsata_init_wcache(int dev, u16 *id)
+static void dwc_ahsata_init_wcache(struct ahci_uc_priv *uc_priv, u16 *id)
 {
-       struct ahci_uc_priv *uc_priv =
-               (struct ahci_uc_priv *)sata_dev_desc[dev].priv;
-
        if (ata_id_has_wcache(id) && ata_id_wcache_enabled(id))
                uc_priv->flags |= SATA_FLAG_WCACHE;
        if (ata_id_has_flush(id))
@@ -713,8 +651,9 @@ static void dwc_ahsata_init_wcache(int dev, u16 *id)
                uc_priv->flags |= SATA_FLAG_FLUSH_EXT;
 }
 
-static u32 ata_low_level_rw_lba48(int dev, u32 blknr, lbaint_t blkcnt,
-                                 const void *buffer, int is_write)
+static u32 ata_low_level_rw_lba48(struct ahci_uc_priv *uc_priv, u32 blknr,
+                                 lbaint_t blkcnt, const void *buffer,
+                                 int is_write)
 {
        u32 start, blks;
        u8 *addr;
@@ -728,15 +667,16 @@ static u32 ata_low_level_rw_lba48(int dev, u32 blknr, lbaint_t blkcnt,
 
        do {
                if (blks > max_blks) {
-                       if (max_blks != dwc_ahsata_rw_cmd_ext(dev, start,
-                                               max_blks, addr, is_write))
+                       if (max_blks != dwc_ahsata_rw_cmd_ext(uc_priv, start,
+                                                             max_blks, addr,
+                                                             is_write))
                                return 0;
                        start += max_blks;
                        blks -= max_blks;
                        addr += ATA_SECT_SIZE * max_blks;
                } else {
-                       if (blks != dwc_ahsata_rw_cmd_ext(dev, start,
-                                               blks, addr, is_write))
+                       if (blks != dwc_ahsata_rw_cmd_ext(uc_priv, start, blks,
+                                                         addr, is_write))
                                return 0;
                        start += blks;
                        blks = 0;
@@ -747,8 +687,9 @@ static u32 ata_low_level_rw_lba48(int dev, u32 blknr, lbaint_t blkcnt,
        return blkcnt;
 }
 
-static u32 ata_low_level_rw_lba28(int dev, u32 blknr, lbaint_t blkcnt,
-                                 const void *buffer, int is_write)
+static u32 ata_low_level_rw_lba28(struct ahci_uc_priv *uc_priv, u32 blknr,
+                                 lbaint_t blkcnt, const void *buffer,
+                                 int is_write)
 {
        u32 start, blks;
        u8 *addr;
@@ -761,15 +702,16 @@ static u32 ata_low_level_rw_lba28(int dev, u32 blknr, lbaint_t blkcnt,
        max_blks = ATA_MAX_SECTORS;
        do {
                if (blks > max_blks) {
-                       if (max_blks != dwc_ahsata_rw_cmd(dev, start,
-                                               max_blks, addr, is_write))
+                       if (max_blks != dwc_ahsata_rw_cmd(uc_priv, start,
+                                                         max_blks, addr,
+                                                         is_write))
                                return 0;
                        start += max_blks;
                        blks -= max_blks;
                        addr += ATA_SECT_SIZE * max_blks;
                } else {
-                       if (blks != dwc_ahsata_rw_cmd(dev, start,
-                                               blks, addr, is_write))
+                       if (blks != dwc_ahsata_rw_cmd(uc_priv, start, blks,
+                                                     addr, is_write))
                                return 0;
                        start += blks;
                        blks = 0;
@@ -780,29 +722,16 @@ static u32 ata_low_level_rw_lba28(int dev, u32 blknr, lbaint_t blkcnt,
        return blkcnt;
 }
 
-int init_sata(int dev)
+static int dwc_ahci_start_ports(struct ahci_uc_priv *uc_priv)
 {
-       int i;
        u32 linkmap;
-       struct ahci_uc_priv *uc_priv = NULL;
-
-#if defined(CONFIG_MX6)
-       if (!is_mx6dq() && !is_mx6dqp())
-               return 1;
-#endif
-       if (dev < 0 || dev > (CONFIG_SYS_SATA_MAX_DEVICE - 1)) {
-               printf("The sata index %d is out of ranges\n\r", dev);
-               return -1;
-       }
-
-       ahci_init_one(dev);
+       int i;
 
-       uc_priv = (struct ahci_uc_priv *)sata_dev_desc[dev].priv;
        linkmap = uc_priv->link_port_map;
 
        if (0 == linkmap) {
                printf("No port device detected!\n");
-               return 1;
+               return -ENXIO;
        }
 
        for (i = 0; i < uc_priv->n_ports; i++) {
@@ -819,6 +748,158 @@ int init_sata(int dev)
        return 0;
 }
 
+static int dwc_ahsata_scan_common(struct ahci_uc_priv *uc_priv,
+                                 struct blk_desc *pdev)
+{
+       u8 serial[ATA_ID_SERNO_LEN + 1] = { 0 };
+       u8 firmware[ATA_ID_FW_REV_LEN + 1] = { 0 };
+       u8 product[ATA_ID_PROD_LEN + 1] = { 0 };
+       u64 n_sectors;
+       u8 port = uc_priv->hard_port_no;
+       ALLOC_CACHE_ALIGN_BUFFER(u16, id, ATA_ID_WORDS);
+
+       /* Identify device to get information */
+       dwc_ahsata_identify(uc_priv, id);
+
+       /* Serial number */
+       ata_id_c_string(id, serial, ATA_ID_SERNO, sizeof(serial));
+       memcpy(pdev->product, serial, sizeof(serial));
+
+       /* Firmware version */
+       ata_id_c_string(id, firmware, ATA_ID_FW_REV, sizeof(firmware));
+       memcpy(pdev->revision, firmware, sizeof(firmware));
+
+       /* Product model */
+       ata_id_c_string(id, product, ATA_ID_PROD, sizeof(product));
+       memcpy(pdev->vendor, product, sizeof(product));
+
+       /* Totoal sectors */
+       n_sectors = ata_id_n_sectors(id);
+       pdev->lba = (u32)n_sectors;
+
+       pdev->type = DEV_TYPE_HARDDISK;
+       pdev->blksz = ATA_SECT_SIZE;
+       pdev->lun = 0;
+
+       /* Check if support LBA48 */
+       if (ata_id_has_lba48(id)) {
+               pdev->lba48 = 1;
+               debug("Device support LBA48\n\r");
+       }
+
+       /* Get the NCQ queue depth from device */
+       uc_priv->flags &= (~SATA_FLAG_Q_DEP_MASK);
+       uc_priv->flags |= ata_id_queue_depth(id);
+
+       /* Get the xfer mode from device */
+       dwc_ahsata_xfer_mode(uc_priv, id);
+
+       /* Get the write cache status from device */
+       dwc_ahsata_init_wcache(uc_priv, id);
+
+       /* Set the xfer mode to highest speed */
+       ahci_set_feature(uc_priv, port);
+
+       dwc_ahsata_print_info(pdev);
+
+       return 0;
+}
+
+/*
+ * SATA interface between low level driver and command layer
+ */
+static ulong sata_read_common(struct ahci_uc_priv *uc_priv,
+                             struct blk_desc *desc, ulong blknr,
+                             lbaint_t blkcnt, void *buffer)
+{
+       u32 rc;
+
+       if (desc->lba48)
+               rc = ata_low_level_rw_lba48(uc_priv, blknr, blkcnt, buffer,
+                                           READ_CMD);
+       else
+               rc = ata_low_level_rw_lba28(uc_priv, blknr, blkcnt, buffer,
+                                           READ_CMD);
+
+       return rc;
+}
+
+static ulong sata_write_common(struct ahci_uc_priv *uc_priv,
+                              struct blk_desc *desc, ulong blknr,
+                              lbaint_t blkcnt, const void *buffer)
+{
+       u32 rc;
+       u32 flags = uc_priv->flags;
+
+       if (desc->lba48) {
+               rc = ata_low_level_rw_lba48(uc_priv, blknr, blkcnt, buffer,
+                                           WRITE_CMD);
+               if ((flags & SATA_FLAG_WCACHE) && (flags & SATA_FLAG_FLUSH_EXT))
+                       dwc_ahsata_flush_cache_ext(uc_priv);
+       } else {
+               rc = ata_low_level_rw_lba28(uc_priv, blknr, blkcnt, buffer,
+                                           WRITE_CMD);
+               if ((flags & SATA_FLAG_WCACHE) && (flags & SATA_FLAG_FLUSH))
+                       dwc_ahsata_flush_cache(uc_priv);
+       }
+
+       return rc;
+}
+
+#if !CONFIG_IS_ENABLED(AHCI)
+static int ahci_init_one(int pdev)
+{
+       int rc;
+       struct ahci_uc_priv *uc_priv = NULL;
+
+       uc_priv = malloc(sizeof(struct ahci_uc_priv));
+       memset(uc_priv, 0, sizeof(struct ahci_uc_priv));
+       uc_priv->dev = pdev;
+
+       uc_priv->host_flags = ATA_FLAG_SATA
+                               | ATA_FLAG_NO_LEGACY
+                               | ATA_FLAG_MMIO
+                               | ATA_FLAG_PIO_DMA
+                               | ATA_FLAG_NO_ATAPI;
+
+       uc_priv->mmio_base = (void __iomem *)CONFIG_DWC_AHSATA_BASE_ADDR;
+
+       /* initialize adapter */
+       rc = ahci_host_init(uc_priv);
+       if (rc)
+               goto err_out;
+
+       ahci_print_info(uc_priv);
+
+       /* Save the uc_private struct to block device struct */
+       sata_dev_desc[pdev].priv = uc_priv;
+
+       return 0;
+
+err_out:
+       return rc;
+}
+
+int init_sata(int dev)
+{
+       struct ahci_uc_priv *uc_priv = NULL;
+
+#if defined(CONFIG_MX6)
+       if (!is_mx6dq() && !is_mx6dqp())
+               return 1;
+#endif
+       if (dev < 0 || dev > (CONFIG_SYS_SATA_MAX_DEVICE - 1)) {
+               printf("The sata index %d is out of ranges\n\r", dev);
+               return -1;
+       }
+
+       ahci_init_one(dev);
+
+       uc_priv = sata_dev_desc[dev].priv;
+
+       return dwc_ahci_start_ports(uc_priv) ? 1 : 0;
+}
+
 int reset_sata(int dev)
 {
        struct ahci_uc_priv *uc_priv;
@@ -829,12 +910,12 @@ int reset_sata(int dev)
                return -1;
        }
 
-       uc_priv = (struct ahci_uc_priv *)sata_dev_desc[dev].priv;
+       uc_priv = sata_dev_desc[dev].priv;
        if (NULL == uc_priv)
                /* not initialized, so nothing to reset */
                return 0;
 
-       host_mmio = (struct sata_host_regs *)uc_priv->mmio_base;
+       host_mmio = uc_priv->mmio_base;
        setbits_le32(&host_mmio->ghc, SATA_HOST_GHC_HR);
        while (readl(&host_mmio->ghc) & SATA_HOST_GHC_HR)
                udelay(100);
@@ -853,10 +934,10 @@ int sata_port_status(int dev, int port)
        if (sata_dev_desc[dev].priv == NULL)
                return -ENODEV;
 
-       uc_priv = (struct ahci_uc_priv *)sata_dev_desc[dev].priv;
-       port_mmio = (struct sata_port_regs *)uc_priv->port[port].port_mmio;
+       uc_priv = sata_dev_desc[dev].priv;
+       port_mmio = uc_priv->port[port].port_mmio;
 
-       return readl(&(port_mmio->ssts)) & SATA_PORT_SSTS_DET_MASK;
+       return readl(&port_mmio->ssts) & SATA_PORT_SSTS_DET_MASK;
 }
 
 /*
@@ -864,107 +945,134 @@ int sata_port_status(int dev, int port)
  */
 ulong sata_read(int dev, ulong blknr, lbaint_t blkcnt, void *buffer)
 {
-       u32 rc;
+       struct ahci_uc_priv *uc_priv = sata_dev_desc[dev].priv;
 
-       if (sata_dev_desc[dev].lba48)
-               rc = ata_low_level_rw_lba48(dev, blknr, blkcnt,
-                                               buffer, READ_CMD);
-       else
-               rc = ata_low_level_rw_lba28(dev, blknr, blkcnt,
-                                               buffer, READ_CMD);
-       return rc;
+       return sata_read_common(uc_priv, &sata_dev_desc[dev], blknr, blkcnt,
+                               buffer);
 }
 
 ulong sata_write(int dev, ulong blknr, lbaint_t blkcnt, const void *buffer)
 {
-       u32 rc;
-       struct ahci_uc_priv *uc_priv =
-               (struct ahci_uc_priv *)sata_dev_desc[dev].priv;
-       u32 flags = uc_priv->flags;
+       struct ahci_uc_priv *uc_priv = sata_dev_desc[dev].priv;
 
-       if (sata_dev_desc[dev].lba48) {
-               rc = ata_low_level_rw_lba48(dev, blknr, blkcnt,
-                                               buffer, WRITE_CMD);
-               if ((flags & SATA_FLAG_WCACHE) &&
-                       (flags & SATA_FLAG_FLUSH_EXT))
-                       dwc_ahsata_flush_cache_ext(dev);
-       } else {
-               rc = ata_low_level_rw_lba28(dev, blknr, blkcnt,
-                                               buffer, WRITE_CMD);
-               if ((flags & SATA_FLAG_WCACHE) &&
-                       (flags & SATA_FLAG_FLUSH))
-                       dwc_ahsata_flush_cache(dev);
-       }
-       return rc;
+       return sata_write_common(uc_priv, &sata_dev_desc[dev], blknr, blkcnt,
+                                buffer);
 }
 
 int scan_sata(int dev)
 {
-       u8 serial[ATA_ID_SERNO_LEN + 1] = { 0 };
-       u8 firmware[ATA_ID_FW_REV_LEN + 1] = { 0 };
-       u8 product[ATA_ID_PROD_LEN + 1] = { 0 };
-       u16 *id;
-       u64 n_sectors;
-       struct ahci_uc_priv *uc_priv =
-               (struct ahci_uc_priv *)sata_dev_desc[dev].priv;
-       u8 port = uc_priv->hard_port_no;
-       struct blk_desc *pdev = &(sata_dev_desc[dev]);
+       struct ahci_uc_priv *uc_priv = sata_dev_desc[dev].priv;
+       struct blk_desc *pdev = &sata_dev_desc[dev];
 
-       id = (u16 *)memalign(ARCH_DMA_MINALIGN,
-                               roundup(ARCH_DMA_MINALIGN,
-                                       (ATA_ID_WORDS * 2)));
-       if (!id) {
-               printf("id malloc failed\n\r");
-               return -1;
-       }
+       return dwc_ahsata_scan_common(uc_priv, pdev);
+}
+#endif /* CONFIG_IS_ENABLED(AHCI) */
 
-       /* Identify device to get information */
-       dwc_ahsata_identify(dev, id);
+#if CONFIG_IS_ENABLED(AHCI)
 
-       /* Serial number */
-       ata_id_c_string(id, serial, ATA_ID_SERNO, sizeof(serial));
-       memcpy(pdev->product, serial, sizeof(serial));
+int dwc_ahsata_port_status(struct udevice *dev, int port)
+{
+       struct ahci_uc_priv *uc_priv = dev_get_uclass_priv(dev);
+       struct sata_port_regs *port_mmio;
 
-       /* Firmware version */
-       ata_id_c_string(id, firmware, ATA_ID_FW_REV, sizeof(firmware));
-       memcpy(pdev->revision, firmware, sizeof(firmware));
+       port_mmio = uc_priv->port[port].port_mmio;
+       return readl(&port_mmio->ssts) & SATA_PORT_SSTS_DET_MASK ? 0 : -ENXIO;
+}
 
-       /* Product model */
-       ata_id_c_string(id, product, ATA_ID_PROD, sizeof(product));
-       memcpy(pdev->vendor, product, sizeof(product));
+int dwc_ahsata_bus_reset(struct udevice *dev)
+{
+       struct ahci_uc_priv *uc_priv = dev_get_uclass_priv(dev);
+       struct sata_host_regs *host_mmio = uc_priv->mmio_base;
 
-       /* Totoal sectors */
-       n_sectors = ata_id_n_sectors(id);
-       pdev->lba = (u32)n_sectors;
+       setbits_le32(&host_mmio->ghc, SATA_HOST_GHC_HR);
+       while (readl(&host_mmio->ghc) & SATA_HOST_GHC_HR)
+               udelay(100);
 
-       pdev->type = DEV_TYPE_HARDDISK;
-       pdev->blksz = ATA_SECT_SIZE;
-       pdev->lun = 0 ;
+       return 0;
+}
 
-       /* Check if support LBA48 */
-       if (ata_id_has_lba48(id)) {
-               pdev->lba48 = 1;
-               debug("Device support LBA48\n\r");
+int dwc_ahsata_scan(struct udevice *dev)
+{
+       struct ahci_uc_priv *uc_priv = dev_get_uclass_priv(dev);
+       struct blk_desc *desc;
+       struct udevice *blk;
+       int ret;
+
+       /*
+       * Create only one block device and do detection
+       * to make sure that there won't be a lot of
+       * block devices created
+       */
+       device_find_first_child(dev, &blk);
+       if (!blk) {
+               ret = blk_create_devicef(dev, "dwc_ahsata_blk", "blk",
+                                        IF_TYPE_SATA, -1, 512, 0, &blk);
+               if (ret) {
+                       debug("Can't create device\n");
+                       return ret;
+               }
        }
 
-       /* Get the NCQ queue depth from device */
-       uc_priv->flags &= (~SATA_FLAG_Q_DEP_MASK);
-       uc_priv->flags |= ata_id_queue_depth(id);
+       desc = dev_get_uclass_platdata(blk);
+       ret = dwc_ahsata_scan_common(uc_priv, desc);
+       if (ret) {
+               debug("%s: Failed to scan bus\n", __func__);
+               return ret;
+       }
 
-       /* Get the xfer mode from device */
-       dwc_ahsata_xfer_mode(dev, id);
+       return 0;
+}
 
-       /* Get the write cache status from device */
-       dwc_ahsata_init_wcache(dev, id);
+int dwc_ahsata_probe(struct udevice *dev)
+{
+       struct ahci_uc_priv *uc_priv = dev_get_uclass_priv(dev);
+       int ret;
 
-       /* Set the xfer mode to highest speed */
-       ahci_set_feature(dev, port);
+       uc_priv->host_flags = ATA_FLAG_SATA | ATA_FLAG_NO_LEGACY |
+                       ATA_FLAG_MMIO | ATA_FLAG_PIO_DMA | ATA_FLAG_NO_ATAPI;
+       uc_priv->mmio_base = (void __iomem *)dev_read_addr(dev);
+
+       /* initialize adapter */
+       ret = ahci_host_init(uc_priv);
+       if (ret)
+               return ret;
 
-       free((void *)id);
+       ahci_print_info(uc_priv);
+
+       return dwc_ahci_start_ports(uc_priv);
+}
 
-       dwc_ahsata_print_info(dev);
+static ulong dwc_ahsata_read(struct udevice *blk, lbaint_t blknr,
+                            lbaint_t blkcnt, void *buffer)
+{
+       struct blk_desc *desc = dev_get_uclass_platdata(blk);
+       struct udevice *dev = dev_get_parent(blk);
+       struct ahci_uc_priv *uc_priv;
 
-       is_ready = 1;
+       uc_priv = dev_get_uclass_priv(dev);
+       return sata_read_common(uc_priv, desc, blknr, blkcnt, buffer);
+}
 
-       return 0;
+static ulong dwc_ahsata_write(struct udevice *blk, lbaint_t blknr,
+                             lbaint_t blkcnt, const void *buffer)
+{
+       struct blk_desc *desc = dev_get_uclass_platdata(blk);
+       struct udevice *dev = dev_get_parent(blk);
+       struct ahci_uc_priv *uc_priv;
+
+       uc_priv = dev_get_uclass_priv(dev);
+       return sata_write_common(uc_priv, desc, blknr, blkcnt, buffer);
 }
+
+static const struct blk_ops dwc_ahsata_blk_ops = {
+       .read   = dwc_ahsata_read,
+       .write  = dwc_ahsata_write,
+};
+
+U_BOOT_DRIVER(dwc_ahsata_blk) = {
+       .name           = "dwc_ahsata_blk",
+       .id             = UCLASS_BLK,
+       .ops            = &dwc_ahsata_blk_ops,
+};
+
+#endif