From 5f4a63de18fea0b4d026c2f600ba92913ae229e1 Mon Sep 17 00:00:00 2001 From: Xubin Bai Date: Mon, 11 Jul 2022 18:51:40 -0700 Subject: [PATCH] interconnect: qcom: Add the stub version for qcom_icc_pre_aggregate Every BCM is added to the commit list in pre_aggregate() when probe, but calling display/camera BCM Voter can cause a crash until after display/camera HW are up. We need work around this by stubbing pre_aggregate callback. Change-Id: I2d0b76a9658b45f926b9db83b7c3669996fd5329 Signed-off-by: Xubin Bai --- drivers/interconnect/qcom/icc-rpmh.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/drivers/interconnect/qcom/icc-rpmh.c b/drivers/interconnect/qcom/icc-rpmh.c index 766b7fe95a90..a23852655411 100644 --- a/drivers/interconnect/qcom/icc-rpmh.c +++ b/drivers/interconnect/qcom/icc-rpmh.c @@ -45,6 +45,10 @@ void qcom_icc_pre_aggregate(struct icc_node *node) } EXPORT_SYMBOL_GPL(qcom_icc_pre_aggregate); +static void qcom_icc_pre_aggregate_stub(struct icc_node *node) +{ +} + /** * qcom_icc_aggregate - aggregate bw for buckets indicated by tag * @node: node to aggregate @@ -353,7 +357,7 @@ int qcom_icc_rpmh_probe(struct platform_device *pdev) provider = &qp->provider; provider->dev = dev; provider->set = qcom_icc_set_stub; - provider->pre_aggregate = qcom_icc_pre_aggregate; + provider->pre_aggregate = qcom_icc_pre_aggregate_stub; provider->aggregate = qcom_icc_aggregate_stub; provider->xlate_extended = qcom_icc_xlate_extended; INIT_LIST_HEAD(&provider->nodes); @@ -435,6 +439,7 @@ int qcom_icc_rpmh_probe(struct platform_device *pdev) if (!qp->stub) { provider->set = qcom_icc_set; + provider->pre_aggregate = qcom_icc_pre_aggregate; provider->aggregate = qcom_icc_aggregate; }