linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH net-next] net: ipa: restrict special reset to IPA v3.5.1
@ 2020-11-02 17:34 Alex Elder
  2020-11-04  1:57 ` Jakub Kicinski
  0 siblings, 1 reply; 2+ messages in thread
From: Alex Elder @ 2020-11-02 17:34 UTC (permalink / raw)
  To: davem, kuba
  Cc: evgreen, subashab, cpratapa, bjorn.andersson, netdev, linux-kernel

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(-)

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);
-- 
2.20.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH net-next] net: ipa: restrict special reset to IPA v3.5.1
  2020-11-02 17:34 [PATCH net-next] net: ipa: restrict special reset to IPA v3.5.1 Alex Elder
@ 2020-11-04  1:57 ` Jakub Kicinski
  0 siblings, 0 replies; 2+ messages in thread
From: Jakub Kicinski @ 2020-11-04  1:57 UTC (permalink / raw)
  To: Alex Elder
  Cc: davem, evgreen, subashab, cpratapa, bjorn.andersson, netdev,
	linux-kernel

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!

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-11-04  1:57 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-02 17:34 [PATCH net-next] net: ipa: restrict special reset to IPA v3.5.1 Alex Elder
2020-11-04  1:57 ` Jakub Kicinski

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).