ata: sata_rescan must scan for block devices

A system may have multiple SATA controller. Removing the controller with
the lowest sequence number before probing all SATA controllers makes no
sense.

In sata_rescan we remove all block devices which are children of SATA
controllers. We also have to remove the bootdev devices as they will be
created when scanning for block devices.

After probing all SATA controllers we must scan for block devices otherwise
we end up without any SATA block device.

Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com>
Reviewed-by: Tony Dinh <mibodhi@gmail.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/drivers/ata/sata.c b/drivers/ata/sata.c
index 84437d3d346b4f261f000f3f578a382c6e477699..89cd516f3d6eb35a068aa3ce205052b8ec201d61 100644 (file)
--- a/drivers/ata/sata.c
+++ b/drivers/ata/sata.c
@@ -9,9 +9,12 @@
  *             Dave Liu <daveliu@freescale.com>
  */
 
+#define LOG_CATEGORY UCLASS_AHCI
+
 #include <ahci.h>
 #include <blk.h>
 #include <dm.h>
+#include <log.h>
 #include <part.h>
 #include <sata.h>
 #include <dm/device-internal.h>
@@ -49,38 +52,39 @@ int sata_scan(struct udevice *dev)
 
 int sata_rescan(bool verbose)
 {
+       struct uclass *uc;
+       struct udevice *dev; /* SATA controller */
        int ret;
-       struct udevice *dev;
 
        if (verbose)
-               printf("Removing devices on SATA bus...\n");
-
-       blk_unbind_all(UCLASS_AHCI);
-
-       ret = uclass_find_first_device(UCLASS_AHCI, &dev);
-       if (ret || !dev) {
-               printf("Cannot find SATA device (err=%d)\n", ret);
-               return -ENOENT;
-       }
-
-       ret = device_remove(dev, DM_REMOVE_NORMAL);
-       if (ret) {
-               printf("Cannot remove SATA device '%s' (err=%d)\n", dev->name, ret);
-               return -ENOSYS;
+               printf("scanning bus for devices...\n");
+
+       ret = uclass_get(UCLASS_AHCI, &uc);
+       if (ret)
+               return ret;
+
+       /* Remove all children of SATA devices (blk and bootdev) */
+       uclass_foreach_dev(dev, uc) {
+               log_debug("unbind %s\n", dev->name);
+               ret = device_chld_remove(dev, NULL, DM_REMOVE_NORMAL);
+               if (!ret)
+                       ret = device_chld_unbind(dev, NULL);
+               if (ret && verbose) {
+                       log_err("Unbinding from %s failed (%dE)\n",
+                               dev->name, ret);
+               }
        }
 
        if (verbose)
                printf("Rescanning SATA bus for devices...\n");
 
-       ret = uclass_probe_all(UCLASS_AHCI);
-
-       if (ret == -ENODEV) {
-               if (verbose)
-                       printf("No SATA block device found\n");
-               return 0;
+       uclass_foreach_dev_probe(UCLASS_AHCI, dev) {
+               ret = sata_scan(dev);
+               if (ret && verbose)
+                       log_err("Scanning %s failed (%dE)\n", dev->name, ret);
        }
 
-       return ret;
+       return 0;
 }
 
 static unsigned long sata_bread(struct udevice *dev, lbaint_t start,