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

Commit 9583cdc9 authored by Kyle Yan's avatar Kyle Yan Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: msm_bus: Integrate external APIs" into msm-4.8

parents f3fec412 0d01443c

drivers/soc/qcom/msm_bus/msm_bus_arb_rpmh.c

+5 −7
Original line number Diff line number Diff line 
/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved.

/* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 and
@@ -510,7 +510,7 @@ static void bcm_update_bus_req(struct device *dev, int ctx) 


		bcm_dev->lnode_list[lnode_idx].lnode_ab[ctx] =

			msm_bus_div64(cur_dev->node_info->agg_params.buswidth,

					cur_dev->node_bw[ctx].max_ab *

					cur_dev->node_bw[ctx].sum_ab *

					(uint64_t)bcm_dev->bcmdev->width);



		for (i = 0; i < bcm_dev->num_lnodes; i++) {
@@ -556,9 +556,6 @@ int bcm_remove_handoff_req(struct device *dev, void *data) 
	if (!bcm_dev->node_info->is_bcm_dev)

		goto exit_bcm_remove_handoff_req;



	bcm_dev->bcmdev->init_ab = 0;

	bcm_dev->bcmdev->init_ib = 0;



	for (i = 0; i < bcm_dev->num_lnodes; i++) {

		max_ib = max(max_ib,

				bcm_dev->lnode_list[i].lnode_ib[0]);
@@ -893,8 +890,6 @@ static void unregister_client_adhoc(uint32_t cl) 
		curr = 0;

	}



	MSM_BUS_DBG("%s: Unregistering client %p", __func__, client);



	for (i = 0; i < pdata->usecase->num_paths; i++) {

		src = client->pdata->usecase[curr].vectors[i].src;

		dest = client->pdata->usecase[curr].vectors[i].dst;
@@ -1110,6 +1105,8 @@ static int update_client_paths(struct msm_bus_client *client, bool log_trns, 
		} else {

			slp_clk = req_clk;

			slp_bw = req_bw;

			req_clk = 0;

			req_bw = 0;

		}



		ret = update_path(src_dev, dest, req_clk, req_bw, slp_clk,
@@ -1371,6 +1368,7 @@ static void unregister_adhoc(struct msm_bus_client_handle *cl) 
	commit_data();

	msm_bus_dbg_remove_client(cl);

	kfree(cl);

	MSM_BUS_DBG("%s: Unregistered client", __func__);

exit_unregister_client:

	rt_mutex_unlock(&msm_bus_adhoc_lock);

}

drivers/soc/qcom/msm_bus/msm_bus_fabric_rpmh.c

+208 −79
Original line number Diff line number Diff line
@@ -18,6 +18,9 @@ 
#include <linux/module.h>

#include <linux/slab.h>

//#include <soc/qcom/rpm-smd.h>

#include <soc/qcom/cmd-db.h>

#include <soc/qcom/rpmh.h>

#include <soc/qcom/tcs.h>

#include <trace/events/trace_msm_bus.h>

#include "msm_bus_core.h"

#include "msm_bus_rpmh.h"
@@ -25,13 +28,15 @@ 
#include "msm_bus_bimc.h"



#define BCM_TCS_CMD_COMMIT_SHFT		30

#define BCM_TCS_CMD_COMMIT_MASK		0x40000000

#define BCM_TCS_CMD_VALID_SHFT		29

#define BCM_TCS_CMD_VALID_MASK		0x20000000

#define BCM_TCS_CMD_VOTE_X_SHFT		14

#define BCM_TCS_CMD_VOTE_Y_SHFT		0

#define BCM_TCS_CMD_VOTE_MASK		0x3FFF

#define BCM_TCS_CMD_VOTE_X_SHFT		14

#define BCM_TCS_CMD_VOTE_Y_SHFT		0

#define BCM_TCS_CMD_VOTE_Y_MASK		0xFFFC000



#define BCM_VCD_MAX_CNT			10

#define VCD_MAX_CNT			16



#define BCM_TCS_CMD(commit, valid, vote_x, vote_y) \

	(((commit & 0x1) << BCM_TCS_CMD_COMMIT_SHFT) |\
@@ -41,12 +46,14 @@ 


static int msm_bus_dev_init_qos(struct device *dev, void *data);



struct list_head bcm_clist_inorder[BCM_VCD_MAX_CNT];

struct list_head bcm_clist_inorder[VCD_MAX_CNT];

static struct rpmh_client *mbox_apps;



struct tcs_cmd {

	u32 addr;	/* slv_id:18:16 | offset:0:15 */

	u32 data;	/* data for resource (or read response) */

	bool complete;	/* wait for completion before sending next */

