Commit 4fef691c authored by Alex Elder's avatar Alex Elder Committed by Jakub Kicinski
Browse files

net: ipa: disable interrupt and NAPI after channel stop 



Disable both the I/O completion interrupt and NAPI polling on a
channel *after* we successfully stop it rather than before.  This
ensures a completion occurring just before the channel is stopped
gets processed.

Enable NAPI polling and the interrupt *before* starting a channel
rather than after, to be symmetric.  A stopped channel won't
generate any completion interrupts anyway.

Enable NAPI before the interrupt and disable it afterward.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Acked-by: default avatarWillem de Bruijn <willemb@google.com>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent bd1ea1e4

drivers/net/ipa/gsi.c

+9 −9
Original line number Diff line number Diff line
@@ -860,15 +860,18 @@ static int __gsi_channel_start(struct gsi_channel *channel, bool start) 
	struct gsi *gsi = channel->gsi;

	int ret;



	napi_enable(&channel->napi);

	gsi_irq_ieob_enable_one(gsi, channel->evt_ring_id);



	mutex_lock(&gsi->mutex);



	ret = start ? gsi_channel_start_command(channel) : 0;



	mutex_unlock(&gsi->mutex);



	if (!ret) {

		gsi_irq_ieob_enable_one(gsi, channel->evt_ring_id);

		napi_enable(&channel->napi);

	if (ret) {

		gsi_irq_ieob_disable_one(gsi, channel->evt_ring_id);

		napi_disable(&channel->napi);

	}



	return ret;
@@ -908,14 +911,11 @@ static int __gsi_channel_stop(struct gsi_channel *channel, bool stop) 
	int ret;



	gsi_channel_trans_quiesce(channel);

	napi_disable(&channel->napi);

	gsi_irq_ieob_disable_one(gsi, channel->evt_ring_id);



	ret = stop ? gsi_channel_stop_retry(channel) : 0;



	if (ret) {

		gsi_irq_ieob_enable_one(gsi, channel->evt_ring_id);

		napi_enable(&channel->napi);

	if (!ret) {

		gsi_irq_ieob_disable_one(gsi, channel->evt_ring_id);

		napi_disable(&channel->napi);

	}



	return ret;