From 8474da946f58a127b2006c526ae6f9b5a968d422 Mon Sep 17 00:00:00 2001
From: Simon Glass <sjg@chromium.org>
Date: Sat, 28 Mar 2020 14:03:47 -0600
Subject: [PATCH] dm: core: Add logging on unbind failure

This failure path is tricky to debug since it continues after failure and
there are a lot of error paths. Add logging to help.

Signed-off-by: Simon Glass <sjg@chromium.org>
---
 drivers/core/device-remove.c | 20 ++++++++++++--------
 drivers/core/uclass.c        |  4 ++--
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/drivers/core/device-remove.c b/drivers/core/device-remove.c
index ff5b28cb6a..8736fd9821 100644
--- a/drivers/core/device-remove.c
+++ b/drivers/core/device-remove.c
@@ -10,6 +10,7 @@
 
 #include <common.h>
 #include <errno.h>
+#include <log.h>
 #include <malloc.h>
 #include <dm/device.h>
 #include <dm/device-internal.h>
@@ -30,11 +31,14 @@ int device_chld_unbind(struct udevice *dev, struct driver *drv)
 			continue;
 
 		ret = device_unbind(pos);
-		if (ret && !saved_ret)
+		if (ret && !saved_ret) {
+			log_warning("device '%s' failed to unbind\n",
+				    pos->name);
 			saved_ret = ret;
+		}
 	}
 
-	return saved_ret;
+	return log_ret(saved_ret);
 }
 
 int device_chld_remove(struct udevice *dev, struct driver *drv,
@@ -63,13 +67,13 @@ int device_unbind(struct udevice *dev)
 	int ret;
 
 	if (!dev)
-		return -EINVAL;
+		return log_msg_ret("dev", -EINVAL);
 
 	if (dev->flags & DM_FLAG_ACTIVATED)
-		return -EINVAL;
+		return log_msg_ret("active", -EINVAL);
 
 	if (!(dev->flags & DM_FLAG_BOUND))
-		return -EINVAL;
+		return log_msg_ret("not-bound", -EINVAL);
 
 	drv = dev->driver;
 	assert(drv);
@@ -77,12 +81,12 @@ int device_unbind(struct udevice *dev)
 	if (drv->unbind) {
 		ret = drv->unbind(dev);
 		if (ret)
-			return ret;
+			return log_msg_ret("unbind", ret);
 	}
 
 	ret = device_chld_unbind(dev, NULL);
 	if (ret)
-		return ret;
+		return log_msg_ret("child unbind", ret);
 
 	if (dev->flags & DM_FLAG_ALLOC_PDATA) {
 		free(dev->platdata);
@@ -98,7 +102,7 @@ int device_unbind(struct udevice *dev)
 	}
 	ret = uclass_unbind_device(dev);
 	if (ret)
-		return ret;
+		return log_msg_ret("uc", ret);
 
 	if (dev->parent)
 		list_del(&dev->sibling_node);
diff --git a/drivers/core/uclass.c b/drivers/core/uclass.c
index 58b19a4210..b24b677c55 100644
--- a/drivers/core/uclass.c
+++ b/drivers/core/uclass.c
@@ -120,10 +120,10 @@ int uclass_destroy(struct uclass *uc)
 				       uclass_node);
 		ret = device_remove(dev, DM_REMOVE_NORMAL);
 		if (ret)
-			return ret;
+			return log_msg_ret("remove", ret);
 		ret = device_unbind(dev);
 		if (ret)
-			return ret;
+			return log_msg_ret("unbind", ret);
 	}
 
 	uc_drv = uc->uc_drv;
-- 
2.25.1