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

Commit e6c7c926 authored by Girish Mahadevan's avatar Girish Mahadevan
Browse files

msm: msm_bus: Introduce new dynamic throttling scheme 



Introduce a new dynamic throttling scheme for certain "non-real time"
masters based on the available bus bandwidth and the currently voted
bandwidth requirements of some "real time" masters.

Change-Id: Icf019f89bbe2425c706f2fc49884f41110a78299
Signed-off-by: default avatarGirish Mahadevan <girishm@codeaurora.org>
parent 11e8434e

Documentation/devicetree/bindings/arm/msm/msm_bus.txt

+14 −1
Original line number Diff line number Diff line
@@ -34,6 +34,11 @@ qcom,ahb: A boolean flag indicating whether the bus is ahb type. 
qcom,virt:		A boolean property indicating this is a virtual bus.

reg:			Register space of the bus device. Not required in case

			the bus is virtual.

qom,nr-lim-thresh	The threshold below which to apply throttling of non

			real time masters.

qcom,eff-fact		The DDR effeciency factor to be assumed. This only

			comes into play for buses that connect to the DDR.





The following properties are optional as collecting data via coresight might

not be supported for every bus. The documentation for coresight properties
@@ -121,7 +126,15 @@ qcom,thresh: Beyond this threshold frequency, the mode usage is 
			making the decision to switch QoS modes and applying the

			corresponding qcom,bimc,bw limitig bw as needed.

			This is specified in KBytes/s.



qcom,rt-mas:		Indicates if a master node is a realtime master with

			hard deadlines.

qcom,nr-lim:		Indicates that this is non-real time master which can

			be throttled in case of concurrent scenarios.

qcom,floor-bw:		Represents the floor bandwidth below which this master

			cannot be throttled. This floor bandwidth is specified in

			KBytes/s.

qcom,ff:		The fudge factor used by clients when voting for

			bandwidth from the node.

drivers/platform/msm/msm_bus/msm_bus_arb.c

+310 −2
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
#include <linux/clk.h>

#include <linux/msm-bus.h>

#include "msm_bus_core.h"

#include <trace/events/trace_msm_bus.h>



#define INDEX_MASK 0x0000FFFF

#define PNODE_MASK 0xFFFF0000
@@ -31,6 +32,11 @@ 
#define IS_NODE(n) ((n) % FABRIC_ID_KEY)

#define SEL_FAB_CLK 1

#define SEL_SLAVE_CLK 0

/*

 * To get to BIMC BW convert Hz to bytes by multiplying bus width(8),

 * double-data-rate(2) * ddr-channels(2).

 */

#define GET_BIMC_BW(clk)	(clk * 8 * 2 * 2)



#define BW_TO_CLK_FREQ_HZ(width, bw) \

	msm_bus_div64(width, bw)
@@ -312,6 +318,287 @@ static uint64_t get_node_maxib(struct msm_bus_inode_info *info) 
	return maxib;

}





static uint64_t get_node_sumab(struct msm_bus_inode_info *info)

{

	int i;

	uint64_t maxab = 0;



	for (i = 0; i <= info->num_pnodes; i++)

		maxab += info->pnode[i].bw[DUAL_CTX];



	MSM_BUS_DBG("%s: Node %d numpnodes %d maxib %llu", __func__,

		info->num_pnodes, info->node_info->id, maxab);

	return maxab;

}



static uint64_t get_vfe_bw(void)

{

	int vfe_id = MSM_BUS_MASTER_VFE;

	int iid = msm_bus_board_get_iid(vfe_id);

	int fabid;

	struct msm_bus_fabric_device *fabdev;

	struct msm_bus_inode_info *info;

	uint64_t vfe_bw = 0;



	fabid = GET_FABID(iid);

	fabdev = msm_bus_get_fabric_device(fabid);

	info = fabdev->algo->find_node(fabdev, iid);



	if (!info) {

		MSM_BUS_ERR("%s: Can't find node %d", __func__,

						vfe_id);

		goto exit_get_vfe_bw;

	}



	vfe_bw = get_node_sumab(info);

	MSM_BUS_DBG("vfe_ab %llu", vfe_bw);



exit_get_vfe_bw:

	return vfe_bw;

}



