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

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

Merge "msm: msm_bus: Fix msm_bus_div64 definition" into msm-4.9

parents 716f8252 489b0d7f

drivers/soc/qcom/msm_bus/msm_bus_arb_rpmh.c

+4 −4
Original line number Diff line number Diff line
@@ -572,7 +572,7 @@ static void bcm_query_bus_req(struct device *dev, int ctx) 
		bcm_dev->lnode_list[lnode_idx].lnode_query_ab[ctx] =

			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.num_aggports *

				cur_dev->node_info->agg_params.buswidth);



		for (i = 0; i < bcm_dev->num_lnodes; i++) {
@@ -1298,7 +1298,7 @@ static int query_usecase(struct msm_bus_client *client, bool log_trns, 
					struct msm_bus_tcs_usecase *tcs_usecase)

{

	int lnode, src, dest, cur_idx;

	uint64_t req_clk, req_bw, curr_clk, curr_bw, slp_clk, slp_bw;

	uint64_t req_clk, req_bw, curr_clk, curr_bw;

	int i, ret = 0;

	struct msm_bus_scale_pdata *pdata;

	struct device *src_dev;
@@ -1339,8 +1339,8 @@ static int query_usecase(struct msm_bus_client *client, bool log_trns, 
					curr_bw, curr_clk);

		}



		ret = query_path(src_dev, dest, req_clk, req_bw, slp_clk,

			slp_bw, curr_clk, curr_bw, lnode);

		ret = query_path(src_dev, dest, req_clk, req_bw, 0,

			0, curr_clk, curr_bw, lnode);



		if (ret) {

			MSM_BUS_ERR("%s: Query path failed! %d ctx %d\n",

drivers/soc/qcom/msm_bus/msm_bus_core.h

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

/* Copyright (c) 2011-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
@@ -288,7 +288,7 @@ struct msm_bus_client { 
	struct device **src_devs;

};



uint64_t msm_bus_div64(unsigned int width, uint64_t bw);

uint64_t msm_bus_div64(uint64_t num, unsigned int base);

int msm_bus_fabric_device_register(struct msm_bus_fabric_device *fabric);

void msm_bus_fabric_device_unregister(struct msm_bus_fabric_device *fabric);

struct msm_bus_fabric_device *msm_bus_get_fabric_device(int fabid);

drivers/soc/qcom/msm_bus/msm_bus_rules.c

+2 −2
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
@@ -588,7 +588,7 @@ void msm_rule_register(int num_rules, struct bus_rule_type *rule, 
static bool __rule_unregister(int num_rules, struct bus_rule_type *rule,

					struct notifier_block *nb)

{

	int i;

	int i = 0;

	struct rule_node_info *node = NULL;

	struct rule_node_info *node_tmp = NULL;

	struct rules_def *node_rule;