Patch "interconnect: qcom: icc-rpmh: probe defer incase of missing QoS clock dependency" has been added to the 6.11-stable tree

[Sasha Levin <sashal@xxxxxxxxxx>]

This is a note to let you know that I've just added the patch titled

    interconnect: qcom: icc-rpmh: probe defer incase of missing QoS clock dependency

to the 6.11-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     interconnect-qcom-icc-rpmh-probe-defer-incase-of-mis.patch
and it can be found in the queue-6.11 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.



commit b48851dbbd76aa10c2a4e336465e73587f660f81
Author: Raviteja Laggyshetty <quic_rlaggysh@xxxxxxxxxxx>
Date:   Wed Sep 11 09:45:16 2024 +0000

    interconnect: qcom: icc-rpmh: probe defer incase of missing QoS clock dependency
    
    [ Upstream commit 05123e3299dd6aa02508469b303262338c2a661c ]
    
    Return -EPROBE_DEFER from interconnect provider incase probe defer is
    received from devm_clk_bulk_get_all(). This would help in reattempting
    the inteconnect driver probe, once the required QoS clocks are
    available.
    
    Suggested-by: Bjorn Andersson <andersson@xxxxxxxxxx>
    Signed-off-by: Raviteja Laggyshetty <quic_rlaggysh@xxxxxxxxxxx>
    Reviewed-by: Konrad Dybcio <konradybcio@xxxxxxxxxx>
    Fixes: 0a7be6b35da8 ("interconnect: qcom: icc-rpmh: Add QoS configuration support")
    Link: https://lore.kernel.org/r/20240911094516.16901-1-quic_rlaggysh@xxxxxxxxxxx
    Signed-off-by: Georgi Djakov <djakov@xxxxxxxxxx>
    Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>

diff --git a/drivers/interconnect/qcom/icc-rpmh.c b/drivers/interconnect/qcom/icc-rpmh.c
index f49a8e0cb03c0..adacd6f7d6a8f 100644
--- a/drivers/interconnect/qcom/icc-rpmh.c
+++ b/drivers/interconnect/qcom/icc-rpmh.c
@@ -311,6 +311,9 @@ int qcom_icc_rpmh_probe(struct platform_device *pdev)
 		}
 
 		qp->num_clks = devm_clk_bulk_get_all(qp->dev, &qp->clks);
+		if (qp->num_clks == -EPROBE_DEFER)
+			return dev_err_probe(dev, qp->num_clks, "Failed to get QoS clocks\n");
+
 		if (qp->num_clks < 0 || (!qp->num_clks && desc->qos_clks_required)) {
 			dev_info(dev, "Skipping QoS, failed to get clk: %d\n", qp->num_clks);
 			goto skip_qos_config;