static uint64_t get_mdp_bw(void)

{

	int ids[] = {MSM_BUS_MASTER_MDP_PORT0, MSM_BUS_MASTER_MDP_PORT1};

	int i;

	uint64_t mdp_ab = 0;

	uint32_t ff = 0;



	for (i = 0; i < ARRAY_SIZE(ids); i++) {

		int iid = msm_bus_board_get_iid(ids[i]);

		int fabid;

		struct msm_bus_fabric_device *fabdev;

		struct msm_bus_inode_info *info;



		fabid = GET_FABID(iid);

		fabdev = msm_bus_get_fabric_device(fabid);

		info = fabdev->algo->find_node(fabdev, iid);



		if (!info) {

			MSM_BUS_ERR("%s: Can't find node %d", __func__,

								ids[i]);

			continue;

		}



		mdp_ab += get_node_sumab(info);

		MSM_BUS_DBG("mdp_ab %llu", mdp_ab);

		ff = info->node_info->ff;

	}



	if (ff) {

		mdp_ab = msm_bus_div64(2 * ff, 100 * mdp_ab);

	} else {

		MSM_BUS_ERR("MDP FF is 0");

		mdp_ab = 0;

	}





	MSM_BUS_DBG("MDP BW %llu\n", mdp_ab);

	return mdp_ab;

}



static uint64_t get_rt_bw(void)

{

	uint64_t rt_bw = 0;



	rt_bw += get_mdp_bw();

	rt_bw += get_vfe_bw();



	return rt_bw;

}



static uint64_t get_avail_bw(struct msm_bus_fabric_device *fabdev)

{

	uint64_t fabclk_rate = 0;

	int i;

	uint64_t avail_bw = 0;

	uint64_t rt_bw = get_rt_bw();

	struct msm_bus_fabric *fabric = to_msm_bus_fabric(fabdev);



	if (!rt_bw)

		goto exit_get_avail_bw;



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

		uint64_t ctx_rate;

		ctx_rate =

			fabric->info.nodeclk[i].rate;

		fabclk_rate = max(ctx_rate, fabclk_rate);

	}



	if (!fabdev->eff_fact || !fabdev->nr_lim_thresh) {

		MSM_BUS_ERR("Error: Eff-fact %d; nr_thresh %llu",

				fabdev->eff_fact, fabdev->nr_lim_thresh);

		return 0;

	}



	avail_bw = msm_bus_div64(100,

				(GET_BIMC_BW(fabclk_rate) * fabdev->eff_fact));



	if (avail_bw >= fabdev->nr_lim_thresh)

		return 0;



	MSM_BUS_DBG("%s: Total_avail_bw %llu, rt_bw %llu\n",

		__func__, avail_bw, rt_bw);

	trace_bus_avail_bw(avail_bw, rt_bw);



	if (avail_bw < rt_bw) {

		MSM_BUS_ERR("\n%s: ERROR avail BW %llu < MDP %llu",

			__func__, avail_bw, rt_bw);

		avail_bw = 0;

		goto exit_get_avail_bw;

	}

	avail_bw -= rt_bw;



exit_get_avail_bw:

	return avail_bw;

}



static void program_nr_limits(struct msm_bus_fabric_device *fabdev)

{

	int num_nr_lim = 0;

	int i;

	struct msm_bus_inode_info *info[fabdev->num_nr_lim];

	struct msm_bus_fabric *fabric = to_msm_bus_fabric(fabdev);



	num_nr_lim = radix_tree_gang_lookup_tag(&fabric->fab_tree,

			(void **)&info, fabric->fabdev.id, fabdev->num_nr_lim,

			MASTER_NODE);



	for (i = 0; i < num_nr_lim; i++)

		fabdev->algo->config_limiter(fabdev, info[i]);

}