struct bcm_db {

	uint32_t unit_size;

	uint16_t width;

	uint8_t clk_domain;

	uint8_t reserved;

};



ssize_t bw_show(struct device *dev, struct device_attribute *attr,
@@ -265,8 +272,6 @@ static int tcs_cmd_gen(struct msm_bus_node_device_type *cur_bcm, 
					uint64_t ab, bool commit)

{

	int ret = 0;

	uint32_t tcs_cmd_addr = 0;

	uint32_t tcs_cmd_data = 0;

	bool valid = true;



	if (ib == 0 && ab == 0) {
@@ -282,82 +287,110 @@ static int tcs_cmd_gen(struct msm_bus_node_device_type *cur_bcm, 
	if (ab > BCM_TCS_CMD_VOTE_MASK)

		ab = BCM_TCS_CMD_VOTE_MASK;



	tcs_cmd_addr = cur_bcm->bcmdev->addr;

	tcs_cmd_data = BCM_TCS_CMD(commit, valid, ib, ab);

	cmd->addr = cur_bcm->bcmdev->addr;

	cmd->data = BCM_TCS_CMD(commit, valid, ab, ib);

	cmd->complete = commit;



	return ret;

}



static int tcs_cmd_list_gen(uint32_t vcd_cnt, uint32_t *n,

				struct tcs_cmd *active_cmdlist,

				struct tcs_cmd *awake_cmdlist,

				struct tcs_cmd *sleep_cmdlist)

static int tcs_cmd_list_gen(int *n_active,

				int *n_wake,

				int *n_sleep,

				struct tcs_cmd *cmdlist_active,

				struct tcs_cmd *cmdlist_wake,

				struct tcs_cmd *cmdlist_sleep)

{

	struct msm_bus_node_device_type *cur_bcm = NULL;

	struct msm_bus_node_device_type *next_bcm = NULL;

	uint32_t bcm_cnt_amc = 0;

	uint32_t bcm_cnt_tcs = 0;

	int i = 0;

	int j = 0;

	int k = 0;

	bool commit;

	int idx = 0;

	int last_tcs = -1;

	bool commit = false;



	if ((cur_bcm->node_bw[DUAL_CTX].max_ab ==

				cur_bcm->node_bw[ACTIVE_CTX].max_ab) &&

				(cur_bcm->node_bw[DUAL_CTX].max_ib ==

				cur_bcm->node_bw[ACTIVE_CTX].max_ib))

	if (!cmdlist_active)

		goto exit_tcs_cmd_list_gen;



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

		if (list_empty(bcm_clist_inorder[i]))

		last_tcs = -1;

		if (list_empty(&bcm_clist_inorder[i]))

			continue;

		list_for_each_entry(cur_bcm, &bcm_clist_inorder[i], link)

			bcm_cnt_amc++;

		if ((cur_bcm->node_bw[DUAL_CTX].max_ab !=

				cur_bcm->node_bw[ACTIVE_CTX].max_ab) &&

				(cur_bcm->node_bw[DUAL_CTX].max_ib !=

				cur_bcm->node_bw[ACTIVE_CTX].max_ib))

			bcm_cnt_tcs++;

		vcd_cnt++;

		list_for_each_entry(cur_bcm, &bcm_clist_inorder[i], link) {

			if (cur_bcm->dirty) {

				if (last_tcs != -1 &&

					list_is_last(&cur_bcm->link,

						&bcm_clist_inorder[i])) {

					cmdlist_active[last_tcs].data |=

						BCM_TCS_CMD_COMMIT_MASK;

					cmdlist_active[last_tcs].complete

								= true;

				}

				continue;

			}

			n_active[idx]++;

			commit = false;

			if (list_is_last(&cur_bcm->link,

						&bcm_clist_inorder[i])) {

				commit = true;

				idx++;

			}

			tcs_cmd_gen(cur_bcm, &cmdlist_active[k],

				cur_bcm->node_bw[ACTIVE_CTX].max_ib,

				cur_bcm->node_bw[ACTIVE_CTX].max_ab, commit);

			k++;

			last_tcs = k;

			cur_bcm->dirty = true;

		}

	}



	n = kcalloc(vcd_cnt, sizeof(int), GFP_KERNEL);

	active_cmdlist = kcalloc(bcm_cnt_amc, sizeof(struct tcs_cmd),

								GFP_KERNEL);

	awake_cmdlist = kcalloc(bcm_cnt_tcs, sizeof(struct tcs_cmd),

								GFP_KERNEL);

	sleep_cmdlist = kcalloc(bcm_cnt_tcs, sizeof(struct tcs_cmd),

								GFP_KERNEL);

	if (!cmdlist_wake || !cmdlist_sleep)

		goto exit_tcs_cmd_list_gen;



	k = 0;

	idx = 0;

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

		if (list_empty(bcm_clist_inorder[i]))

		last_tcs = -1;

		if (list_empty(&bcm_clist_inorder[i]))

			continue;

		list_for_each_entry(cur_bcm, &bcm_clist_inorder[i], link) {

			n[i]++;

			list_is_last(&cur_bcm, &bcm_clist_inorder[i]) {

				i++;

				commit = true;

			}

			tcs_cmd_gen(cur_bcm, &active_cmdlist[j],

				cur_bcm->node_bw[ACTIVE_CTX].max_ab,

				cur_bcm->node_bw[ACTIVE_CTX].max_ib, commit);

			j++;

			commit = false;

			if ((cur_bcm->node_bw[DUAL_CTX].max_ab ==

				cur_bcm->node_bw[ACTIVE_CTX].max_ab) &&

				(cur_bcm->node_bw[DUAL_CTX].max_ib ==

				cur_bcm->node_bw[ACTIVE_CTX].max_ib))

				cur_bcm->node_bw[ACTIVE_CTX].max_ib)) {

				if (last_tcs != -1 &&

					list_is_last(&cur_bcm->link,

					&bcm_clist_inorder[i])) {

					cmdlist_wake[k].data |=

						BCM_TCS_CMD_COMMIT_MASK;

					cmdlist_sleep[k].data |=

						BCM_TCS_CMD_COMMIT_MASK;

					cmdlist_wake[k].complete = true;

					cmdlist_sleep[k].complete = true;

					idx++;

				}

				continue;

			}

			last_tcs = k;

			n_sleep[idx]++;

			if (list_is_last(&cur_bcm->link,

						&bcm_clist_inorder[i])) {

				commit = true;

				idx++;

			}



			tcs_cmd_gen(cur_bcm, &awake_cmdlist[k],

				cur_bcm->node_bw[DUAL_CTX].max_ab,

				cur_bcm->node_bw[DUAL_CTX].max_ib, commit);



			tcs_cmd_gen(cur_bcm, &sleep_cmdlist[k],

				cur_bcm->node_bw[DUAL_CTX].max_ab,

				cur_bcm->node_bw[DUAL_CTX].max_ib, commit);

			tcs_cmd_gen(cur_bcm, &cmdlist_wake[k],

				cur_bcm->node_bw[ACTIVE_CTX].max_ib,

				cur_bcm->node_bw[ACTIVE_CTX].max_ab, commit);

			tcs_cmd_gen(cur_bcm, &cmdlist_sleep[k],

				cur_bcm->node_bw[DUAL_CTX].max_ib,

				cur_bcm->node_bw[DUAL_CTX].max_ab, commit);

			k++;

		}

	}

	return bcm_cnt;



