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

net: ipa: use gsi->version for channel suspend/resume 



The GSI layer has the IPA version now, so there's no need for
version-specific flags to be passed from IPA.  One instance of
this is in gsi_channel_suspend() and gsi_channel_resume(), which
indicate whether or not the endpoint suspend is implemented by
GSI stopping the channel.  We can make that determination based
on gsi->version, eliminating the need for a Boolean flag in those
functions.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 93bbcfee

drivers/net/ipa/gsi.c

+8 −6
Original line number Diff line number Diff line
@@ -1026,13 +1026,14 @@ void gsi_channel_reset(struct gsi *gsi, u32 channel_id, bool doorbell) 
	mutex_unlock(&gsi->mutex);

}



/* Stop a STARTED channel for suspend (using stop if requested) */

int gsi_channel_suspend(struct gsi *gsi, u32 channel_id, bool stop)

/* Stop a started channel for suspend */

int gsi_channel_suspend(struct gsi *gsi, u32 channel_id)

{

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

	int ret;



	ret = __gsi_channel_stop(channel, stop);

	/* Prior to IPA v4.0 suspend/resume is not implemented by GSI */

	ret = __gsi_channel_stop(channel, gsi->version >= IPA_VERSION_4_0);

	if (ret)

		return ret;
@@ -1042,12 +1043,13 @@ int gsi_channel_suspend(struct gsi *gsi, u32 channel_id, bool stop) 
	return 0;

}



/* Resume a suspended channel (starting will be requested if STOPPED) */

int gsi_channel_resume(struct gsi *gsi, u32 channel_id, bool start)

/* Resume a suspended channel (starting if stopped) */

int gsi_channel_resume(struct gsi *gsi, u32 channel_id)

{

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



	return __gsi_channel_start(channel, start);

	/* Prior to IPA v4.0 suspend/resume is not implemented by GSI */

	return __gsi_channel_start(channel, gsi->version >= IPA_VERSION_4_0);

}



/**

drivers/net/ipa/gsi.h

+17 −2
Original line number Diff line number Diff line
@@ -232,8 +232,23 @@ int gsi_channel_stop(struct gsi *gsi, u32 channel_id); 
 */

void gsi_channel_reset(struct gsi *gsi, u32 channel_id, bool doorbell);



int gsi_channel_suspend(struct gsi *gsi, u32 channel_id, bool stop);

int gsi_channel_resume(struct gsi *gsi, u32 channel_id, bool start);

/**

 * gsi_channel_suspend() - Suspend a GSI channel

 * @gsi:	GSI pointer

 * @channel_id:	Channel to suspend

 *

 * For IPA v4.0+, suspend is implemented by stopping the channel.

 */

int gsi_channel_suspend(struct gsi *gsi, u32 channel_id);



/**

 * gsi_channel_resume() - Resume a suspended GSI channel

 * @gsi:	GSI pointer

 * @channel_id:	Channel to resume

 *

 * For IPA v4.0+, the stopped channel is started again.

 */

int gsi_channel_resume(struct gsi *gsi, u32 channel_id);



/**

 * gsi_init() - Initialize the GSI subsystem

drivers/net/ipa/ipa_endpoint.c

+2 −12
Original line number Diff line number Diff line
@@ -1587,7 +1587,6 @@ void ipa_endpoint_suspend_one(struct ipa_endpoint *endpoint) 
{

	struct device *dev = &endpoint->ipa->pdev->dev;

	struct gsi *gsi = &endpoint->ipa->gsi;

	bool stop_channel;

	int ret;



	if (!(endpoint->ipa->enabled & BIT(endpoint->endpoint_id)))
@@ -1598,11 +1597,7 @@ void ipa_endpoint_suspend_one(struct ipa_endpoint *endpoint) 
		(void)ipa_endpoint_program_suspend(endpoint, true);

	}



	/* Starting with IPA v4.0, endpoints are suspended by stopping the

	 * underlying GSI channel rather than using endpoint suspend mode.

	 */

	stop_channel = endpoint->ipa->version >= IPA_VERSION_4_0;

	ret = gsi_channel_suspend(gsi, endpoint->channel_id, stop_channel);

	ret = gsi_channel_suspend(gsi, endpoint->channel_id);

	if (ret)

		dev_err(dev, "error %d suspending channel %u\n", ret,

			endpoint->channel_id);
@@ -1612,7 +1607,6 @@ void ipa_endpoint_resume_one(struct ipa_endpoint *endpoint) 
{

	struct device *dev = &endpoint->ipa->pdev->dev;

	struct gsi *gsi = &endpoint->ipa->gsi;

	bool start_channel;

	int ret;



	if (!(endpoint->ipa->enabled & BIT(endpoint->endpoint_id)))
@@ -1621,11 +1615,7 @@ void ipa_endpoint_resume_one(struct ipa_endpoint *endpoint) 
	if (!endpoint->toward_ipa)

		(void)ipa_endpoint_program_suspend(endpoint, false);



	/* Starting with IPA v4.0, the underlying GSI channel must be

	 * restarted for resume.

	 */

	start_channel = endpoint->ipa->version >= IPA_VERSION_4_0;

	ret = gsi_channel_resume(gsi, endpoint->channel_id, start_channel);

	ret = gsi_channel_resume(gsi, endpoint->channel_id);

	if (ret)

		dev_err(dev, "error %d resuming channel %u\n", ret,

			endpoint->channel_id);