Skip to content

Commit

Permalink
net: ipa: kill gsi_channel_freeze() and gsi_channel_thaw()
Browse files Browse the repository at this point in the history
Open-code gsi_channel_freeze() and gsi_channel_thaw() in all callers
and get rid of these two functions.  This is part of reworking the
sequence of things done during channel suspend/resume and start/stop.

Signed-off-by: Alex Elder <elder@linaro.org>
Acked-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  • Loading branch information
Alex Elder authored and Jakub Kicinski committed Feb 3, 2021
1 parent 893b838 commit bd1ea1e
Showing 1 changed file with 12 additions and 25 deletions.
37 changes: 12 additions & 25 deletions drivers/net/ipa/gsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -764,24 +764,6 @@ static void gsi_channel_trans_quiesce(struct gsi_channel *channel)
}
}

/* Stop channel activity. Transactions may not be allocated until thawed. */
static void gsi_channel_freeze(struct gsi_channel *channel)
{
gsi_channel_trans_quiesce(channel);

napi_disable(&channel->napi);

gsi_irq_ieob_disable_one(channel->gsi, channel->evt_ring_id);
}

/* Allow transactions to be used on the channel again. */
static void gsi_channel_thaw(struct gsi_channel *channel)
{
gsi_irq_ieob_enable_one(channel->gsi, channel->evt_ring_id);

napi_enable(&channel->napi);
}

/* Program a channel for use */
static void gsi_channel_program(struct gsi_channel *channel, bool doorbell)
{
Expand Down Expand Up @@ -884,9 +866,10 @@ static int __gsi_channel_start(struct gsi_channel *channel, bool start)

mutex_unlock(&gsi->mutex);

/* Thaw the channel if successful */
if (!ret)
gsi_channel_thaw(channel);
if (!ret) {
gsi_irq_ieob_enable_one(gsi, channel->evt_ring_id);
napi_enable(&channel->napi);
}

return ret;
}
Expand Down Expand Up @@ -921,15 +904,19 @@ static int gsi_channel_stop_retry(struct gsi_channel *channel)

static int __gsi_channel_stop(struct gsi_channel *channel, bool stop)
{
struct gsi *gsi = channel->gsi;
int ret;

gsi_channel_freeze(channel);
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;

/* Re-thaw the channel if an error occurred while stopping */
if (ret)
gsi_channel_thaw(channel);
if (ret) {
gsi_irq_ieob_enable_one(gsi, channel->evt_ring_id);
napi_enable(&channel->napi);
}

return ret;
}
Expand Down

0 comments on commit bd1ea1e

Please sign in to comment.