diff mbox series

[net-next] net: ipa: restrict special reset to IPA v3.5.1

Message ID 20201102173435.5987-1-elder@linaro.org (mailing list archive)
State Not Applicable
Delegated to: Netdev Maintainers
Headers show
Series [net-next] net: ipa: restrict special reset to IPA v3.5.1 | expand

Commit Message

Alex Elder Nov. 2, 2020, 5:34 p.m. UTC
With IPA v3.5.1, if IPA aggregation is active at the time an
underlying GSI channel reset is performed, some special handling
is required.

There is logic in ipa_endpoint_reset() that arranges for that
special handling, but it's done for all hardware versions, not
just IPA v3.5.1.

Fix the logic to properly restrict the special behavior.

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

Comments

Jakub Kicinski Nov. 4, 2020, 1:57 a.m. UTC | #1
On Mon,  2 Nov 2020 11:34:35 -0600 Alex Elder wrote:
> With IPA v3.5.1, if IPA aggregation is active at the time an
> underlying GSI channel reset is performed, some special handling
> is required.
> 
> There is logic in ipa_endpoint_reset() that arranges for that
> special handling, but it's done for all hardware versions, not
> just IPA v3.5.1.
> 
> Fix the logic to properly restrict the special behavior.
> 
> Signed-off-by: Alex Elder <elder@linaro.org>

Applied, thanks!
diff mbox series

Patch

diff --git a/drivers/net/ipa/ipa_endpoint.c b/drivers/net/ipa/ipa_endpoint.c
index 7386e10615d99..6f79028910e3c 100644
--- a/drivers/net/ipa/ipa_endpoint.c
+++ b/drivers/net/ipa/ipa_endpoint.c
@@ -1314,7 +1314,7 @@  static void ipa_endpoint_reset(struct ipa_endpoint *endpoint)
 	 */
 	legacy = ipa->version == IPA_VERSION_3_5_1;
 	special = !endpoint->toward_ipa && endpoint->data->aggregation;
-	if (special && ipa_endpoint_aggr_active(endpoint))
+	if (legacy && special && ipa_endpoint_aggr_active(endpoint))
 		ret = ipa_endpoint_reset_rx_aggr(endpoint);
 	else
 		gsi_channel_reset(&ipa->gsi, channel_id, legacy);