The INIT_HOL_BLOCK_EN and INIT_HOL_BLOCK_TIMER endpoint registers
are only valid for RX endpoints.

Have ipa_endpoint_modem_hol_block_clear_all() skip writing these
registers for TX endpoints.

Signed-off-by: Alex Elder <el...@linaro.org>
---
 drivers/net/ipa/ipa_endpoint.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/drivers/net/ipa/ipa_endpoint.c b/drivers/net/ipa/ipa_endpoint.c
index 9f50d0d11704..3f5a41fc1997 100644
--- a/drivers/net/ipa/ipa_endpoint.c
+++ b/drivers/net/ipa/ipa_endpoint.c
@@ -642,6 +642,8 @@ static int ipa_endpoint_init_hol_block_timer(struct 
ipa_endpoint *endpoint,
        u32 offset;
        u32 val;
 
+       /* assert(!endpoint->toward_ipa); */
+
        /* XXX We'll fix this when the register definition is clear */
        if (microseconds) {
                struct device *dev = &ipa->pdev->dev;
@@ -671,6 +673,8 @@ ipa_endpoint_init_hol_block_enable(struct ipa_endpoint 
*endpoint, bool enable)
        u32 offset;
        u32 val;
 
+       /* assert(!endpoint->toward_ipa); */
+
        val = u32_encode_bits(enable ? 1 : 0, HOL_BLOCK_EN_FMASK);
        offset = IPA_REG_ENDP_INIT_HOL_BLOCK_EN_N_OFFSET(endpoint_id);
        iowrite32(val, endpoint->ipa->reg_virt + offset);
@@ -683,7 +687,7 @@ void ipa_endpoint_modem_hol_block_clear_all(struct ipa *ipa)
        for (i = 0; i < IPA_ENDPOINT_MAX; i++) {
                struct ipa_endpoint *endpoint = &ipa->endpoint[i];
 
-               if (endpoint->ee_id != GSI_EE_MODEM)
+               if (endpoint->toward_ipa || endpoint->ee_id != GSI_EE_MODEM)
                        continue;
 
                (void)ipa_endpoint_init_hol_block_timer(endpoint, 0);
-- 
2.25.1

Reply via email to