Commit e1b2fa61 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'icc-6.7-rc5' of... 

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: default avatarGeorgi 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
parents a39b6ac3 9085b23b

drivers/interconnect/core.c

+3 −0
Original line number Diff line number Diff line
@@ -395,6 +395,9 @@ struct icc_node_data *of_icc_get_from_provider(struct of_phandle_args *spec) 
	}

	mutex_unlock(&icc_lock);



	if (!node)

		return ERR_PTR(-EINVAL);



	if (IS_ERR(node))

		return ERR_CAST(node);

drivers/interconnect/qcom/icc-rpm.c

+1 −1
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ static u64 qcom_icc_calc_rate(struct qcom_icc_provider *qp, struct qcom_icc_node 


	if (qn->ib_coeff) {

		agg_peak_rate = qn->max_peak[ctx] * 100;

		agg_peak_rate = div_u64(qn->max_peak[ctx], qn->ib_coeff);

		agg_peak_rate = div_u64(agg_peak_rate, qn->ib_coeff);

	} else {

		agg_peak_rate = qn->max_peak[ctx];

	}

drivers/interconnect/qcom/sm8250.c

+1 −0
Original line number Diff line number Diff line
@@ -1995,6 +1995,7 @@ static struct platform_driver qnoc_driver = { 
	.driver = {

		.name = "qnoc-sm8250",

		.of_match_table = qnoc_of_match,

		.sync_state = icc_sync_state,

	},

};

module_platform_driver(qnoc_driver);