HSD #14017114324: fpga: stratix10-soc: wait for COMMAND_FIRMWARE_VERS…

…ION to complete With the introduction of stratix10_svc_done(), all SMC call has to be completed before calling stratix10_svc_done(). The driver is missing a wait_for_completion_timeout() after requesting for COMMAND_FIRMWARE_VERSION. This cause SVC driver to stop its thread before COMMAND_FIRMWARE_VERSION is complete. Thus, the driver will receive invalid firmware version. Signed-off-by: Teh Wen Ping <[email protected]>
altera-opensource · Sep 22, 2022 · 6a618e1 · 6a618e1
1 parent 7ee59f5
commit 6a618e1
Showing 1 changed file with 12 additions and 0 deletions.
diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/stratix10-soc.c
@@ -490,6 +490,18 @@ static int s10_probe(struct platform_device *pdev)
 		goto probe_err;
 	}
 
+	ret = wait_for_completion_timeout(
+		&priv->status_return_completion, S10_RECONFIG_TIMEOUT);
+	if (!ret) {
+		dev_err(dev, "timeout waiting for firmware version\n");
+		stratix10_svc_done(priv->chan);
+		fpga_mgr_free(mgr);
+		ret = -ETIMEDOUT;
+		goto probe_err;
+	}
+
+	ret = 0;
+
 	stratix10_svc_done(priv->chan);
 	platform_set_drvdata(pdev, mgr);
 	return ret;