Skip to content

Commit e1b2fa6

Browse files
committed
Merge tag 'icc-6.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc into char-misc-linus
Georgi writes: interconnect fixes for v6.7-rc This contains fixes for reported issues. One fix is in framework code to explicitly treat returned NULL nodes as error when the device-tree data is translated into endpoint nodes. The other two fixes are in driver code. One is expected to improve the power consumption on the sm8250 platforms and the other one is fixing a bandwidth calculation formula that was introduced during this cycle. - interconnect: Treat xlate() returning NULL node as an error - interconnect: qcom: sm8250: Enable sync_state - interconnect: qcom: icc-rpm: Fix peak rate calculation Signed-off-by: Georgi Djakov <djakov@kernel.org> * tag 'icc-6.7-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc: interconnect: qcom: icc-rpm: Fix peak rate calculation interconnect: qcom: sm8250: Enable sync_state interconnect: Treat xlate() returning NULL node as an error
2 parents a39b6ac + 9085b23 commit e1b2fa6

File tree

3 files changed

+5
-1
lines changed

3 files changed

+5
-1
lines changed

drivers/interconnect/core.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -395,6 +395,9 @@ struct icc_node_data *of_icc_get_from_provider(struct of_phandle_args *spec)
395395
}
396396
mutex_unlock(&icc_lock);
397397

398+
if (!node)
399+
return ERR_PTR(-EINVAL);
400+
398401
if (IS_ERR(node))
399402
return ERR_CAST(node);
400403

drivers/interconnect/qcom/icc-rpm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ static u64 qcom_icc_calc_rate(struct qcom_icc_provider *qp, struct qcom_icc_node
307307

308308
if (qn->ib_coeff) {
309309
agg_peak_rate = qn->max_peak[ctx] * 100;
310-
agg_peak_rate = div_u64(qn->max_peak[ctx], qn->ib_coeff);
310+
agg_peak_rate = div_u64(agg_peak_rate, qn->ib_coeff);
311311
} else {
312312
agg_peak_rate = qn->max_peak[ctx];
313313
}

drivers/interconnect/qcom/sm8250.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1995,6 +1995,7 @@ static struct platform_driver qnoc_driver = {
19951995
.driver = {
19961996
.name = "qnoc-sm8250",
19971997
.of_match_table = qnoc_of_match,
1998+
.sync_state = icc_sync_state,
19981999
},
19992000
};
20002001
module_platform_driver(qnoc_driver);

0 commit comments

Comments
 (0)