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: 65b7ebda5028 ("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>

diff --git a/drivers/firmware/qcom/qcom_scm.c b/drivers/firmware/qcom/qcom_scm.c
index 520de9b5633abc5aab075400b7feb6b97dcef97c..e8460626fb0c402bef9d17f05b2ba9515138c7bf 100644 (file)
--- a/drivers/firmware/qcom/qcom_scm.c
+++ b/drivers/firmware/qcom/qcom_scm.c
@@ -569,13 +569,14 @@ int qcom_scm_pas_init_image(u32 peripheral, const void *metadata, size_t size,
 
        ret = qcom_scm_bw_enable();
        if (ret)
-               return ret;
+               goto disable_clk;
 
        desc.args[1] = mdata_phys;
 
        ret = qcom_scm_call(__scm->dev, &desc, &res);
-
        qcom_scm_bw_disable();
+
+disable_clk:
        qcom_scm_clk_disable();
 
 out:
@@ -637,10 +638,12 @@ int qcom_scm_pas_mem_setup(u32 peripheral, phys_addr_t addr, phys_addr_t size)
 
        ret = qcom_scm_bw_enable();
        if (ret)
-               return ret;
+               goto disable_clk;
 
        ret = qcom_scm_call(__scm->dev, &desc, &res);
        qcom_scm_bw_disable();
+
+disable_clk:
        qcom_scm_clk_disable();
 
        return ret ? : res.result[0];
@@ -672,10 +675,12 @@ int qcom_scm_pas_auth_and_reset(u32 peripheral)
 
        ret = qcom_scm_bw_enable();
        if (ret)
-               return ret;
+               goto disable_clk;
 
        ret = qcom_scm_call(__scm->dev, &desc, &res);
        qcom_scm_bw_disable();
+
+disable_clk:
        qcom_scm_clk_disable();
 
        return ret ? : res.result[0];
@@ -706,11 +711,12 @@ int qcom_scm_pas_shutdown(u32 peripheral)
 
        ret = qcom_scm_bw_enable();
        if (ret)
-               return ret;
+               goto disable_clk;
 
        ret = qcom_scm_call(__scm->dev, &desc, &res);
-
        qcom_scm_bw_disable();
+
+disable_clk:
        qcom_scm_clk_disable();
 
        return ret ? : res.result[0];