From c210ced6745b198d6daf65610fd6ee6b78018a31 Mon Sep 17 00:00:00 2001 From: Ashok Vuyyuru Date: Wed, 23 Oct 2019 01:58:30 +0530 Subject: [PATCH] msm: ipa4: Update mask and shift values for aggr force close register Because of not updated mask and shift value, IPA HW not able to process the forcce close command and asserting with invalid command offset. Add changes to update mask and shift values for aggregation force close register. Change-Id: I19164a32c6a5d49fb005c4a09eb95a23a5d4b6ec Signed-off-by: Ashok Vuyyuru --- drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.c | 5 +++++ drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg_i.h | 2 ++ 2 files changed, 7 insertions(+) diff --git a/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.c b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.c index 440788fa0b25..2c0cc1fb7f44 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.c @@ -3659,6 +3659,11 @@ void ipahal_get_aggr_force_close_valmask(int ep_idx, IPA_AGGR_FORCE_CLOSE_AGGR_FORCE_CLOSE_PIPE_BITMAP_SHFT_V4_5; bmsk = IPA_AGGR_FORCE_CLOSE_AGGR_FORCE_CLOSE_PIPE_BITMAP_BMSK_V4_5; + } else if (ipahal_ctx->hw_type <= IPA_HW_v4_7) { + shft = + IPA_AGGR_FORCE_CLOSE_AGGR_FORCE_CLOSE_PIPE_BITMAP_SHFT_V4_7; + bmsk = + IPA_AGGR_FORCE_CLOSE_AGGR_FORCE_CLOSE_PIPE_BITMAP_BMSK_V4_7; } if (ep_idx > (sizeof(valmask->val) * 8 - 1)) { diff --git a/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg_i.h b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg_i.h index 64737923a381..a6e8b608a04d 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg_i.h +++ b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg_i.h @@ -139,6 +139,8 @@ int ipahal_reg_init(enum ipa_hw_type ipa_hw_type); #define IPA_AGGR_FORCE_CLOSE_AGGR_FORCE_CLOSE_PIPE_BITMAP_SHFT_V4_2 0 #define IPA_AGGR_FORCE_CLOSE_AGGR_FORCE_CLOSE_PIPE_BITMAP_BMSK_V4_5 0x7fffffff #define IPA_AGGR_FORCE_CLOSE_AGGR_FORCE_CLOSE_PIPE_BITMAP_SHFT_V4_5 0 +#define IPA_AGGR_FORCE_CLOSE_AGGR_FORCE_CLOSE_PIPE_BITMAP_BMSK_V4_7 0x7fffff +#define IPA_AGGR_FORCE_CLOSE_AGGR_FORCE_CLOSE_PIPE_BITMAP_SHFT_V4_7 0 /* IPA_ENDP_INIT_ROUTE_n register */ #define IPA_ENDP_INIT_ROUTE_n_ROUTE_TABLE_INDEX_BMSK 0x1f