Skip to content

Commit 0c50b7f

Browse files
juhosgandersson
authored andcommitted
firmware: qcom_scm: disable clocks if qcom_scm_bw_enable() fails
There are several functions which are calling qcom_scm_bw_enable() then returns immediately if the call fails and leaves the clocks enabled. Change the code of these functions to disable clocks when the qcom_scm_bw_enable() call fails. This also fixes a possible dma buffer leak in the qcom_scm_pas_init_image() function. Compile tested only due to lack of hardware with interconnect support. Cc: stable@vger.kernel.org Fixes: 65b7ebd ("firmware: qcom_scm: Add bw voting support to the SCM interface") Signed-off-by: Gabor Juhos <j4g8y7@gmail.com> Reviewed-by: Mukesh Ojha <quic_mojha@quicinc.com> Link: https://lore.kernel.org/r/20240304-qcom-scm-disable-clk-v1-1-b36e51577ca1@gmail.com Signed-off-by: Bjorn Andersson <andersson@kernel.org>
1 parent 9f378a6 commit 0c50b7f

1 file changed

Lines changed: 12 additions & 6 deletions

File tree

drivers/firmware/qcom/qcom_scm.c

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -569,13 +569,14 @@ int qcom_scm_pas_init_image(u32 peripheral, const void *metadata, size_t size,
569569

570570
ret = qcom_scm_bw_enable();
571571
if (ret)
572-
return ret;
572+
goto disable_clk;
573573

574574
desc.args[1] = mdata_phys;
575575

576576
ret = qcom_scm_call(__scm->dev, &desc, &res);
577-
578577
qcom_scm_bw_disable();
578+
579+
disable_clk:
579580
qcom_scm_clk_disable();
580581

581582
out:
@@ -637,10 +638,12 @@ int qcom_scm_pas_mem_setup(u32 peripheral, phys_addr_t addr, phys_addr_t size)
637638

638639
ret = qcom_scm_bw_enable();
639640
if (ret)
640-
return ret;
641+
goto disable_clk;
641642

642643
ret = qcom_scm_call(__scm->dev, &desc, &res);
643644
qcom_scm_bw_disable();
645+
646+
disable_clk:
644647
qcom_scm_clk_disable();
645648

646649
return ret ? : res.result[0];
@@ -672,10 +675,12 @@ int qcom_scm_pas_auth_and_reset(u32 peripheral)
672675

673676
ret = qcom_scm_bw_enable();
674677
if (ret)
675-
return ret;
678+
goto disable_clk;
676679

677680
ret = qcom_scm_call(__scm->dev, &desc, &res);
678681
qcom_scm_bw_disable();
682+
683+
disable_clk:
679684
qcom_scm_clk_disable();
680685

681686
return ret ? : res.result[0];
@@ -706,11 +711,12 @@ int qcom_scm_pas_shutdown(u32 peripheral)
706711

707712
ret = qcom_scm_bw_enable();
708713
if (ret)
709-
return ret;
714+
goto disable_clk;
710715

711716
ret = qcom_scm_call(__scm->dev, &desc, &res);
712-
713717
qcom_scm_bw_disable();
718+
719+
disable_clk:
714720
qcom_scm_clk_disable();
715721

716722
return ret ? : res.result[0];

0 commit comments

Comments
 (0)