mfd: clsic: Retry clsic_maintenance if firmware_request return EAGAIN

Change-Id: I70089a8f5c7cecc4b1a86f8ce8c7c7400e6a1573
Signed-off-by: Lucas Tanure <[email protected]>

Author: Lucas Tanure

drivers/mfd/clsic/clsic-bootsrv.c

@@ -356,6 +356,8 @@ static int clsic_bootsrv_sendfile(struct clsic *clsic,
 	bootsrv->fwupdate_status = FWUPDATE_SENDING;
 
 	ret = request_firmware(&firmware, filename, clsic->dev);
+	if (ret == -EAGAIN)
+		return ret;
 	if (ret != 0) {
 		clsic_err(clsic,
 			  "request_firmware failed '%s' = %d (check files)\n",
@@ -595,6 +597,9 @@ int clsic_bootsrv_state_handler(struct clsic *clsic)
 	default:
 		clsic_err(clsic, "Unrecognised: %d\n", saved_request);
 	}
+	if (ret == -EAGAIN)
+		clsic->blrequest = saved_request;
+
 	return ret;
 }
 

drivers/mfd/clsic/clsic-core.c

@@ -21,6 +21,9 @@
 #include <linux/mfd/clsic/syssrv.h>
 #include <linux/mfd/clsic/rassrv.h>
 
+#define CLSIC_BOOT_COMPLETION_TIMEOUT   300
+#define CLSIC_RETRY_REQUEST_FW_MS       300
+
 static void clsic_free_service_handler(struct clsic *clsic,
 				       struct clsic_service *handler);
 static void clsic_init_sysfs(struct clsic *clsic);
@@ -64,7 +67,7 @@ static void clsic_disable_hard_reset(struct clsic *clsic)
 	}
 }
 
-#define CLSIC_BOOT_COMPLETION_TIMEOUT   300
+
 bool clsic_wait_for_boot_done(struct clsic *clsic)
 {
 	unsigned int val;
@@ -560,6 +563,7 @@ void clsic_maintenance(struct work_struct *data)
 	struct delayed_work *dw = to_delayed_work(data);
 	struct clsic *clsic = container_of(dw, struct clsic,
 					   maintenance_handler);
+	int ret;
 
 	trace_clsic_maintenance(clsic->state, clsic->blrequest,
 				clsic->service_states);
@@ -573,7 +577,14 @@ void clsic_maintenance(struct work_struct *data)
 		goto pm_complete_exit;
 
 	if (clsic->blrequest != CLSIC_BL_IDLE) {
-		if (clsic_bootsrv_state_handler(clsic) != 0) {
+		ret = clsic_bootsrv_state_handler(clsic);
+		if (ret == -EAGAIN) {
+			schedule_delayed_work(&clsic->maintenance_handler,
+				msecs_to_jiffies(CLSIC_RETRY_REQUEST_FW_MS));
+			return;
+		}
+
+		if (ret != 0) {
 			clsic_err(clsic,
 				  "Bootloader operation failed (%s s: %d b: %d)\n",
 				  clsic_state_to_string(clsic->state),