Merge "msm: msm_bus: Use RT mutexes for bus transactions" (a42621ac) · Commits · e / devices / android_kernel_sony_msm8994

drivers/platform/msm/msm_bus/msm_bus_arb_adhoc.c

+14 −14

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		#include <linux/list.h>
		#include <linux/module.h>
		#include <linux/slab.h>
		#include <linux/mutex.h>
		#include <linux/rtmutex.h>
		#include <linux/clk.h>
		#include <linux/msm-bus.h>
		#include "msm_bus_core.h"
		@@ -39,7 +39,7 @@ static struct handle_type handle_list;
		struct list_head input_list;
		struct list_head apply_list;

		DEFINE_MUTEX(msm_bus_adhoc_lock);
		DEFINE_RT_MUTEX(msm_bus_adhoc_lock);

		static bool chk_bl_list(struct list_head *black_list, unsigned int id)
		{
		@@ -746,7 +746,7 @@ static void unregister_client_adhoc(uint32_t cl)
		uint64_t cur_clk, cur_bw;
		struct msm_bus_client *client;

		mutex_lock(&msm_bus_adhoc_lock);
		rt_mutex_lock(&msm_bus_adhoc_lock);
		if (!cl) {
		MSM_BUS_ERR("%s: Null cl handle passed unregister\n",
		__func__);
		@@ -783,7 +783,7 @@ static void unregister_client_adhoc(uint32_t cl)
		kfree(client);
		handle_list.cl_list[cl] = NULL;
		exit_unregister_client:
		mutex_unlock(&msm_bus_adhoc_lock);
		rt_mutex_unlock(&msm_bus_adhoc_lock);
		return;
		}

		@@ -860,7 +860,7 @@ static uint32_t register_client_adhoc(struct msm_bus_scale_pdata *pdata)
		int *lnode;
		uint32_t handle = 0;

		mutex_lock(&msm_bus_adhoc_lock);
		rt_mutex_lock(&msm_bus_adhoc_lock);
		client = kzalloc(sizeof(struct msm_bus_client), GFP_KERNEL);
		if (!client) {
		MSM_BUS_ERR("%s: Error allocating client data", __func__);
		@@ -899,7 +899,7 @@ static uint32_t register_client_adhoc(struct msm_bus_scale_pdata *pdata)
		MSM_BUS_DBG("%s:Client handle %d %s", __func__, handle,
		client->pdata->name);
		exit_register_client:
		mutex_unlock(&msm_bus_adhoc_lock);
		rt_mutex_unlock(&msm_bus_adhoc_lock);
		return handle;
		}

		@@ -913,7 +913,7 @@ static int update_request_adhoc(uint32_t cl, unsigned int index)
		const char *test_cl = "Null";
		bool log_transaction = false;

		mutex_lock(&msm_bus_adhoc_lock);
		rt_mutex_lock(&msm_bus_adhoc_lock);

		if (!cl) {
		MSM_BUS_ERR("%s: Invalid client handle %d", __func__, cl);
		@@ -984,7 +984,7 @@ static int update_request_adhoc(uint32_t cl, unsigned int index)
		}
		trace_bus_update_request_end(pdata->name);
		exit_update_request:
		mutex_unlock(&msm_bus_adhoc_lock);
		rt_mutex_unlock(&msm_bus_adhoc_lock);
		return ret;
		}

		@@ -1003,7 +1003,7 @@ static int update_bw_adhoc(struct msm_bus_client_handle *cl, u64 ab, u64 ib)
		char *test_cl = "test-client";
		bool log_transaction = false;

		mutex_lock(&msm_bus_adhoc_lock);
		rt_mutex_lock(&msm_bus_adhoc_lock);

		if (!cl) {
		MSM_BUS_ERR("%s: Invalid client handle %p", __func__, cl);
		@@ -1037,14 +1037,14 @@ static int update_bw_adhoc(struct msm_bus_client_handle *cl, u64 ab, u64 ib)
		getpath_debug(cl->mas, cl->first_hop, cl->active_only);
		trace_bus_update_request_end(cl->name);
		exit_update_request:
		mutex_unlock(&msm_bus_adhoc_lock);
		rt_mutex_unlock(&msm_bus_adhoc_lock);

		return ret;
		}

		static void unregister_adhoc(struct msm_bus_client_handle *cl)
		{
		mutex_lock(&msm_bus_adhoc_lock);
		rt_mutex_lock(&msm_bus_adhoc_lock);
		if (!cl) {
		MSM_BUS_ERR("%s: Null cl handle passed unregister\n",
		__func__);
		@@ -1059,7 +1059,7 @@ static void unregister_adhoc(struct msm_bus_client_handle *cl)
		msm_bus_dbg_remove_client(cl);
		kfree(cl);
		exit_unregister_client:
		mutex_unlock(&msm_bus_adhoc_lock);
		rt_mutex_unlock(&msm_bus_adhoc_lock);
		return;
		}

		@@ -1070,7 +1070,7 @@ register_adhoc(uint32_t mas, uint32_t slv, char *name, bool active_only)
		struct msm_bus_client_handle *client = NULL;
		int len = 0;

		mutex_lock(&msm_bus_adhoc_lock);
		rt_mutex_lock(&msm_bus_adhoc_lock);

		if (!(mas && slv && name)) {
		pr_err("%s: Error: src dst name num_paths are required",
		@@ -1108,7 +1108,7 @@ register_adhoc(uint32_t mas, uint32_t slv, char *name, bool active_only)
		client->name);
		msm_bus_dbg_add_client(client);
		exit_register:
		mutex_unlock(&msm_bus_adhoc_lock);
		rt_mutex_unlock(&msm_bus_adhoc_lock);
		return client;
		}
		/**