static int msm_bus_commit_limiter(struct device *dev, void *data)

{

	int ret = 0;

	struct msm_bus_fabric_device *fabdev = to_msm_bus_fabric_device(dev);



	MSM_BUS_DBG("fabid: %d\n", fabdev->id);

	program_nr_limits(fabdev);

	return ret;

}



static void compute_nr_limits(struct msm_bus_fabric_device *fabdev, int pnode)

{

	uint64_t total_ib = 0;

	int num_nr_lim = 0;

	uint64_t avail_bw = 0;

	struct msm_bus_inode_info *info[fabdev->num_nr_lim];

	struct msm_bus_fabric *fabric = to_msm_bus_fabric(fabdev);

	int i;



	num_nr_lim = radix_tree_gang_lookup_tag(&fabric->fab_tree,

			(void **)&info, fabric->fabdev.id, fabdev->num_nr_lim,

			MASTER_NODE);



	MSM_BUS_DBG("%s: Found %d NR LIM nodes", __func__, num_nr_lim);

	for (i = 0; i < num_nr_lim; i++)

		total_ib += get_node_maxib(info[i]);



	avail_bw = get_avail_bw(fabdev);

	MSM_BUS_DBG("\n %s: Avail BW %llu", __func__, avail_bw);



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

		uint32_t node_pct = 0;

		uint64_t new_lim_bw = 0;

		uint64_t node_max_ib = 0;

		uint32_t node_max_ib_kB = 0;

		uint32_t total_ib_kB = 0;

		uint64_t bw_node;



		node_max_ib = get_node_maxib(info[i]);

		node_max_ib_kB = msm_bus_div64(1024, node_max_ib);

		total_ib_kB = msm_bus_div64(1024, total_ib);

		node_pct = (node_max_ib_kB * 100) / total_ib_kB;

		bw_node = node_pct * avail_bw;

		new_lim_bw = msm_bus_div64(100, bw_node);



		/*

		 * if limiter bw is more than the requested IB clip to

		   requested IB.

		*/

		if (new_lim_bw >= node_max_ib)

			new_lim_bw = node_max_ib;



		/*

		 * if there is a floor bw for this nr lim node and

		 *  if there is available bw to divy up among the nr masters

		 *  and if the nr lim masters have a non zero vote and

		 *  if the limited bw is below the floor for this node.

		 *    then limit this node to the floor bw.

		 */

		if (info[i]->node_info->floor_bw && node_max_ib && avail_bw &&

			(new_lim_bw <= info[i]->node_info->floor_bw)) {

			MSM_BUS_ERR("\nNode %d:Limiting BW:%llu < floor:%llu",

				info[i]->node_info->id,	new_lim_bw,

						info[i]->node_info->floor_bw);

			new_lim_bw = info[i]->node_info->floor_bw;

		}



		if (new_lim_bw != info[i]->cur_lim_bw) {

			info[i]->cur_lim_bw = new_lim_bw;

			MSM_BUS_DBG("NodeId %d: Requested IB %llu",

					info[i]->node_info->id, node_max_ib);

			MSM_BUS_DBG("Limited to %llu(%d pct of Avail %llu )\n",

					new_lim_bw, node_pct, avail_bw);

		} else {

			MSM_BUS_DBG("NodeId %d: No change Limited to %llu\n",

				info[i]->node_info->id, info[i]->cur_lim_bw);

		}

	}

}



static void setup_nr_limits(int curr, int pnode)

