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

Merge tag 'icc-5.10-rc2' of https://git.linaro.org/people/georgi.djakov/linux into char-misc-linus 



Georgi writes:

interconnect fixes for v5.10

This contains one core fix and a few driver fixes.
- Fix the core to perform also aggregation when setting the initial
  bandwidth with sync_state.
- Fixes in some drivers to make sure the correct sequence is used for
  initialization when we use sync_state.
- Fix in the sdm845 driver to prevent a board hang that was hit when
  bandwidth scaling for display and multimedia was enabled.

Signed-off-by: default avatarGeorgi Djakov <georgi.djakov@linaro.org>

* tag 'icc-5.10-rc2' of https://git.linaro.org/people/georgi.djakov/linux:
  interconnect: qcom: use icc_sync state for sm8[12]50
  interconnect: qcom: Ensure that the floor bandwidth value is enforced
  interconnect: qcom: sc7180: Init BCMs before creating the nodes
  interconnect: qcom: sdm845: Init BCMs before creating the nodes
  interconnect: Aggregate before setting initial bandwidth
  interconnect: qcom: sdm845: Enable keepalive for the MM1 BCM
parents 80624263 fce52ad3

drivers/interconnect/core.c

+3 −0
Original line number Diff line number Diff line
@@ -971,6 +971,9 @@ void icc_node_add(struct icc_node *node, struct icc_provider *provider) 
	}

	node->avg_bw = node->init_avg;

	node->peak_bw = node->init_peak;

	if (provider->aggregate)

		provider->aggregate(node, 0, node->init_avg, node->init_peak,

				    &node->avg_bw, &node->peak_bw);

	provider->set(node, node);

	node->avg_bw = 0;

	node->peak_bw = 0;

drivers/interconnect/qcom/icc-rpmh.c

+7 −0
Original line number Diff line number Diff line
@@ -79,6 +79,7 @@ EXPORT_SYMBOL_GPL(qcom_icc_aggregate); 
int qcom_icc_set(struct icc_node *src, struct icc_node *dst)

{

	struct qcom_icc_provider *qp;

	struct qcom_icc_node *qn;

	struct icc_node *node;



	if (!src)
@@ -87,6 +88,12 @@ int qcom_icc_set(struct icc_node *src, struct icc_node *dst) 
		node = src;



	qp = to_qcom_provider(node->provider);

	qn = node->data;



	qn->sum_avg[QCOM_ICC_BUCKET_AMC] = max_t(u64, qn->sum_avg[QCOM_ICC_BUCKET_AMC],

						 node->avg_bw);

	qn->max_peak[QCOM_ICC_BUCKET_AMC] = max_t(u64, qn->max_peak[QCOM_ICC_BUCKET_AMC],

						  node->peak_bw);



	qcom_icc_bcm_voter_commit(qp->voter);

drivers/interconnect/qcom/sc7180.c

+3 −3
Original line number Diff line number Diff line
@@ -553,6 +553,9 @@ static int qnoc_probe(struct platform_device *pdev) 
		return ret;

	}



	for (i = 0; i < qp->num_bcms; i++)

		qcom_icc_bcm_init(qp->bcms[i], &pdev->dev);



	for (i = 0; i < num_nodes; i++) {

		size_t j;
@@ -576,9 +579,6 @@ static int qnoc_probe(struct platform_device *pdev) 
	}

	data->num_nodes = num_nodes;



	for (i = 0; i < qp->num_bcms; i++)

		qcom_icc_bcm_init(qp->bcms[i], &pdev->dev);



	platform_set_drvdata(pdev, qp);



	return 0;

drivers/interconnect/qcom/sdm845.c

+4 −4
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ DEFINE_QBCM(bcm_mc0, "MC0", true, &ebi); 
DEFINE_QBCM(bcm_sh0, "SH0", true, &qns_llcc);

DEFINE_QBCM(bcm_mm0, "MM0", false, &qns_mem_noc_hf);

DEFINE_QBCM(bcm_sh1, "SH1", false, &qns_apps_io);

DEFINE_QBCM(bcm_mm1, "MM1", false, &qxm_camnoc_hf0_uncomp, &qxm_camnoc_hf1_uncomp, &qxm_camnoc_sf_uncomp, &qxm_camnoc_hf0, &qxm_camnoc_hf1, &qxm_mdp0, &qxm_mdp1);

DEFINE_QBCM(bcm_mm1, "MM1", true, &qxm_camnoc_hf0_uncomp, &qxm_camnoc_hf1_uncomp, &qxm_camnoc_sf_uncomp, &qxm_camnoc_hf0, &qxm_camnoc_hf1, &qxm_mdp0, &qxm_mdp1);

DEFINE_QBCM(bcm_sh2, "SH2", false, &qns_memnoc_snoc);

DEFINE_QBCM(bcm_mm2, "MM2", false, &qns2_mem_noc);

DEFINE_QBCM(bcm_sh3, "SH3", false, &acm_tcu);
@@ -489,6 +489,9 @@ static int qnoc_probe(struct platform_device *pdev) 
		return ret;

	}



	for (i = 0; i < qp->num_bcms; i++)

		qcom_icc_bcm_init(qp->bcms[i], &pdev->dev);



	for (i = 0; i < num_nodes; i++) {

		size_t j;
@@ -512,9 +515,6 @@ static int qnoc_probe(struct platform_device *pdev) 
	}

	data->num_nodes = num_nodes;



	for (i = 0; i < qp->num_bcms; i++)

		qcom_icc_bcm_init(qp->bcms[i], &pdev->dev);



	platform_set_drvdata(pdev, qp);



	return 0;

drivers/interconnect/qcom/sm8150.c

+4 −3
Original line number Diff line number Diff line
@@ -551,6 +551,9 @@ static int qnoc_probe(struct platform_device *pdev) 
		return ret;

	}



	for (i = 0; i < qp->num_bcms; i++)

		qcom_icc_bcm_init(qp->bcms[i], &pdev->dev);



	for (i = 0; i < num_nodes; i++) {

		size_t j;
@@ -574,9 +577,6 @@ static int qnoc_probe(struct platform_device *pdev) 
	}

	data->num_nodes = num_nodes;



	for (i = 0; i < qp->num_bcms; i++)

		qcom_icc_bcm_init(qp->bcms[i], &pdev->dev);



	platform_set_drvdata(pdev, qp);



	return 0;
@@ -627,6 +627,7 @@ static struct platform_driver qnoc_driver = { 
	.driver = {

		.name = "qnoc-sm8150",

		.of_match_table = qnoc_of_match,

		.sync_state = icc_sync_state,

	},

};

module_platform_driver(qnoc_driver);

CRA Git | Maintained and supported by SUSTech CRA and CCSE