[PATCH 4/4] usb: f_mass_storage: Stop after the host deconfigures us

[Sean Anderson]

At the moment there is no way to signal to U-Boot from the host that we
are done reading/writing data. This stops the gadget after the host
deconfigures us by selecting config 0. In theory, the host could later
select this configuration again, but this rarely happens.

On Linux this may be accomplished by running

	udisksctl power-off -b /dev/sdX

Signed-off-by: Sean Anderson <sean.anderson at seco.com>
---

 cmd/usb_mass_storage.c              | 3 +++
 drivers/usb/gadget/f_mass_storage.c | 7 ++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c
index d4e619b842..bac4ad87b9 100644
--- a/cmd/usb_mass_storage.c
+++ b/cmd/usb_mass_storage.c
@@ -227,6 +227,9 @@ static int do_usb_mass_storage(struct cmd_tbl *cmdtp, int flag,
 			if (rc == -EPIPE)
 				printf("\rCTRL+C - Operation aborted\n");
 
+			if (rc == -ENOLINK)
+				printf("\rHost closed connection\n");
+
 			rc = CMD_RET_SUCCESS;
 			goto cleanup_register;
 		}
diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c
index 190053590f..5968146b1c 100644
--- a/drivers/usb/gadget/f_mass_storage.c
+++ b/drivers/usb/gadget/f_mass_storage.c
@@ -2248,7 +2248,10 @@ static void fsg_disable(struct usb_function *f)
 {
 	struct fsg_dev *fsg = fsg_from_func(f);
 	fsg->common->new_fsg = NULL;
-	raise_exception(fsg->common, FSG_STATE_CONFIG_CHANGE);
+	if (fsg->common->running)
+		raise_exception(fsg->common, FSG_STATE_EXIT);
+	else
+		raise_exception(fsg->common, FSG_STATE_CONFIG_CHANGE);
 }
 
 /*-------------------------------------------------------------------------*/
@@ -2394,6 +2397,8 @@ int fsg_main_thread(void *common_)
 
 	common->thread_task = NULL;
 
+	if (common->state == FSG_STATE_TERMINATED)
+		return -ENOLINK;
 	return 0;
 }
 
-- 
2.25.1