evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "msm: msm_bus: Add mutex lock for floor vote data"

Browse source
This commit is contained in:
Linux Build Service Account 2017-11-24 12:07:41 -08:00 • committed by Gerrit - the friendly Code Review server
commit 3d1779cb8d
1 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
drivers/soc/qcom/msm_bus/msm_bus_dbg_voter.c
View file

@ -1,4 +1,4 @@
/* Copyright (c) 2014-2016, The Linux Foundation. All rights reserved. /* Copyright (c) 2014-2017, The Linux Foundation. All rights reserved.
* *
* This program is Mree software; you can redistribute it and/or modify * This program is Mree software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and * it under the terms of the GNU General Public License version 2 and
@ -27,6 +27,7 @@ struct msm_bus_floor_client_type {
}; };
static struct class *bus_floor_class; static struct class *bus_floor_class;
static DEFINE_RT_MUTEX(msm_bus_floor_vote_lock);
#define MAX_VOTER_NAME (50) #define MAX_VOTER_NAME (50)
#define DEFAULT_NODE_WIDTH (8) #define DEFAULT_NODE_WIDTH (8)
#define DBG_NAME(s) (strnstr(s, "-", 7) + 1) #define DBG_NAME(s) (strnstr(s, "-", 7) + 1)
@ -64,18 +65,22 @@ static ssize_t bus_floor_active_only_store(struct device *dev,
{ {
struct msm_bus_floor_client_type *cl; struct msm_bus_floor_client_type *cl;
rt_mutex_lock(&msm_bus_floor_vote_lock);
cl = dev_get_drvdata(dev); cl = dev_get_drvdata(dev);
if (!cl) { if (!cl) {
pr_err("%s: Can't find cl", __func__); pr_err("%s: Can't find cl", __func__);
rt_mutex_unlock(&msm_bus_floor_vote_lock);
return 0; return 0;
} }
if (sscanf(buf, "%d", &cl->active_only) != 1) { if (sscanf(buf, "%d", &cl->active_only) != 1) {
pr_err("%s:return error", __func__); pr_err("%s:return error", __func__);
rt_mutex_unlock(&msm_bus_floor_vote_lock);
return -EINVAL; return -EINVAL;
} }
rt_mutex_unlock(&msm_bus_floor_vote_lock);
return n; return n;
} }
@ -100,20 +105,24 @@ static ssize_t bus_floor_vote_store(struct device *dev,
struct msm_bus_floor_client_type *cl; struct msm_bus_floor_client_type *cl;
int ret = 0; int ret = 0;
rt_mutex_lock(&msm_bus_floor_vote_lock);
cl = dev_get_drvdata(dev); cl = dev_get_drvdata(dev);
if (!cl) { if (!cl) {
pr_err("%s: Can't find cl", __func__); pr_err("%s: Can't find cl", __func__);
rt_mutex_unlock(&msm_bus_floor_vote_lock);
return 0; return 0;
} }
if (sscanf(buf, "%llu", &cl->cur_vote_hz) != 1) { if (sscanf(buf, "%llu", &cl->cur_vote_hz) != 1) {
pr_err("%s:return error", __func__); pr_err("%s:return error", __func__);
rt_mutex_unlock(&msm_bus_floor_vote_lock);
return -EINVAL; return -EINVAL;
} }
ret = msm_bus_floor_vote_context(dev_name(dev), cl->cur_vote_hz, ret = msm_bus_floor_vote_context(dev_name(dev), cl->cur_vote_hz,
cl->active_only); cl->active_only);
rt_mutex_unlock(&msm_bus_floor_vote_lock);
return n; return n;
} }
@ -126,15 +135,18 @@ static ssize_t bus_floor_vote_store_api(struct device *dev,
char name[10]; char name[10];
u64 vote_khz = 0; u64 vote_khz = 0;
rt_mutex_lock(&msm_bus_floor_vote_lock);
cl = dev_get_drvdata(dev); cl = dev_get_drvdata(dev);
if (!cl) { if (!cl) {
pr_err("%s: Can't find cl", __func__); pr_err("%s: Can't find cl", __func__);
rt_mutex_unlock(&msm_bus_floor_vote_lock);
return 0; return 0;
} }
if (sscanf(buf, "%9s %llu", name, &vote_khz) != 2) { if (sscanf(buf, "%9s %llu", name, &vote_khz) != 2) {
pr_err("%s:return error", __func__); pr_err("%s:return error", __func__);
rt_mutex_unlock(&msm_bus_floor_vote_lock);
return -EINVAL; return -EINVAL;
} }
@ -142,6 +154,7 @@ static ssize_t bus_floor_vote_store_api(struct device *dev,
__func__, name, vote_khz); __func__, name, vote_khz);
ret = msm_bus_floor_vote(name, vote_khz); ret = msm_bus_floor_vote(name, vote_khz);
rt_mutex_unlock(&msm_bus_floor_vote_lock);
return n; return n;
} }