Commit 816316ca authored by Alex Elder's avatar Alex Elder Committed by David S. Miller
Browse files

net: ipa: disable HOLB drop when updating timer 



The head-of-line blocking timer should only be modified when
head-of-line drop is disabled.

One of the steps in recovering from a modem crash is to enable
dropping of packets with timeout of 0 (immediate).  We don't know
how the modem configured its endpoints, so before we program the
timer, we need to ensure HOL_BLOCK is disabled.

Fixes: 84f9bd12 ("soc: qcom: ipa: IPA endpoints")
Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6e228d8c

drivers/net/ipa/ipa_endpoint.c

+2 −0
Original line number Diff line number Diff line
@@ -853,6 +853,7 @@ static void ipa_endpoint_init_hol_block_timer(struct ipa_endpoint *endpoint, 
	u32 offset;

	u32 val;



	/* This should only be changed when HOL_BLOCK_EN is disabled */

	offset = IPA_REG_ENDP_INIT_HOL_BLOCK_TIMER_N_OFFSET(endpoint_id);

	val = hol_block_timer_val(ipa, microseconds);

	iowrite32(val, ipa->reg_virt + offset);
@@ -883,6 +884,7 @@ void ipa_endpoint_modem_hol_block_clear_all(struct ipa *ipa) 
		if (endpoint->toward_ipa || endpoint->ee_id != GSI_EE_MODEM)

			continue;



		ipa_endpoint_init_hol_block_enable(endpoint, false);

		ipa_endpoint_init_hol_block_timer(endpoint, 0);

		ipa_endpoint_init_hol_block_enable(endpoint, true);

	}