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

Merge "msm: gsi: add command stats"

Browse source
This commit is contained in:
Linux Build Service Account 2016-10-21 17:16:05 -07:00 • committed by Gerrit - the friendly Code Review server
commit 90a7cf7d80
2 changed files with 28 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
drivers/platform/msm/gsi/gsi.c
View file

@ -108,6 +108,11 @@ static void gsi_handle_ch_ctrl(int ee)
GSIDBG("ch %x\n", ch); GSIDBG("ch %x\n", ch);
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
if ((1 << i) & ch) { if ((1 << i) & ch) {
if (i >= gsi_ctx->max_ch || i >= GSI_CHAN_MAX) {
GSIERR("invalid channel %d\n", i);
break;
}
ctx = &gsi_ctx->chan[i]; ctx = &gsi_ctx->chan[i];
val = gsi_readl(gsi_ctx->base + val = gsi_readl(gsi_ctx->base +
GSI_EE_n_GSI_CH_k_CNTXT_0_OFFS(i, ee)); GSI_EE_n_GSI_CH_k_CNTXT_0_OFFS(i, ee));
@ -116,6 +121,7 @@ static void gsi_handle_ch_ctrl(int ee)
GSI_EE_n_GSI_CH_k_CNTXT_0_CHSTATE_SHFT; GSI_EE_n_GSI_CH_k_CNTXT_0_CHSTATE_SHFT;
GSIDBG("ch %u state updated to %u\n", i, ctx->state); GSIDBG("ch %u state updated to %u\n", i, ctx->state);
complete(&ctx->compl); complete(&ctx->compl);
gsi_ctx->ch_dbg[i].cmd_completed++;
} }
} }
@ -135,6 +141,11 @@ static void gsi_handle_ev_ctrl(int ee)
GSIDBG("ev %x\n", ch); GSIDBG("ev %x\n", ch);
for (i = 0; i < 32; i++) { for (i = 0; i < 32; i++) {
if ((1 << i) & ch) { if ((1 << i) & ch) {
if (i >= gsi_ctx->max_ev || i >= GSI_EVT_RING_MAX) {
GSIERR("invalid event %d\n", i);
break;
}
ctx = &gsi_ctx->evtr[i]; ctx = &gsi_ctx->evtr[i];
val = gsi_readl(gsi_ctx->base + val = gsi_readl(gsi_ctx->base +
GSI_EE_n_EV_CH_k_CNTXT_0_OFFS(i, ee)); GSI_EE_n_EV_CH_k_CNTXT_0_OFFS(i, ee));
@ -1605,6 +1616,7 @@ int gsi_alloc_channel(struct gsi_chan_props *props, unsigned long dev_hdl,
ctx->props = *props; ctx->props = *props;
mutex_lock(&gsi_ctx->mlock); mutex_lock(&gsi_ctx->mlock);
gsi_ctx->ch_dbg[props->ch_id].ch_allocate++;
val = (((props->ch_id << GSI_EE_n_GSI_CH_CMD_CHID_SHFT) & val = (((props->ch_id << GSI_EE_n_GSI_CH_CMD_CHID_SHFT) &
GSI_EE_n_GSI_CH_CMD_CHID_BMSK) | GSI_EE_n_GSI_CH_CMD_CHID_BMSK) |
((op << GSI_EE_n_GSI_CH_CMD_OPCODE_SHFT) & ((op << GSI_EE_n_GSI_CH_CMD_OPCODE_SHFT) &
@ -1775,6 +1787,7 @@ int gsi_start_channel(unsigned long chan_hdl)
mutex_lock(&gsi_ctx->mlock); mutex_lock(&gsi_ctx->mlock);
init_completion(&ctx->compl); init_completion(&ctx->compl);
gsi_ctx->ch_dbg[chan_hdl].ch_start++;
val = (((chan_hdl << GSI_EE_n_GSI_CH_CMD_CHID_SHFT) & val = (((chan_hdl << GSI_EE_n_GSI_CH_CMD_CHID_SHFT) &
GSI_EE_n_GSI_CH_CMD_CHID_BMSK) | GSI_EE_n_GSI_CH_CMD_CHID_BMSK) |
((op << GSI_EE_n_GSI_CH_CMD_OPCODE_SHFT) & ((op << GSI_EE_n_GSI_CH_CMD_OPCODE_SHFT) &
@ -1832,6 +1845,7 @@ int gsi_stop_channel(unsigned long chan_hdl)
mutex_lock(&gsi_ctx->mlock); mutex_lock(&gsi_ctx->mlock);
init_completion(&ctx->compl); init_completion(&ctx->compl);
gsi_ctx->ch_dbg[chan_hdl].ch_stop++;
val = (((chan_hdl << GSI_EE_n_GSI_CH_CMD_CHID_SHFT) & val = (((chan_hdl << GSI_EE_n_GSI_CH_CMD_CHID_SHFT) &
GSI_EE_n_GSI_CH_CMD_CHID_BMSK) | GSI_EE_n_GSI_CH_CMD_CHID_BMSK) |
((op << GSI_EE_n_GSI_CH_CMD_OPCODE_SHFT) & ((op << GSI_EE_n_GSI_CH_CMD_OPCODE_SHFT) &
@ -1900,6 +1914,7 @@ int gsi_stop_db_channel(unsigned long chan_hdl)
mutex_lock(&gsi_ctx->mlock); mutex_lock(&gsi_ctx->mlock);
init_completion(&ctx->compl); init_completion(&ctx->compl);
gsi_ctx->ch_dbg[chan_hdl].ch_db_stop++;
val = (((chan_hdl << GSI_EE_n_GSI_CH_CMD_CHID_SHFT) & val = (((chan_hdl << GSI_EE_n_GSI_CH_CMD_CHID_SHFT) &
GSI_EE_n_GSI_CH_CMD_CHID_BMSK) | GSI_EE_n_GSI_CH_CMD_CHID_BMSK) |
((op << GSI_EE_n_GSI_CH_CMD_OPCODE_SHFT) & ((op << GSI_EE_n_GSI_CH_CMD_OPCODE_SHFT) &
@ -1964,6 +1979,7 @@ int gsi_reset_channel(unsigned long chan_hdl)
reset: reset:
init_completion(&ctx->compl); init_completion(&ctx->compl);
gsi_ctx->ch_dbg[chan_hdl].ch_reset++;
val = (((chan_hdl << GSI_EE_n_GSI_CH_CMD_CHID_SHFT) & val = (((chan_hdl << GSI_EE_n_GSI_CH_CMD_CHID_SHFT) &
GSI_EE_n_GSI_CH_CMD_CHID_BMSK) | GSI_EE_n_GSI_CH_CMD_CHID_BMSK) |
((op << GSI_EE_n_GSI_CH_CMD_OPCODE_SHFT) & ((op << GSI_EE_n_GSI_CH_CMD_OPCODE_SHFT) &
@ -2030,6 +2046,7 @@ int gsi_dealloc_channel(unsigned long chan_hdl)
mutex_lock(&gsi_ctx->mlock); mutex_lock(&gsi_ctx->mlock);
init_completion(&ctx->compl); init_completion(&ctx->compl);
gsi_ctx->ch_dbg[chan_hdl].ch_de_alloc++;
val = (((chan_hdl << GSI_EE_n_GSI_CH_CMD_CHID_SHFT) & val = (((chan_hdl << GSI_EE_n_GSI_CH_CMD_CHID_SHFT) &
GSI_EE_n_GSI_CH_CMD_CHID_BMSK) | GSI_EE_n_GSI_CH_CMD_CHID_BMSK) |
((op << GSI_EE_n_GSI_CH_CMD_OPCODE_SHFT) & ((op << GSI_EE_n_GSI_CH_CMD_OPCODE_SHFT) &

11
drivers/platform/msm/gsi/gsi.h
View file

@ -125,12 +125,23 @@ struct gsi_ee_scratch {
uint32_t word1; uint32_t word1;
}; };
struct ch_debug_stats {
unsigned long ch_allocate;
unsigned long ch_start;
unsigned long ch_stop;
unsigned long ch_reset;
unsigned long ch_de_alloc;
unsigned long ch_db_stop;
unsigned long cmd_completed;
};
struct gsi_ctx { struct gsi_ctx {
void __iomem *base; void __iomem *base;
struct device *dev; struct device *dev;
struct gsi_per_props per; struct gsi_per_props per;
bool per_registered; bool per_registered;
struct gsi_chan_ctx chan[GSI_CHAN_MAX]; struct gsi_chan_ctx chan[GSI_CHAN_MAX];
struct ch_debug_stats ch_dbg[GSI_CHAN_MAX];
struct gsi_evt_ctx evtr[GSI_EVT_RING_MAX]; struct gsi_evt_ctx evtr[GSI_EVT_RING_MAX];
struct mutex mlock; struct mutex mlock;
spinlock_t slock; spinlock_t slock;