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

net: ipa: use a bitmap for enabled endpoints 



Replace the 32-bit unsigned used to track enabled endpoints with a
Linux bitmap, to allow an arbitrary number of endpoints to be
represented.

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

drivers/net/ipa/ipa.h

+2 −2
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ struct ipa_interrupt; 
 * @available:		Bitmap of endpoints supported by hardware

 * @filtered:		Bitmap of endpoints that support filtering

 * @set_up:		Bitmap of endpoints that are set up for use

 * @enabled:		Bit mask indicating endpoints enabled

 * @enabled:		Bitmap of currently enabled endpoints

 * @modem_tx_count:	Number of defined modem TX endoints

 * @endpoint:		Array of endpoint information

 * @channel_map:	Mapping of GSI channel to IPA endpoint
@@ -125,7 +125,7 @@ struct ipa { 
	unsigned long *available;	/* Supported by hardware */

	u64 filtered;			/* Support filtering (AP and modem) */

	unsigned long *set_up;

	u32 enabled;

	unsigned long *enabled;



	u32 modem_tx_count;

	struct ipa_endpoint endpoint[IPA_ENDPOINT_MAX];

drivers/net/ipa/ipa_endpoint.c

+20 −12
Original line number Diff line number Diff line
@@ -1666,6 +1666,7 @@ static void ipa_endpoint_program(struct ipa_endpoint *endpoint) 


int ipa_endpoint_enable_one(struct ipa_endpoint *endpoint)

{

	u32 endpoint_id = endpoint->endpoint_id;

	struct ipa *ipa = endpoint->ipa;

	struct gsi *gsi = &ipa->gsi;

	int ret;
@@ -1675,37 +1676,35 @@ int ipa_endpoint_enable_one(struct ipa_endpoint *endpoint) 
		dev_err(&ipa->pdev->dev,

			"error %d starting %cX channel %u for endpoint %u\n",

			ret, endpoint->toward_ipa ? 'T' : 'R',

			endpoint->channel_id, endpoint->endpoint_id);

			endpoint->channel_id, endpoint_id);

		return ret;

	}



	if (!endpoint->toward_ipa) {

		ipa_interrupt_suspend_enable(ipa->interrupt,

					     endpoint->endpoint_id);

		ipa_interrupt_suspend_enable(ipa->interrupt, endpoint_id);

		ipa_endpoint_replenish_enable(endpoint);

	}



	ipa->enabled |= BIT(endpoint->endpoint_id);

	__set_bit(endpoint_id, ipa->enabled);



	return 0;

}



void ipa_endpoint_disable_one(struct ipa_endpoint *endpoint)

{

	u32 mask = BIT(endpoint->endpoint_id);

	u32 endpoint_id = endpoint->endpoint_id;

	struct ipa *ipa = endpoint->ipa;

	struct gsi *gsi = &ipa->gsi;

	int ret;



	if (!(ipa->enabled & mask))

	if (!test_bit(endpoint_id, ipa->enabled))

		return;



	ipa->enabled ^= mask;

	__clear_bit(endpoint_id, endpoint->ipa->enabled);



	if (!endpoint->toward_ipa) {

		ipa_endpoint_replenish_disable(endpoint);

		ipa_interrupt_suspend_disable(ipa->interrupt,

					      endpoint->endpoint_id);

		ipa_interrupt_suspend_disable(ipa->interrupt, endpoint_id);

	}



	/* Note that if stop fails, the channel's state is not well-defined */
@@ -1713,7 +1712,7 @@ void ipa_endpoint_disable_one(struct ipa_endpoint *endpoint) 
	if (ret)

		dev_err(&ipa->pdev->dev,

			"error %d attempting to stop endpoint %u\n", ret,

			endpoint->endpoint_id);

			endpoint_id);

}



void ipa_endpoint_suspend_one(struct ipa_endpoint *endpoint)
@@ -1722,7 +1721,7 @@ void ipa_endpoint_suspend_one(struct ipa_endpoint *endpoint) 
	struct gsi *gsi = &endpoint->ipa->gsi;

	int ret;



	if (!(endpoint->ipa->enabled & BIT(endpoint->endpoint_id)))

	if (!test_bit(endpoint->endpoint_id, endpoint->ipa->enabled))

		return;



	if (!endpoint->toward_ipa) {
@@ -1742,7 +1741,7 @@ void ipa_endpoint_resume_one(struct ipa_endpoint *endpoint) 
	struct gsi *gsi = &endpoint->ipa->gsi;

	int ret;



	if (!(endpoint->ipa->enabled & BIT(endpoint->endpoint_id)))

	if (!test_bit(endpoint->endpoint_id, endpoint->ipa->enabled))

		return;



	if (!endpoint->toward_ipa)
@@ -1971,6 +1970,8 @@ void ipa_endpoint_exit(struct ipa *ipa) 
	for_each_set_bit(endpoint_id, ipa->defined, ipa->endpoint_count)

		ipa_endpoint_exit_one(&ipa->endpoint[endpoint_id]);



	bitmap_free(ipa->enabled);

	ipa->enabled = NULL;

	bitmap_free(ipa->set_up);

	ipa->set_up = NULL;

	bitmap_free(ipa->defined);
@@ -2003,6 +2004,10 @@ int ipa_endpoint_init(struct ipa *ipa, u32 count, 
	if (!ipa->set_up)

		goto err_free_defined;



	ipa->enabled = bitmap_zalloc(ipa->endpoint_count, GFP_KERNEL);

	if (!ipa->enabled)

		goto err_free_set_up;



	filtered = 0;

	for (name = 0; name < count; name++, data++) {

		if (ipa_gsi_endpoint_data_empty(data))
@@ -2027,6 +2032,9 @@ int ipa_endpoint_init(struct ipa *ipa, u32 count, 


	return 0;



err_free_set_up:

	bitmap_free(ipa->set_up);

	ipa->set_up = NULL;

err_free_defined:

	bitmap_free(ipa->defined);

	ipa->defined = NULL;