Skip to content

Commit

Permalink
net: ipa: introduce __gsi_channel_start()
Browse files Browse the repository at this point in the history
Create a new function that does most of the work of starting a
channel.  What's different is that it takes a flag indicating
whether the channel should really be started or not.  Create
another new function __gsi_channel_stop() that behaves similarly.

IPA v3.5.1 implements suspend using a special SUSPEND endpoint
setting.  If the endpoint is suspended when an I/O completes on the
underlying GSI channel, a SUSPEND interrupt is generated.

Newer versions of IPA do not implement the SUSPEND endpoint mode.
Instead, endpoint suspend is implemented by simply stopping the
underlying GSI channel.  In this case, a completing I/O on a
*stopped* channel causes the SUSPEND interrupt condition.

These new functions put all activity related to starting or stopping
a channel (including "thawing/freezing" the channel) in one place,
whether or not the channel is actually started or stopped.

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 697e834 commit 893b838
Showing 1 changed file with 23 additions and 20 deletions.
43 changes: 23 additions & 20 deletions drivers/net/ipa/gsi.c
Original file line number Diff line number Diff line change
Expand Up @@ -873,15 +873,14 @@ static void gsi_channel_deprogram(struct gsi_channel *channel)
/* Nothing to do */
}

/* Start an allocated GSI channel */
int gsi_channel_start(struct gsi *gsi, u32 channel_id)
static int __gsi_channel_start(struct gsi_channel *channel, bool start)
{
struct gsi_channel *channel = &gsi->channel[channel_id];
struct gsi *gsi = channel->gsi;
int ret;

mutex_lock(&gsi->mutex);

ret = gsi_channel_start_command(channel);
ret = start ? gsi_channel_start_command(channel) : 0;

mutex_unlock(&gsi->mutex);

Expand All @@ -892,6 +891,14 @@ int gsi_channel_start(struct gsi *gsi, u32 channel_id)
return ret;
}

/* Start an allocated GSI channel */
int gsi_channel_start(struct gsi *gsi, u32 channel_id)
{
struct gsi_channel *channel = &gsi->channel[channel_id];

return __gsi_channel_start(channel, true);
}

static int gsi_channel_stop_retry(struct gsi_channel *channel)
{
u32 retries = GSI_CHANNEL_STOP_RETRIES;
Expand All @@ -912,15 +919,13 @@ static int gsi_channel_stop_retry(struct gsi_channel *channel)
return ret;
}

/* Stop a started channel */
int gsi_channel_stop(struct gsi *gsi, u32 channel_id)
static int __gsi_channel_stop(struct gsi_channel *channel, bool stop)
{
struct gsi_channel *channel = &gsi->channel[channel_id];
int ret;

gsi_channel_freeze(channel);

ret = gsi_channel_stop_retry(channel);
ret = stop ? gsi_channel_stop_retry(channel) : 0;

/* Re-thaw the channel if an error occurred while stopping */
if (ret)
Expand All @@ -929,6 +934,14 @@ int gsi_channel_stop(struct gsi *gsi, u32 channel_id)
return ret;
}

/* Stop a started channel */
int gsi_channel_stop(struct gsi *gsi, u32 channel_id)
{
struct gsi_channel *channel = &gsi->channel[channel_id];

return __gsi_channel_stop(channel, true);
}

/* Reset and reconfigure a channel, (possibly) enabling the doorbell engine */
void gsi_channel_reset(struct gsi *gsi, u32 channel_id, bool doorbell)
{
Expand All @@ -952,25 +965,15 @@ int gsi_channel_suspend(struct gsi *gsi, u32 channel_id, bool stop)
{
struct gsi_channel *channel = &gsi->channel[channel_id];

if (stop)
return gsi_channel_stop(gsi, channel_id);

gsi_channel_freeze(channel);

return 0;
return __gsi_channel_stop(channel, stop);
}

/* Resume a suspended channel (starting will be requested if STOPPED) */
int gsi_channel_resume(struct gsi *gsi, u32 channel_id, bool start)
{
struct gsi_channel *channel = &gsi->channel[channel_id];

if (start)
return gsi_channel_start(gsi, channel_id);

gsi_channel_thaw(channel);

return 0;
return __gsi_channel_start(channel, start);
}

/**
Expand Down

0 comments on commit 893b838

Please sign in to comment.