net: ipa: only reset channel twice for IPA v3.5.1

In gsi_channel_reset(), RX channels are subjected to two consecutive
CHANNEL_RESET commands.  This workaround should only be used for IPA
version 3.5.1, and for newer hardware "can lead to unwanted behavior."

Only issue the second CHANNEL_RESET command for legacy hardware.

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index cd5d8045c7e533aad9b93afa944264658983a5b9..8ccbbb920c11843dac7c1113b28599feb2eb7ecf 100644 (file)
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -840,9 +840,9 @@ void gsi_channel_reset(struct gsi *gsi, u32 channel_id, bool legacy)
 
        mutex_lock(&gsi->mutex);
 
-       /* Due to a hardware quirk we need to reset RX channels twice. */
        gsi_channel_reset_command(channel);
-       if (!channel->toward_ipa)
+       /* Due to a hardware quirk we may need to reset RX channels twice. */
+       if (legacy && !channel->toward_ipa)
                gsi_channel_reset_command(channel);
 
        gsi_channel_program(channel, legacy);