Dockerfile: build swtpm

[J-u-boot.git] / drivers / ata / fsl_sata.c

diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index 3261c10f91dea5bee4faaca36bacf6e435ffe91e..e44db0a37458c817f02b420ac65d9700f63740cc 100644 (file)
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -6,8 +6,11 @@
  */
 
 #include <common.h>
+#include <blk.h>
 #include <command.h>
 #include <console.h>
+#include <cpu_func.h>
+#include <log.h>
 #include <asm/io.h>
 #include <asm/processor.h>
 #include <asm/fsl_serdes.h>
@@ -15,12 +18,14 @@
 #include <libata.h>
 #include <fis.h>
 #include <sata.h>
+#include <linux/delay.h>
 #include "fsl_sata.h"
 
 #if CONFIG_IS_ENABLED(BLK)
 #include <dm.h>
 #include <ahci.h>
 #include <blk.h>
+#include <dm/device-internal.h>
 #else
 #ifndef CONFIG_SYS_SATA1_FLAGS
        #define CONFIG_SYS_SATA1_FLAGS  FLAGS_DMA
@@ -121,7 +126,7 @@ static int init_sata(struct fsl_ata_priv *priv, int dev)
        /* Zero all of the device driver struct */
        memset((void *)sata, 0, sizeof(fsl_sata_t));
 
-       snprintf(sata->name, 12, "SATA%d:\n", dev);
+       snprintf(sata->name, 12, "SATA%d:", dev);
 
        /* Set the controller register base address to device struct */
 #if !CONFIG_IS_ENABLED(BLK)
@@ -232,10 +237,7 @@ static int init_sata(struct fsl_ata_priv *priv, int dev)
        mdelay(100);
 
        /* print sata device name */
-       if (!dev)
-               printf("%s ", sata->name);
-       else
-               printf("       %s ", sata->name);
+       printf("%s ", sata->name);
 
        /* Wait PHY RDY signal changed for 500ms */
        ata_wait_register(&reg->hstatus, HSTATUS_PHY_RDY,
@@ -744,7 +746,7 @@ ulong sata_read(int dev, ulong blknr, lbaint_t blkcnt, void *buffer)
 static ulong sata_read(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
                       void *buffer)
 {
-       struct fsl_ata_priv *priv = dev_get_platdata(dev);
+       struct fsl_ata_priv *priv = dev_get_plat(dev);
        fsl_sata_t *sata = priv->fsl_sata;
 #endif
        u32 rc;
@@ -766,7 +768,7 @@ ulong sata_write(int dev, ulong blknr, lbaint_t blkcnt, const void *buffer)
 static ulong sata_write(struct udevice *dev, lbaint_t blknr, lbaint_t blkcnt,
                        const void *buffer)
 {
-       struct fsl_ata_priv *priv = dev_get_platdata(dev);
+       struct fsl_ata_priv *priv = dev_get_plat(dev);
        fsl_sata_t *sata = priv->fsl_sata;
 #endif
        u32 rc;
@@ -806,8 +808,8 @@ int scan_sata(int dev)
 #else
 static int scan_sata(struct udevice *dev)
 {
-       struct blk_desc *desc = dev_get_uclass_platdata(dev);
-       struct fsl_ata_priv *priv = dev_get_platdata(dev);
+       struct blk_desc *desc = dev_get_uclass_plat(dev);
+       struct fsl_ata_priv *priv = dev_get_plat(dev);
        fsl_sata_t *sata = priv->fsl_sata;
 #endif
 
@@ -898,10 +900,10 @@ U_BOOT_DRIVER(sata_fsl_driver) = {
        .name = "sata_fsl_blk",
        .id = UCLASS_BLK,
        .ops = &sata_fsl_blk_ops,
-       .platdata_auto_alloc_size = sizeof(struct fsl_ata_priv),
+       .plat_auto      = sizeof(struct fsl_ata_priv),
 };
 
-static int fsl_ata_ofdata_to_platdata(struct udevice *dev)
+static int fsl_ata_of_to_plat(struct udevice *dev)
 {
        struct fsl_ata_priv *priv = dev_get_priv(dev);
 
@@ -916,15 +918,32 @@ static int fsl_ata_ofdata_to_platdata(struct udevice *dev)
        return 0;
 }
 
+static int fsl_unbind_device(struct udevice *dev)
+{
+       int ret;
+
+       ret = device_remove(dev, DM_REMOVE_NORMAL);
+       if (ret)
+               return ret;
+
+       ret = device_unbind(dev);
+       if (ret)
+               return ret;
+
+       return 0;
+}
+
 static int fsl_ata_probe(struct udevice *dev)
 {
        struct fsl_ata_priv *blk_priv, *priv;
        struct udevice *blk;
+       int failed_number;
        char sata_name[10];
        int nr_ports;
        int ret;
        int i;
 
+       failed_number = 0;
        priv = dev_get_priv(dev);
        nr_ports = priv->number;
        nr_ports = min(nr_ports, CONFIG_SYS_SATA_MAX_DEVICE);
@@ -942,19 +961,47 @@ static int fsl_ata_probe(struct udevice *dev)
                ret = init_sata(priv, i);
                if (ret) {
                        debug("%s: Failed to init sata\n", __func__);
-                       return ret;
+                       ret = fsl_unbind_device(blk);
+                       if (ret)
+                               return ret;
+
+                       failed_number++;
+                       continue;
                }
 
-               blk_priv = dev_get_platdata(blk);
+               blk_priv = dev_get_plat(blk);
                blk_priv->fsl_sata = priv->fsl_sata;
                /* Scan SATA port */
                ret = scan_sata(blk);
                if (ret) {
                        debug("%s: Failed to scan bus\n", __func__);
-                       return ret;
+                       ret = fsl_unbind_device(blk);
+                       if (ret)
+                               return ret;
+
+                       failed_number++;
+                       continue;
                }
        }
 
+       if (failed_number == nr_ports)
+               return -ENODEV;
+       else
+               return 0;
+}
+
+static int fsl_ata_remove(struct udevice *dev)
+{
+       fsl_sata_t *sata;
+       struct fsl_ata_priv *priv;
+
+       priv = dev_get_priv(dev);
+       sata = priv->fsl_sata;
+
+       free(sata->cmd_hdr_tbl_offset);
+       free(sata->cmd_desc_offset);
+       free(sata);
+
        return 0;
 }
 
@@ -979,8 +1026,9 @@ U_BOOT_DRIVER(fsl_ahci) = {
        .id = UCLASS_AHCI,
        .of_match = fsl_ata_ids,
        .ops = &sata_fsl_ahci_ops,
-       .ofdata_to_platdata = fsl_ata_ofdata_to_platdata,
+       .of_to_plat = fsl_ata_of_to_plat,
        .probe  = fsl_ata_probe,
-       .priv_auto_alloc_size = sizeof(struct fsl_ata_priv),
+       .remove = fsl_ata_remove,
+       .priv_auto      = sizeof(struct fsl_ata_priv),
 };
 #endif