firmware: qcom_scm: Clear download bit during reboot

Mukesh Ojha · andersson · commit 781d32d1c970 · 2023-03-19T19:09:45.000-07:00
During normal restart of a system download bit should be cleared irrespective of whether download mode is set or not. Fixes: 8c1b7dc ("firmware: qcom: scm: Expose download-mode control") Signed-off-by: Mukesh Ojha <quic_mojha@quicinc.com> Signed-off-by: Bjorn Andersson <andersson@kernel.org> Link: https://lore.kernel.org/r/1678979666-551-1-git-send-email-quic_mojha@quicinc.com
diff --git a/drivers/firmware/qcom_scm.c b/drivers/firmware/qcom_scm.c
@@ -1508,8 +1508,7 @@ static int qcom_scm_probe(struct platform_device *pdev)
 static void qcom_scm_shutdown(struct platform_device *pdev)
 {
 	/* Clean shutdown, disable download mode to allow normal restart */
-	if (download_mode)
-		qcom_scm_set_download_mode(false);
+	qcom_scm_set_download_mode(false);
 }
 
 static const struct of_device_id qcom_scm_dt_match[] = {

Original file line number	Diff line number	Diff line change
`@@ -1508,8 +1508,7 @@ static int qcom_scm_probe(struct platform_device *pdev)`
`1508`	`1508`	`static void qcom_scm_shutdown(struct platform_device *pdev)`
`1509`	`1509`	`{`
`1510`	`1510`	`/* Clean shutdown, disable download mode to allow normal restart */`
`1511`		`- if (download_mode)`
`1512`		`- qcom_scm_set_download_mode(false);`
	`1511`	`+ qcom_scm_set_download_mode(false);`
`1513`	`1512`	`}`
`1514`	`1513`
`1515`	`1514`	`static const struct of_device_id qcom_scm_dt_match[] = {`