{

	struct msm_bus_fabric_device *fabdev =

		msm_bus_get_fabric_device(GET_FABID(curr));

	struct msm_bus_inode_info *info;



	if (!fabdev) {

		MSM_BUS_WARN("Fabric Not yet registered. Try again\n");

		goto exit_setup_nr_limits;

	}



	/* This logic is currently applicable to BIMC masters only */

	if (fabdev->id != MSM_BUS_FAB_DEFAULT) {

		MSM_BUS_ERR("Static limiting of NR masters only for BIMC\n");

		goto exit_setup_nr_limits;

	}



	info = fabdev->algo->find_node(fabdev, curr);

	if (!info) {

		MSM_BUS_ERR("Cannot find node info!\n");

		goto exit_setup_nr_limits;

	}



	compute_nr_limits(fabdev, pnode);

exit_setup_nr_limits:

	return;

}



static bool is_nr_lim(int id)

{

	struct msm_bus_fabric_device *fabdev = msm_bus_get_fabric_device

		(GET_FABID(id));

	struct msm_bus_inode_info *info;

	bool ret = false;



	if (!fabdev) {

		MSM_BUS_ERR("Bus device for bus ID: %d not found!\n",

			GET_FABID(id));

		goto exit_is_nr_lim;

	}



	info = fabdev->algo->find_node(fabdev, id);

	if (!info)

		MSM_BUS_ERR("Cannot find node info %d!\n", id);

	else if ((info->node_info->nr_lim || info->node_info->rt_mas))

		ret = true;

exit_is_nr_lim:

	return ret;

}



