sata: call device_probe() after scanning

Every time a sata bus/port is scanned and a new device is detected,
we want to call device_probe() as it will give us a chance to run
additional post-processings for some purposes.

In particular, support for creating partitions on a device will be added.

Signed-off-by: AKASHI Takahiro <takahiro.akashi@linaro.org>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/ata/dwc_ahsata.c b/drivers/ata/dwc_ahsata.c
index 6d42548087b3936897e38deb1922b9d5396ee2df..d9fd850c6fae90e7b62a0c47b4f10986f8b87db1 100644 (file)
--- a/drivers/ata/dwc_ahsata.c
+++ b/drivers/ata/dwc_ahsata.c
@@ -1026,6 +1026,11 @@ int dwc_ahsata_scan(struct udevice *dev)
                return ret;
        }
 
+       ret = blk_probe_or_unbind(dev);
+       if (ret < 0)
+               /* TODO: undo create */
+               return ret;
+
        return 0;
 }
 

diff --git a/drivers/ata/fsl_sata.c b/drivers/ata/fsl_sata.c
index e44db0a37458c817f02b420ac65d9700f63740cc..d1bab931895a60351a955c49f918fd24dcaa1a84 100644 (file)
--- a/drivers/ata/fsl_sata.c
+++ b/drivers/ata/fsl_sata.c
@@ -982,6 +982,17 @@ static int fsl_ata_probe(struct udevice *dev)
                        failed_number++;
                        continue;
                }
+
+               ret = device_probe(dev);
+               if (ret < 0) {
+                       debug("Probing %s failed (%d)\n", dev->name, ret);
+                       ret = fsl_unbind_device(blk);
+                       if (ret)
+                               return ret;
+
+                       failed_number++;
+                       continue;
+               }
        }
 
        if (failed_number == nr_ports)

diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
index 003222d47be6542084e25991da8745a80df6cc8e..a187796dfcdf0e8bedfd5622509313c99508891f 100644 (file)
--- a/drivers/ata/sata_mv.c
+++ b/drivers/ata/sata_mv.c
@@ -1099,6 +1099,11 @@ static int sata_mv_probe(struct udevice *dev)
                        continue;
                }
 
+               ret = blk_probe_or_unbind(dev);
+               if (ret < 0)
+                       /* TODO: undo create */
+                       continue;
+
                /* If we got here, the current SATA port was probed
                 * successfully, so set the probe status to successful.
                 */

diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
index a4f0dae4bbd1dea42cc753fe2df4037d915b8b6a..b213ebac2fb987bc0d5ac13ac959cf0136f7a820 100644 (file)
--- a/drivers/ata/sata_sil.c
+++ b/drivers/ata/sata_sil.c
@@ -753,6 +753,18 @@ static int sil_pci_probe(struct udevice *dev)
                        failed_number++;
                        continue;
                }
+
+               ret = device_probe(dev);
+               if (ret < 0) {
+                       debug("Probing %s failed (%d)\n", dev->name, ret);
+                       ret = sil_unbind_device(blk);
+                       device_unbind(dev);
+                       if (ret)
+                               return ret;
+
+                       failed_number++;
+                       continue;
+               }
        }
 
        if (failed_number == sata_info.maxport)