samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "msm: ipa4: Fix to mask the global interrupt INT1"

Browse Source
This commit is contained in:
qctecmdr
2020-07-15 03:42:19 -07:00
committed by Gerrit - the friendly Code Review server
parent 78ab233b35 a2aa9f1235
commit 6adb226271
1 changed files with 20 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/platform/msm/gsi/gsi.c
View File

@@ -1298,9 +1298,17 @@ int gsi_register_device(struct gsi_per_props *props, unsigned long *dev_hdl)
__gsi_config_evt_irq(props->ee, ~0, ~0);
__gsi_config_ieob_irq(props->ee, ~0, ~0);
__gsi_config_glob_irq(props->ee, ~0, ~0);
/*
* Disabling global INT1 interrupt by default and enable it
* onlt when sending the generic command.
*/
__gsi_config_gen_irq(props->ee, ~0,
~GSI_EE_n_CNTXT_GSI_IRQ_CLR_GSI_BREAK_POINT_BMSK);
__gsi_config_glob_irq(props->ee,
GSI_EE_n_CNTXT_GLOB_IRQ_EN_GP_INT1_BMSK, 0);
gsi_writel(props->intr, gsi_ctx->base +
GSI_EE_n_CNTXT_INTSET_OFFS(gsi_ctx->per.ee));
/* set GSI_TOP_EE_n_CNTXT_MSI_BASE_LSB/MSB to 0 */
@@ -4318,6 +4326,8 @@ int gsi_halt_channel_ee(unsigned int chan_idx, unsigned int ee, int *code)
}
mutex_lock(&gsi_ctx->mlock);
__gsi_config_glob_irq(gsi_ctx->per.ee,
GSI_EE_n_CNTXT_GLOB_IRQ_EN_GP_INT1_BMSK, ~0);
reinit_completion(&gsi_ctx->gen_ee_cmd_compl);
/* invalidate the response */
@@ -4363,6 +4373,8 @@ int gsi_halt_channel_ee(unsigned int chan_idx, unsigned int ee, int *code)
res = GSI_STATUS_SUCCESS;
*code = gsi_ctx->scratch.word0.s.generic_ee_cmd_return_code;
free_lock:
__gsi_config_glob_irq(gsi_ctx->per.ee,
GSI_EE_n_CNTXT_GLOB_IRQ_EN_GP_INT1_BMSK, 0);
mutex_unlock(&gsi_ctx->mlock);
return res;
@@ -4385,6 +4397,8 @@ int gsi_alloc_channel_ee(unsigned int chan_idx, unsigned int ee, int *code)
return gsi_alloc_ap_channel(chan_idx);
mutex_lock(&gsi_ctx->mlock);
__gsi_config_glob_irq(gsi_ctx->per.ee,
GSI_EE_n_CNTXT_GLOB_IRQ_EN_GP_INT1_BMSK, ~0);
reinit_completion(&gsi_ctx->gen_ee_cmd_compl);
/* invalidate the response */
@@ -4432,6 +4446,8 @@ int gsi_alloc_channel_ee(unsigned int chan_idx, unsigned int ee, int *code)
res = GSI_STATUS_SUCCESS;
*code = gsi_ctx->scratch.word0.s.generic_ee_cmd_return_code;
free_lock:
__gsi_config_glob_irq(gsi_ctx->per.ee,
GSI_EE_n_CNTXT_GLOB_IRQ_EN_GP_INT1_BMSK, 0);
mutex_unlock(&gsi_ctx->mlock);
return res;
@@ -4457,6 +4473,8 @@ int gsi_enable_flow_control_ee(unsigned int chan_idx, unsigned int ee,
}
mutex_lock(&gsi_ctx->mlock);
__gsi_config_glob_irq(gsi_ctx->per.ee,
GSI_EE_n_CNTXT_GLOB_IRQ_EN_GP_INT1_BMSK, ~0);
reinit_completion(&gsi_ctx->gen_ee_cmd_compl);
/* invalidate the response */
@@ -4523,6 +4541,8 @@ int gsi_enable_flow_control_ee(unsigned int chan_idx, unsigned int ee,
}
*code = gsi_ctx->scratch.word0.s.generic_ee_cmd_return_code;
free_lock:
__gsi_config_glob_irq(gsi_ctx->per.ee,
GSI_EE_n_CNTXT_GLOB_IRQ_EN_GP_INT1_BMSK, 0);
mutex_unlock(&gsi_ctx->mlock);
return res;