exit_tcs_cmd_list_gen:

	return k;

}



static int bcm_clist_add(struct msm_bus_node_device_type *cur_dev)
@@ -365,7 +398,6 @@ static int bcm_clist_add(struct msm_bus_node_device_type *cur_dev) 
	int ret = 0;

	int cur_vcd = 0;

	struct msm_bus_node_device_type *cur_bcm = NULL;

	struct msm_bus_node_device_type *tmp_bcm = NULL;



	if (!cur_dev->node_info->num_bcm_devs)

		goto exit_bcm_clist_add;
@@ -373,8 +405,32 @@ static int bcm_clist_add(struct msm_bus_node_device_type *cur_dev) 
	cur_bcm = to_msm_bus_node(cur_dev->node_info->bcm_devs[0]);

	cur_vcd = cur_bcm->bcmdev->clk_domain;



	list_add_tail(&bcm_clist_inorder[cur_vcd]);

	cur_bcm->dirty = true;

	if (!cur_bcm->dirty)

		list_add_tail(&cur_bcm->link, &bcm_clist_inorder[cur_vcd]);

	else

		cur_bcm->dirty = false;



exit_bcm_clist_add:

	return ret;

}



static int bcm_clist_clean(struct msm_bus_node_device_type *cur_dev)

{

	int ret = 0;

	struct msm_bus_node_device_type *cur_bcm = NULL;



	if (!cur_dev->node_info->num_bcm_devs)

		goto exit_bcm_clist_add;



	cur_bcm = to_msm_bus_node(cur_dev->node_info->bcm_devs[0]);



	if (cur_bcm->node_bw[DUAL_CTX].max_ab == 0 &&

			cur_bcm->node_bw[ACTIVE_CTX].max_ab == 0 &&

			cur_bcm->node_bw[DUAL_CTX].max_ib == 0 &&

			cur_bcm->node_bw[ACTIVE_CTX].max_ib == 0) {

		cur_bcm->dirty = false;

		list_del_init(&cur_bcm->link);

	}



exit_bcm_clist_add:

	return ret;
@@ -384,26 +440,81 @@ int msm_bus_commit_data(struct list_head *clist) 
{

	int ret = 0;

	int bcm_cnt;

	struct msm_bus_node_device_type *node;

	struct msm_bus_node_device_type *node_tmp;

	struct tcs_cmd *active_cmdlist = NULL;

	struct tcs_cmd *sleep_cmdlist = NULL;

	uint32_t *n = NULL;

	struct msm_bus_node_device_type *node = NULL;

	struct msm_bus_node_device_type *node_tmp = NULL;

	struct msm_bus_node_device_type *cur_bcm = NULL;

	struct tcs_cmd *cmdlist_active = NULL;

	struct tcs_cmd *cmdlist_wake = NULL;

	struct tcs_cmd *cmdlist_sleep = NULL;

	int *n_active = NULL;

	int *n_wake = NULL;

	int *n_sleep = NULL;

	int cnt_vcd = 0;

	int cnt_active = 0;

	int cnt_wake = 0;

	int cnt_sleep = 0;

	int i = 0;



	list_for_each_entry_safe(node, node_tmp, clist, link) {

		if (unlikely(node->node_info->defer_qos))

			msm_bus_dev_init_qos(&node->dev, NULL);



		bcm_clist_add(node);

	}



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

		if (list_empty(&bcm_clist_inorder[i]))

			continue;

		list_for_each_entry(cur_bcm, &bcm_clist_inorder[i], link) {

			if ((cur_bcm->node_bw[DUAL_CTX].max_ab !=

				cur_bcm->node_bw[ACTIVE_CTX].max_ab) ||

				(cur_bcm->node_bw[DUAL_CTX].max_ib !=

				cur_bcm->node_bw[ACTIVE_CTX].max_ib)) {

				cnt_sleep++;

				cnt_wake++;

			}

			if (!cur_bcm->dirty)

				cnt_active++;

		}

		cnt_vcd++;

	}



	n_active = kcalloc(cnt_vcd+1, sizeof(int), GFP_KERNEL);

	n_wake = kcalloc(cnt_vcd+1, sizeof(int), GFP_KERNEL);

	n_sleep = kcalloc(cnt_vcd+1, sizeof(int), GFP_KERNEL);



	cmdlist_active = kcalloc(cnt_active, sizeof(struct tcs_cmd),

								GFP_KERNEL);

	if (cnt_sleep && cnt_wake) {

		cmdlist_wake = kcalloc(cnt_wake, sizeof(struct tcs_cmd),

								GFP_KERNEL);

		cmdlist_sleep = kcalloc(cnt_sleep, sizeof(struct tcs_cmd),

								GFP_KERNEL);

	}

	bcm_cnt = tcs_cmd_list_gen(n_active, n_wake, n_sleep, cmdlist_active,

					cmdlist_wake, cmdlist_sleep);



	ret = rpmh_invalidate(mbox_apps);



	ret = rpmh_write_passthru(mbox_apps, RPMH_ACTIVE_ONLY_STATE,

						cmdlist_active, n_active);

	ret = rpmh_write_passthru(mbox_apps, RPMH_WAKE_ONLY_STATE,

						cmdlist_wake, n_wake);

	ret = rpmh_write_passthru(mbox_apps, RPMH_SLEEP_STATE,

						cmdlist_sleep, n_sleep);



	list_for_each_entry_safe(node, node_tmp, clist, link) {

		bcm_clist_clean(node);

		node->dirty = false;

		list_del_init(&node->link);

	}

	bcm_cnt = tcs_cmd_list_gen(vcd_cnt, n, active_cmdlist, sleep_cmdlist);

	// Insert calls to rpmh driver;

	kfree(active_cmdlist);

	kfree(sleep_cmdlist);

	kfree(n);



	kfree(cmdlist_active);

	kfree(cmdlist_wake);

	kfree(cmdlist_sleep);

	kfree(n_active);

	kfree(n_wake);

	kfree(n_sleep);

	return ret;

}
@@ -670,7 +781,9 @@ static int msm_bus_bcm_init(struct device *dev, 
{

	struct msm_bus_bcm_device_type *bcmdev;

	struct msm_bus_node_device_type *node_dev = NULL;

	struct bcm_db aux_data = {0};

	int ret = 0;

	int i = 0;



	node_dev = to_msm_bus_node(dev);

	if (!node_dev) {
@@ -686,12 +799,21 @@ static int msm_bus_bcm_init(struct device *dev, 
	}



	node_dev->bcmdev = bcmdev;

	if (!cmd_db_get_aux_data_len(node_dev->node_info->name)) {

		MSM_BUS_ERR("%s: Error getting bcm info, bcm:%s",

			__func__, node_dev->node_info->name);

		ret = -ENXIO;

		goto exit_bcm_init;

	}



	cmd_db_get_aux_data(node_dev->node_info->name, (u8 *)&aux_data,

						sizeof(struct bcm_db));



	//pending cmddb APIs

	bcmdev->width = 1;

	bcmdev->clk_domain = 0;

	bcmdev->addr = cmd_db_get_addr(node_dev->node_info->name);

	bcmdev->width = (uint32_t)aux_data.width;

	bcmdev->clk_domain = aux_data.clk_domain;

	bcmdev->unit_size = aux_data.unit_size;

	bcmdev->type = 0;

	bcmdev->unit_size = 1000000;

	bcmdev->num_bus_devs = 0;



	// Add way to count # of VCDs, initialize LL
@@ -1024,7 +1146,8 @@ static int msm_bus_setup_dev_conn(struct device *bus_dev, void *data) 
	}



	/* Setup parent bus device for this node */

	if (!bus_node->node_info->is_fab_dev) {

	if (!bus_node->node_info->is_fab_dev &&

		!bus_node->node_info->is_bcm_dev) {

		struct device *bus_parent_device =

			bus_find_device(&msm_bus_type, NULL,

				(void *)&bus_node->node_info->bus_device_id,
@@ -1090,7 +1213,7 @@ static int msm_bus_setup_dev_conn(struct device *bus_dev, void *data) 
			ret = -ENODEV;

			goto exit_setup_dev_conn;

		}

		bcm_node = to_bcm_bus_node(bus_node->node_info->bcm_devs[j]);

		bcm_node = to_msm_bus_node(bus_node->node_info->bcm_devs[j]);

		bcm_node->bcmdev->num_bus_devs++;

	}
@@ -1224,6 +1347,12 @@ static int msm_bus_device_probe(struct platform_device *pdev) 
	msm_bus_arb_setops_adhoc(&arb_ops);

	bus_for_each_dev(&msm_bus_type, NULL, NULL, msm_bus_node_debug);



	mbox_apps = rpmh_get_byname(pdev, "apps_rsc");

	if (IS_ERR_OR_NULL(mbox_apps)) {

		MSM_BUS_ERR("%s: mbox failure", __func__);

		return PTR_ERR(mbox_apps);

	}



	devm_kfree(&pdev->dev, pdata->info);

	devm_kfree(&pdev->dev, pdata);

exit_device_probe:

include/dt-bindings/msm/msm-bus-ids.h

+100 −7
Original line number Diff line number Diff line
@@ -39,8 +39,49 @@ 
#define	MSM_BUS_FAB_A2_NOC 6147

#define	MSM_BUS_FAB_GNOC 6148

#define	MSM_BUS_FAB_CR_VIRT 6149

#define	MSM_BUS_FAB_DC_NOC 6150

#define	MSM_BUS_FAB_MC_VIRT 6151

#define	MSM_BUS_FAB_MEM_NOC 6152



#define	MSM_BUS_BCM_MC0 0

#define	MSM_BUS_BCM_MC0 7000

#define	MSM_BUS_BCM_MC1 7001

#define	MSM_BUS_BCM_MC2 7002

#define	MSM_BUS_BCM_SH0 7003

#define	MSM_BUS_BCM_SH1 7004

#define	MSM_BUS_BCM_SH2 7005

#define	MSM_BUS_BCM_SH3 7006

#define	MSM_BUS_BCM_SH4 7007

#define	MSM_BUS_BCM_SH5 7008

#define	MSM_BUS_BCM_SH6 7009

#define	MSM_BUS_BCM_SH7 7010

#define	MSM_BUS_BCM_MM0 7011

#define	MSM_BUS_BCM_MM1 7012

#define	MSM_BUS_BCM_MM2 7013

#define	MSM_BUS_BCM_MM3 7014

#define	MSM_BUS_BCM_MM4 7015

#define	MSM_BUS_BCM_MM5 7016

#define	MSM_BUS_BCM_MM6 7017

#define	MSM_BUS_BCM_SN0 7018

#define	MSM_BUS_BCM_SN1 7019

#define	MSM_BUS_BCM_SN2 7020

#define	MSM_BUS_BCM_SN3 7021

#define	MSM_BUS_BCM_SN4 7022

#define	MSM_BUS_BCM_SN5 7023

#define	MSM_BUS_BCM_SN6 7024

#define	MSM_BUS_BCM_SN7 7025

#define	MSM_BUS_BCM_SN8 7026

#define	MSM_BUS_BCM_SN9 7027

#define	MSM_BUS_BCM_SN10 7028

#define	MSM_BUS_BCM_SN11 7029

#define	MSM_BUS_BCM_SN12 7030

#define	MSM_BUS_BCM_SN13 7031

#define	MSM_BUS_BCM_SN14 7032

#define	MSM_BUS_BCM_SN15 7033

#define	MSM_BUS_BCM_CE0 7034

#define	MSM_BUS_BCM_IP0 7035

#define	MSM_BUS_BCM_CN0 7036

#define	MSM_BUS_BCM_ACV 7037

#define	MSM_BUS_BCM_ALC 7038



#define	MSM_BUS_MASTER_FIRST 1

#define	MSM_BUS_MASTER_AMPSS_M0 1
@@ -164,7 +205,29 @@ 
#define	MSM_BUS_MASTER_CNOC_A2NOC 118

#define	MSM_BUS_MASTER_WLAN 119

#define	MSM_BUS_MASTER_MSS_CE 120

#define	MSM_BUS_MASTER_MASTER_LAST 121

#define	MSM_BUS_MASTER_A1NOC_CFG 121

#define	MSM_BUS_MASTER_UFS_CARD 122

#define	MSM_BUS_MASTER_UFS_MEM 123

#define	MSM_BUS_MASTER_A2NOC_CFG 124

#define	MSM_BUS_MASTER_CRYPTO_CORE_0 125

#define	MSM_BUS_MASTER_CNOC_DC_NOC 126

#define	MSM_BUS_MASTER_GNOC_CFG 127

#define	MSM_BUS_MASTER_MEM_NOC_GNOC 128

#define	MSM_BUS_MASTER_LLCC 129

#define	MSM_BUS_MASTER_MEM_NOC_CFG 130

#define	MSM_BUS_MASTER_GNOC_MEM_NOC 131

#define	MSM_BUS_MASTER_MNOC_HF_MEM_NOC 132

#define	MSM_BUS_MASTER_MNOC_SF_MEM_NOC 133

#define	MSM_BUS_MASTER_SNOC_GC_MEM_NOC 134

#define	MSM_BUS_MASTER_SNOC_SF_MEM_NOC 135

#define	MSM_BUS_MASTER_CAMNOC_HF 136

#define	MSM_BUS_MASTER_CAMNOC_SF 137

#define	MSM_BUS_MASTER_VIDEO_PROC 138

#define	MSM_BUS_MASTER_GNOC_SNOC 139

#define	MSM_BUS_MASTER_ANOC_PCIE_SNOC 140

#define	MSM_BUS_MASTER_PIMEM 141

#define	MSM_BUS_MASTER_MEM_NOC_SNOC 142

#define	MSM_BUS_MASTER_MASTER_LAST 143



#define	MSM_BUS_SYSTEM_FPB_MASTER_SYSTEM MSM_BUS_SYSTEM_MASTER_SYSTEM_FPB

#define	MSM_BUS_CPSS_FPB_MASTER_SYSTEM MSM_BUS_SYSTEM_MASTER_CPSS_FPB
@@ -465,7 +528,37 @@ 
#define	MSM_BUS_SLAVE_TLMM_NORTH 731

#define	MSM_BUS_SLAVE_TLMM_WEST 732

#define	MSM_BUS_SLAVE_SKL 733

#define	MSM_BUS_SLAVE_LAST 734

#define	MSM_BUS_SLAVE_SERVICE_A1NOC 744

#define	MSM_BUS_SLAVE_ANOC_PCIE_SNOC 745

#define	MSM_BUS_SLAVE_SERVICE_A2NOC 746

#define	MSM_BUS_SLAVE_AOP 747

#define	MSM_BUS_SLAVE_AOSS 748

#define	MSM_BUS_SLAVE_CDSP_CFG 749

#define	MSM_BUS_SLAVE_CNOC_DDRSS 750

#define	MSM_BUS_SLAVE_USB3_1 751

#define	MSM_BUS_SLAVE_SOUTH_PHY_CFG 752

#define	MSM_BUS_SLAVE_SPSS_CFG 753

#define	MSM_BUS_SLAVE_TLMM_SOUTH 755

#define	MSM_BUS_SLAVE_UFS_CARD_CFG 756

#define	MSM_BUS_SLAVE_UFS_MEM_CFG 757

#define	MSM_BUS_SLAVE_VSENSE_CTRL_CFG 758

#define	MSM_BUS_SLAVE_LLCC_CFG 760

#define	MSM_BUS_SLAVE_MEM_NOC_CFG 761

#define	MSM_BUS_SLAVE_GNOC_MEM_NOC 763

#define	MSM_BUS_SLAVE_SERVICE_GNOC 764

#define	MSM_BUS_SLAVE_MSS_PROC_MS_MPU_CFG 765

#define	MSM_BUS_SLAVE_MEM_NOC_GNOC 766

#define	MSM_BUS_SLAVE_CDC_SNOC_GC 767

#define	MSM_BUS_SLAVE_CDC_SNOC_SF 768

#define	MSM_BUS_SLAVE_CDC_TCU 769

#define	MSM_BUS_SLAVE_LLCC 770

#define	MSM_BUS_SLAVE_SERVICE_MEM_NOC 771

#define	MSM_BUS_SLAVE_MNOC_SF_MEM_NOC 772

#define	MSM_BUS_SLAVE_MNOC_HF_MEM_NOC 773

#define	MSM_BUS_SLAVE_SNOC_MEM_NOC_GC 774

#define	MSM_BUS_SLAVE_SNOC_MEM_NOC_SF 775

#define	MSM_BUS_SLAVE_MEM_NOC_SNOC 776

#define	MSM_BUS_SLAVE_LAST 777



#define	MSM_BUS_SYSTEM_FPB_SLAVE_SYSTEM  MSM_BUS_SYSTEM_SLAVE_SYSTEM_FPB

#define	MSM_BUS_CPSS_FPB_SLAVE_SYSTEM MSM_BUS_SYSTEM_SLAVE_CPSS_FPB