commit 607fbc4c59db6ba1ef6e20bc870d8bcf0c9015f7
author David Dai <daidavid1@codeaurora.org> Thu Mar 02 16:22:36 2017 -0800
committer David Dai <daidavid1@codeaurora.org> Mon Mar 06 17:07:26 2017 -0800
tree bec3dbad09f2bd3a26e057c0fdbc66fd4f5c581f
parent e713c9df4c42f71b5ed3c3c470da692411cea8ae

msm: msm_bus: Account for agg-ports when aggregating AB

Account for agg-ports/channels when translating arbitrated
bandwidth requests from bus nodes to bcm nodes.

Change-Id: I976795b1b952772eff3a5f36e0962ee92140becf
Signed-off-by: David Dai <daidavid1@codeaurora.org>

drivers/soc/qcom/msm_bus/msm_bus_arb_rpmh.c

diff --git a/drivers/soc/qcom/msm_bus/msm_bus_arb_rpmh.c b/drivers/soc/qcom/msm_bus/msm_bus_arb_rpmh.c
index cbfefeb..8c6deb1 100644
--- a/drivers/soc/qcom/msm_bus/msm_bus_arb_rpmh.c
+++ b/drivers/soc/qcom/msm_bus/msm_bus_arb_rpmh.c
@@ -73,26 +73,26 @@
  * "util" file for these common func/macros.
  *
  */
-uint64_t msm_bus_div64(unsigned int w, uint64_t bw)
+uint64_t msm_bus_div64(uint64_t num, unsigned int base)
 {
-	uint64_t *b = &bw;
+	uint64_t *n = #
 
-	if ((bw > 0) && (bw < w))
+	if ((num > 0) && (num < base))
 		return 1;
 
-	switch (w) {
+	switch (base) {
 	case 0:
 		WARN(1, "AXI: Divide by 0 attempted\n");
-	case 1: return bw;
-	case 2: return (bw >> 1);
-	case 4: return (bw >> 2);
-	case 8: return (bw >> 3);
-	case 16: return (bw >> 4);
-	case 32: return (bw >> 5);
+	case 1: return num;
+	case 2: return (num >> 1);
+	case 4: return (num >> 2);
+	case 8: return (num >> 3);
+	case 16: return (num >> 4);
+	case 32: return (num >> 5);
 	}
 
-	do_div(*b, w);
-	return *b;
+	do_div(*n, base);
+	return *n;
 }
 
 int msm_bus_device_match_adhoc(struct device *dev, void *id)
@@ -505,14 +505,15 @@
 
 		lnode_idx = cur_dev->node_info->bcm_req_idx;
 		bcm_dev->lnode_list[lnode_idx].lnode_ib[ctx] =
-			msm_bus_div64(cur_dev->node_info->agg_params.buswidth,
-					cur_dev->node_bw[ctx].max_ib *
-					(uint64_t)bcm_dev->bcmdev->width);
+			msm_bus_div64(cur_dev->node_bw[ctx].max_ib *
+					(uint64_t)bcm_dev->bcmdev->width,
+				cur_dev->node_info->agg_params.buswidth);
 
 		bcm_dev->lnode_list[lnode_idx].lnode_ab[ctx] =
-			msm_bus_div64(cur_dev->node_info->agg_params.buswidth,
-					cur_dev->node_bw[ctx].sum_ab *
-					(uint64_t)bcm_dev->bcmdev->width);
+			msm_bus_div64(cur_dev->node_bw[ctx].sum_ab *
+					(uint64_t)bcm_dev->bcmdev->width,
+				cur_dev->node_info->agg_params.buswidth *
+				cur_dev->node_info->agg_params.num_aggports);
 
 		for (i = 0; i < bcm_dev->num_lnodes; i++) {
 			if (ctx == ACTIVE_CTX) {
@@ -564,14 +565,15 @@
 
 		lnode_idx = cur_dev->node_info->bcm_req_idx;
 		bcm_dev->lnode_list[lnode_idx].lnode_query_ib[ctx] =
-			msm_bus_div64(cur_dev->node_info->agg_params.buswidth,
-					cur_dev->node_bw[ctx].max_query_ib *
-					(uint64_t)bcm_dev->bcmdev->width);
+			msm_bus_div64(cur_dev->node_bw[ctx].max_query_ib *
+					(uint64_t)bcm_dev->bcmdev->width,
+				cur_dev->node_info->agg_params.buswidth);
 
 		bcm_dev->lnode_list[lnode_idx].lnode_query_ab[ctx] =
-			msm_bus_div64(cur_dev->node_info->agg_params.buswidth,
-					cur_dev->node_bw[ctx].sum_query_ab *
-					(uint64_t)bcm_dev->bcmdev->width);
+			msm_bus_div64(cur_dev->node_bw[ctx].sum_query_ab *
+					(uint64_t)bcm_dev->bcmdev->width,
+				cur_dev->node_info->agg_params.num_aggports,
+				cur_dev->node_info->agg_params.buswidth);
 
 		for (i = 0; i < bcm_dev->num_lnodes; i++) {
 			if (ctx == ACTIVE_CTX) {