Commit 5468cbcd authored by Alex Elder's avatar Alex Elder Committed by David S. Miller
Browse files

net: ipa: always check for stopped channel 



In gsi_channel_stop(), there's a check to see if the channel might
have entered STOPPED state since a previous call, which might have
timed out before stopping completed.

That check actually belongs in gsi_channel_stop_command(), which is
called repeatedly by gsi_channel_stop() for RX channels.

Fixes: 650d1603 ("soc: qcom: ipa: the generic software interface")
Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent f2ca673d

drivers/net/ipa/gsi.c

+7 −9
Original line number Diff line number Diff line
@@ -500,6 +500,13 @@ static int gsi_channel_stop_command(struct gsi_channel *channel) 
	int ret;



	state = gsi_channel_state(channel);



	/* Channel could have entered STOPPED state since last call

	 * if it timed out.  If so, we're done.

	 */

	if (state == GSI_CHANNEL_STATE_STOPPED)

		return 0;



	if (state != GSI_CHANNEL_STATE_STARTED &&

	    state != GSI_CHANNEL_STATE_STOP_IN_PROC)

		return -EINVAL;
@@ -789,20 +796,11 @@ int gsi_channel_start(struct gsi *gsi, u32 channel_id) 
int gsi_channel_stop(struct gsi *gsi, u32 channel_id)

{

	struct gsi_channel *channel = &gsi->channel[channel_id];

	enum gsi_channel_state state;

	u32 retries;

	int ret;



	gsi_channel_freeze(channel);



	/* Channel could have entered STOPPED state since last call if the

	 * STOP command timed out.  We won't stop a channel if stopping it

	 * was successful previously (so we still want the freeze above).

	 */

	state = gsi_channel_state(channel);

	if (state == GSI_CHANNEL_STATE_STOPPED)

		return 0;



	/* RX channels might require a little time to enter STOPPED state */

	retries = channel->toward_ipa ? 0 : GSI_CHANNEL_STOP_RX_RETRIES;

CRA Git | Maintained and supported by SUSTech CRA and CCSE