/**

 * update_path() - Update the path with the bandwidth and clock values, as

 * requested by the client.
@@ -334,6 +621,7 @@ static int update_path(int curr, int pnode, uint64_t req_clk, uint64_t req_bw, 
{

	int index, ret = 0;

	struct msm_bus_inode_info *info;

	struct msm_bus_inode_info *src_info;

	int next_pnode;

	int64_t add_bw = req_bw - curr_bw;

	uint64_t bwsum = 0;
@@ -358,6 +646,7 @@ static int update_path(int curr, int pnode, uint64_t req_clk, uint64_t req_bw, 
		MSM_BUS_ERR("Cannot find node info!\n");

		return -ENXIO;

	}

	src_info = info;



	info->link_info.sel_bw = &info->link_info.bw[ctx];

	info->link_info.sel_clk = &info->link_info.clk[ctx];
@@ -469,11 +758,23 @@ static int update_path(int curr, int pnode, uint64_t req_clk, uint64_t req_bw, 
		MSM_BUS_ERR("Cannot find node info!\n");

		return -ENXIO;

	}



	/* Update slave clocks */

	ret = fabdev->algo->update_clks(fabdev, info, index, curr_clk_hz,

	    req_clk_hz, bwsum_hz, SEL_SLAVE_CLK, ctx, cl_active_flag);

	if (ret)

		MSM_BUS_ERR("Failed to update clk\n");



	if ((ctx == cl_active_flag) &&

		((src_info->node_info->nr_lim || src_info->node_info->rt_mas)))

		setup_nr_limits(curr, pnode);



	/* If freq is going down , apply the changes now before

	 * we commit clk data.

	 */

	if ((req_clk < curr_clk) || (req_bw < curr_bw))

		bus_for_each_dev(&msm_bus_type, NULL, NULL,

					msm_bus_commit_limiter);

	return ret;

}
@@ -594,8 +895,8 @@ static int update_request_legacy(uint32_t cl, unsigned index) 
{

	int i, ret = 0;

	struct msm_bus_scale_pdata *pdata;

	int pnode, src, curr, ctx;

	uint64_t req_clk, req_bw, curr_clk, curr_bw;

	int pnode, src = 0, curr, ctx;

	uint64_t req_clk = 0, req_bw = 0, curr_clk = 0, curr_bw = 0;

	struct msm_bus_client *client = (struct msm_bus_client *)cl;

	if (IS_ERR_OR_NULL(client)) {

		MSM_BUS_ERR("msm_bus_scale_client update req error %d\n",
@@ -675,6 +976,13 @@ static int update_request_legacy(uint32_t cl, unsigned index) 
	msm_bus_dbg_client_data(client->pdata, index, cl);

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



	/* For NR/RT limited masters, if freq is going up , apply the changes

	 * after we commit clk data.

	 */

	if (is_nr_lim(src) && ((req_clk > curr_clk) || (req_bw > curr_bw)))

		bus_for_each_dev(&msm_bus_type, NULL, NULL,

					msm_bus_commit_limiter);



err:

	mutex_unlock(&msm_bus_lock);

	return ret;

drivers/platform/msm/msm_bus/msm_bus_bimc.c

+91 −9
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "msm_bus_core.h"

#include "msm_bus_bimc.h"

#include "msm_bus_adhoc.h"

#include <trace/events/trace_msm_bus.h>



enum msm_bus_bimc_slave_block {

	SLAVE_BLOCK_RESERVED = 0,
@@ -1288,11 +1289,6 @@ static void set_qos_bw_regs(void __iomem *baddr, uint32_t mas_index, 
		(val2 & M_BKE_THL_THRESH_BMSK)), M_BKE_THL_ADDR(baddr,

		mas_index));



	/* Set BKE enable to the value it was */

	reg_val = readl_relaxed(M_BKE_EN_ADDR(baddr, mas_index)) &

		M_BKE_EN_RMSK;

	writel_relaxed(((reg_val & ~(M_BKE_EN_EN_BMSK)) | (bke_reg_val &

		M_BKE_EN_EN_BMSK)), M_BKE_EN_ADDR(baddr, mas_index));

	/* Ensure that all bandwidth register writes have completed

	 * before returning

	 */
@@ -1541,6 +1537,7 @@ static void bimc_set_static_qos_bw(struct msm_bus_bimc_info *binfo, 
	MSM_BUS_DBG("%s: BKE parameters: gp %d, gc %d, thm %d thl %d thh %d",

			__func__, gp, gc, thm, thl, thh);



	trace_bus_bke_params(gc, gp, thl, thm, thl);

	set_qos_bw_regs(binfo->base, mport, thh, thm, thl, gp, gc);

}
@@ -1660,7 +1657,9 @@ static void msm_bus_bimc_update_bw(struct msm_bus_inode_info *hop, 
			 * If it isn't, then set QOS Bandwidth.

			 * Also if dual-conf is set, don't program bw regs.

			 **/

			if (!info->node_info->dual_conf)

			if (!info->node_info->dual_conf &&

			((info->node_info->mode == BIMC_QOS_MODE_LIMITER) ||

			(info->node_info->mode == BIMC_QOS_MODE_REGULATOR)))

				msm_bus_bimc_set_qos_bw(binfo->base,

					binfo->qos_freq,

					info->node_info->qport[i], &qbw);
@@ -1703,6 +1702,61 @@ static int msm_bus_bimc_commit(struct msm_bus_fabric_registration 
	return 0;

}



static void msm_bus_bimc_config_limiter(

	struct msm_bus_fabric_registration *fab_pdata,

	struct msm_bus_inode_info *info)

{

	struct msm_bus_bimc_info *binfo;

	int mode, i, ports;



	binfo = (struct msm_bus_bimc_info *)fab_pdata->hw_data;

	ports = info->node_info->num_mports;



	if (!info->node_info->qport) {

		MSM_BUS_DBG("No QoS Ports to init\n");

		return;

	}



	if (info->cur_lim_bw)

		mode = BIMC_QOS_MODE_LIMITER;

	else

		mode = info->node_info->mode;



	switch (mode) {

	case BIMC_QOS_MODE_BYPASS:

	case BIMC_QOS_MODE_FIXED:

		for (i = 0; i < ports; i++)

			bke_switch(binfo->base, info->node_info->qport[i],

				BKE_OFF, mode);

		break;

	case BIMC_QOS_MODE_REGULATOR:

	case BIMC_QOS_MODE_LIMITER:

		if (info->cur_lim_bw != info->cur_prg_bw) {

			MSM_BUS_DBG("Enabled BKE throttling node %d to %llu\n",

				info->node_info->id, info->cur_lim_bw);

			trace_bus_bimc_config_limiter(info->node_info->id,

				info->cur_lim_bw);

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

				/* If not in fixed mode, update bandwidth */

				struct msm_bus_bimc_qos_bw qbw;



				qbw.ws = info->node_info->ws;

				qbw.bw = info->cur_lim_bw;

				qbw.gp = info->node_info->bimc_gp;

				qbw.thmp = info->node_info->bimc_thmp;

				bimc_set_static_qos_bw(binfo,

					info->node_info->qport[i], &qbw);

				bke_switch(binfo->base,

					info->node_info->qport[i],

					BKE_ON, mode);

				info->cur_prg_bw = qbw.bw;

			}

		}

		break;

	default:

		break;

	}

}



static void bimc_init_mas_reg(struct msm_bus_bimc_info *binfo,

	struct msm_bus_inode_info *info,
@@ -1757,6 +1811,33 @@ static void bimc_init_mas_reg(struct msm_bus_bimc_info *binfo, 
	}

}



static void init_health_regs(struct msm_bus_bimc_info *binfo,

				struct msm_bus_inode_info *info,

				struct msm_bus_bimc_qos_mode *qmode,

				int mode)

{

	int i;



	if (mode == BIMC_QOS_MODE_LIMITER) {

		qmode->rl.qhealth[0].limit_commands = 1;

		qmode->rl.qhealth[1].limit_commands = 0;

		qmode->rl.qhealth[2].limit_commands = 0;

		qmode->rl.qhealth[3].limit_commands = 0;



		if (!info->node_info->qport) {

			MSM_BUS_DBG("No QoS Ports to init\n");

			return;

		}



		for (i = 0; i < info->node_info->num_mports; i++) {

			/* If not in bypass mode, update priority */

			if (mode != BIMC_QOS_MODE_BYPASS)

				msm_bus_bimc_set_qos_prio(binfo->base,

				info->node_info->qport[i], mode, qmode);

		}

	}

}





static int msm_bus_bimc_mas_init(struct msm_bus_bimc_info *binfo,

	struct msm_bus_inode_info *info)
@@ -1776,11 +1857,11 @@ static int msm_bus_bimc_mas_init(struct msm_bus_bimc_info *binfo, 
	 * If the master supports dual configuration,

	 * configure registers for both modes

	 */

	if (info->node_info->dual_conf) {

	if (info->node_info->dual_conf)

		bimc_init_mas_reg(binfo, info, qmode,

			info->node_info->mode_thresh);

		info->node_info->cur_lim_bw = 0;

	}

	else if (info->node_info->nr_lim)

		init_health_regs(binfo, info, qmode, BIMC_QOS_MODE_LIMITER);



	bimc_init_mas_reg(binfo, info, qmode, info->node_info->mode);

	return 0;
@@ -1906,6 +1987,7 @@ int msm_bus_bimc_hw_init(struct msm_bus_fabric_registration *pdata, 
	hw_algo->port_halt = msm_bus_bimc_port_halt;

	hw_algo->port_unhalt = msm_bus_bimc_port_unhalt;

	hw_algo->config_master = msm_bus_bimc_config_master;

	hw_algo->config_limiter = msm_bus_bimc_config_limiter;

	/* BIMC slaves are shared. Slave registers are set through RPM */

	if (!pdata->ahb)

		pdata->rpm_enabled = 1;

drivers/platform/msm/msm_bus/msm_bus_core.h

+37 −0
Original line number Diff line number Diff line
@@ -59,6 +59,14 @@ struct msm_bus_arb_ops { 
	void (*unregister_client)(uint32_t cl);

};



enum {

	SLAVE_NODE,

	MASTER_NODE,

	CLK_NODE,

	NR_LIM_NODE,

};





extern struct bus_type msm_bus_type;

extern struct msm_bus_arb_ops arb_ops;

extern void msm_bus_arb_setops_legacy(struct msm_bus_arb_ops *arb_ops);
@@ -96,8 +104,12 @@ struct msm_bus_node_info { 
	unsigned int mode_thresh;

	bool dual_conf;

	u64 *bimc_bw;

	bool nr_lim;

	u32 ff;

	bool rt_mas;

	u32 bimc_gp;

	u32 bimc_thmp;

	u64 floor_bw;

	const char *name;

};
@@ -130,6 +142,8 @@ struct msm_bus_inode_info { 
	struct msm_bus_node_info *node_info;

	uint64_t max_bw;

	uint64_t max_clk;

	uint64_t cur_lim_bw;

	uint64_t cur_prg_bw;

	struct msm_bus_link_info link_info;

	int num_pnodes;

	struct path_node *pnode;
@@ -167,6 +181,8 @@ struct msm_bus_hw_algorithm { 
	void (*config_master)(struct msm_bus_fabric_registration *fab_pdata,

		struct msm_bus_inode_info *info,

		uint64_t req_clk, uint64_t req_bw);

	void (*config_limiter)(struct msm_bus_fabric_registration *fab_pdata,

		struct msm_bus_inode_info *info);

};



struct msm_bus_fabric_device {
@@ -177,10 +193,29 @@ struct msm_bus_fabric_device { 
	const struct msm_bus_board_algorithm *board_algo;

	struct msm_bus_hw_algorithm hw_algo;

	int visited;

	int num_nr_lim;

	u64 nr_lim_thresh;

	u32 eff_fact;

};

#define to_msm_bus_fabric_device(d) container_of(d, \

		struct msm_bus_fabric_device, d)



struct msm_bus_fabric {

	struct msm_bus_fabric_device fabdev;

	int ahb;

	void *cdata[NUM_CTX];

	bool arb_dirty;

	bool clk_dirty;

	struct radix_tree_root fab_tree;

	int num_nodes;

	struct list_head gateways;

	struct msm_bus_inode_info info;

	struct msm_bus_fabric_registration *pdata;

	void *hw_data;

};

#define to_msm_bus_fabric(d) container_of(d, \

	struct msm_bus_fabric, d)





struct msm_bus_fab_algorithm {

	int (*update_clks)(struct msm_bus_fabric_device *fabdev,
@@ -202,6 +237,8 @@ struct msm_bus_fab_algorithm { 
	void (*config_master)(struct msm_bus_fabric_device *fabdev,

		struct msm_bus_inode_info *info, uint64_t req_clk,

		uint64_t req_bw);

	void (*config_limiter)(struct msm_bus_fabric_device *fabdev,

		struct msm_bus_inode_info *info);

};



struct msm_bus_board_algorithm {

drivers/platform/msm/msm_bus/msm_bus_fabric.c

+62 −22
Original line number Diff line number Diff line
@@ -21,33 +21,11 @@ 
#include <linux/radix-tree.h>

#include "msm_bus_core.h"



enum {

	SLAVE_NODE,

	MASTER_NODE,

	CLK_NODE,

};



enum {

	DISABLE,

	ENABLE,

};



struct msm_bus_fabric {

	struct msm_bus_fabric_device fabdev;

	int ahb;

	void *cdata[NUM_CTX];

	bool arb_dirty;

	bool clk_dirty;

	struct radix_tree_root fab_tree;

	int num_nodes;

	struct list_head gateways;

	struct msm_bus_inode_info info;

	struct msm_bus_fabric_registration *pdata;

	void *hw_data;

};

#define to_msm_bus_fabric(d) container_of(d, \

	struct msm_bus_fabric, d)



/**

 * msm_bus_fabric_add_node() - Add a node to the fabric structure

 * @fabric: Fabric device to which the node should be added
@@ -81,6 +59,21 @@ static int msm_bus_fabric_add_node(struct msm_bus_fabric *fabric, 
		info->nodeclk[ctx].dirty = false;

	}



	if (info->node_info->nr_lim) {

		int iid = msm_bus_board_get_iid(info->node_info->id);

		struct msm_bus_fabric_device *fabdev =

			msm_bus_get_fabric_device(GET_FABID(iid));



		if (!fabdev)

			BUG_ON(1);



		radix_tree_tag_set(&fabric->fab_tree,

			info->node_info->priv_id, MASTER_NODE);



		fabdev->num_nr_lim++;

		MSM_BUS_ERR("%s: Adding %d There are %d nodes", __func__,

				info->node_info->id, fabdev->num_nr_lim);

	}

out:

	return status;

}
@@ -512,6 +505,50 @@ out: 
	return status;

}



static void msm_bus_fabric_config_limiter(

	struct msm_bus_fabric_device *fabdev,

	struct msm_bus_inode_info *info)

{

	struct msm_bus_fabric *fabric = to_msm_bus_fabric(fabdev);

	long rounded_rate, cur_rate;



	if (fabdev->hw_algo.config_limiter == NULL)

		return;



	/* Enable clocks before accessing QoS registers */

	if (fabric->info.nodeclk[DUAL_CTX].clk) {

		if (fabric->info.nodeclk[DUAL_CTX].rate == 0) {

			cur_rate = clk_get_rate(

					fabric->info.nodeclk[DUAL_CTX].clk);

			rounded_rate = clk_round_rate(

					fabric->info.nodeclk[DUAL_CTX].clk,

					cur_rate ? cur_rate : 1);

		if (clk_set_rate(fabric->info.nodeclk[DUAL_CTX].clk,

				rounded_rate))

			MSM_BUS_ERR("Error: clk: en: Node: %d rate: %ld",

				fabric->fabdev.id, rounded_rate);



		clk_prepare_enable(fabric->info.nodeclk[DUAL_CTX].clk);

		}

	}



	if (info->iface_clk.clk)

		clk_prepare_enable(info->iface_clk.clk);



	fabdev->hw_algo.config_limiter(fabric->pdata, info);



	/* Disable clocks after accessing QoS registers */

	if (fabric->info.nodeclk[DUAL_CTX].clk &&

			fabric->info.nodeclk[DUAL_CTX].rate == 0)

		clk_disable_unprepare(fabric->info.nodeclk[DUAL_CTX].clk);



	if (info->iface_clk.clk) {

		MSM_BUS_DBG("Commented: Will disable clock for info: %d\n",

			info->node_info->priv_id);

		clk_disable_unprepare(info->iface_clk.clk);

	}

}



static void msm_bus_fabric_config_master(

	struct msm_bus_fabric_device *fabdev,

	struct msm_bus_inode_info *info, uint64_t req_clk, uint64_t req_bw)
@@ -712,6 +749,7 @@ static struct msm_bus_fab_algorithm msm_bus_algo = { 
	.find_gw_node = msm_bus_fabric_find_gw_node,

	.get_gw_list = msm_bus_fabric_get_gw_list,

	.config_master = msm_bus_fabric_config_master,

	.config_limiter = msm_bus_fabric_config_limiter,

};



static int msm_bus_fabric_hw_init(struct msm_bus_fabric_registration *pdata,
@@ -787,6 +825,8 @@ static int msm_bus_fabric_probe(struct platform_device *pdev) 
	}



	fabric->fabdev.name = pdata->name;

	fabric->fabdev.nr_lim_thresh = pdata->nr_lim_thresh;

	fabric->fabdev.eff_fact = pdata->eff_fact;

	fabric->fabdev.algo = &msm_bus_algo;

	fabric->info.node_info->priv_id = fabric->fabdev.id;

	fabric->info.node_info->id = fabric->fabdev.id;