Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 058dad3c authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge changes If445e08c,Idbee6c98,Idb036bbb into msm-next 

* changes:
  ARM: dts: msm: Introduce topology for sdm855
  msm: msm_bus: Change RPMH call names
  msm: msm_bus: Add msm bus trace header snapshot
parents 2dbd77e7 76d819e7

arch/arm64/boot/dts/qcom/sdm855-bus.dtsi

0 → 100644
+2103 −0

File added.

Preview size limit exceeded, changes collapsed.

arch/arm64/boot/dts/qcom/sdm855.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -1566,6 +1566,7 @@ 
#include "sdm855-pinctrl.dtsi"

#include "sdm855-regulator.dtsi"

#include "sdm855-ion.dtsi"

#include "sdm855-bus.dtsi"

#include "sdm855-smp2p.dtsi"

#include "sdm855-coresight.dtsi"

#include "msm-arm-smmu-sdm855.dtsi"

drivers/soc/qcom/msm_bus/msm_bus_arb_rpmh.c

+1 −1
Original line number Diff line number Diff line
@@ -417,6 +417,7 @@ static int getpath(struct device *src_dev, int dest, const char *cl_name) 


	while ((!found && !list_empty(&traverse_list))) {

		struct msm_bus_node_device_type *bus_node = NULL;

		unsigned int i;

		/* Locate dest_id in the traverse list */

		list_for_each_entry(bus_node, &traverse_list, link) {

			if (bus_node->node_info->id == dest) {
@@ -425,7 +426,6 @@ static int getpath(struct device *src_dev, int dest, const char *cl_name) 
			}

		}



		unsigned int i;

		/* Setup the new edge list */

		list_for_each_entry(bus_node, &traverse_list, link) {

			/* Setup list of black-listed nodes */

drivers/soc/qcom/msm_bus/msm_bus_dbg.c

+0 −1
Original line number Diff line number Diff line
@@ -554,7 +554,6 @@ static ssize_t msm_bus_dbg_update_request_write(struct file *file, 
	list_for_each_entry(cldata, &cl_list, list) {

		if (strnstr(chid, cldata->pdata->name, cnt)) {

			found = 1;

			cldata = cldata;

			strsep(&chid, " ");

			if (chid) {

				ret = kstrtoul(chid, 10, &index);

drivers/soc/qcom/msm_bus/msm_bus_fabric_rpmh.c

+3 −3
Original line number Diff line number Diff line
@@ -609,20 +609,20 @@ int msm_bus_commit_data(struct list_head *clist) 
		ret = rpmh_write(cur_mbox, cur_rsc->rscdev->req_state,

						cmdlist_active, cnt_active);

	else

		ret = rpmh_write_passthru(cur_mbox, cur_rsc->rscdev->req_state,

		ret = rpmh_write_batch(cur_mbox, cur_rsc->rscdev->req_state,

						cmdlist_active, n_active);

	if (ret)

		MSM_BUS_ERR("%s: error sending active/awake sets: %d\n",

						__func__, ret);





	ret = rpmh_write_passthru(cur_mbox, RPMH_WAKE_ONLY_STATE,

	ret = rpmh_write_batch(cur_mbox, RPMH_WAKE_ONLY_STATE,

						cmdlist_wake, n_wake);

	if (ret)

		MSM_BUS_ERR("%s: error sending wake sets: %d\n",

						__func__, ret);



	ret = rpmh_write_passthru(cur_mbox, RPMH_SLEEP_STATE,

	ret = rpmh_write_batch(cur_mbox, RPMH_SLEEP_STATE,

						cmdlist_sleep, n_sleep);

	if (ret)

		MSM_BUS_ERR("%s: error sending sleep sets: %d\n",