diff options
| author | Michael Bestas <mkbestas@lineageos.org> | 2020-07-23 02:17:45 +0300 |
|---|---|---|
| committer | Michael Bestas <mkbestas@lineageos.org> | 2020-07-23 02:31:20 +0300 |
| commit | 70a2a874d6da2482f00ed1a9084d5c9f0feb4cbc (patch) | |
| tree | 4bba617823c4a8ff3d2412785b4f0502ce3d1ada | |
| parent | 56a79434542bb555525f8be703ad1b0751b1611f (diff) | |
Revert "msm: ipa3: Fix IPA aggregation register val-mask calculation"
This reverts commit fc9b313534e6c572a93475d71005431604f8d856.
| -rw-r--r-- | drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.c | 18 |
1 files changed, 10 insertions, 8 deletions
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 0d8dc6a0852f..9fe7b6c59302 100644 --- a/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.c +++ b/drivers/platform/msm/ipa/ipa_v3/ipahal/ipahal_reg.c @@ -1530,13 +1530,15 @@ void ipahal_get_disable_aggr_valmask(struct ipahal_reg_valmask *valmask) return; } - valmask->val = (1 << IPA_ENDP_INIT_AGGR_n_AGGR_FORCE_CLOSE_SHFT) && - IPA_ENDP_INIT_AGGR_n_AGGR_FORCE_CLOSE_BMSK; - valmask->mask = IPA_ENDP_INIT_AGGR_n_AGGR_FORCE_CLOSE_BMSK; - - valmask->val |= ((0 << IPA_ENDP_INIT_AGGR_n_AGGR_EN_SHFT) && - IPA_ENDP_INIT_AGGR_n_AGGR_EN_BMSK); - valmask->mask |= IPA_ENDP_INIT_AGGR_n_AGGR_EN_BMSK; + valmask->val = (1 & IPA_ENDP_INIT_AGGR_n_AGGR_FORCE_CLOSE_BMSK) << + IPA_ENDP_INIT_AGGR_n_AGGR_FORCE_CLOSE_SHFT; + valmask->mask = IPA_ENDP_INIT_AGGR_n_AGGR_FORCE_CLOSE_BMSK << + IPA_ENDP_INIT_AGGR_n_AGGR_FORCE_CLOSE_SHFT; + + valmask->val |= ((0 & IPA_ENDP_INIT_AGGR_n_AGGR_EN_BMSK) << + IPA_ENDP_INIT_AGGR_n_AGGR_EN_SHFT); + valmask->mask |= ((IPA_ENDP_INIT_AGGR_n_AGGR_EN_BMSK << + IPA_ENDP_INIT_AGGR_n_AGGR_EN_SHFT)); } u32 ipahal_aggr_get_max_byte_limit(void) @@ -1582,7 +1584,7 @@ void ipahal_get_aggr_force_close_valmask(int ep_idx, return; } IPA_SETFIELD_IN_REG(valmask->val, 1 << ep_idx, shft, bmsk); - valmask->mask = bmsk; + valmask->mask = bmsk << shft; } void ipahal_get_fltrt_hash_flush_valmask( |