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

net: ipa: record and use the number of defined endpoint IDs 



Define a new field in the IPA structure that records the maximum
number of entries that will be used in the IPA endpoint array.  Use
that value rather than IPA_ENDPOINT_MAX to determine the end
condition for two loops that iterate over all endpoints.

Signed-off-by: default avatarAlex Elder <elder@linaro.org>
Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 5274c715

drivers/net/ipa/ipa.h

+2 −0
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ struct ipa_interrupt; 
 * @zero_addr:		DMA address of preallocated zero-filled memory

 * @zero_virt:		Virtual address of preallocated zero-filled memory

 * @zero_size:		Size (bytes) of preallocated zero-filled memory

 * @endpoint_count:	Number of endpoints represented by bit masks below

 * @defined:		Bit mask indicating endpoints defined in config data

 * @available:		Bit mask indicating endpoints hardware supports

 * @filter_map:		Bit mask indicating endpoints that support filtering
@@ -117,6 +118,7 @@ struct ipa { 
	size_t zero_size;



	/* Bit masks indicating endpoint state */

	u32 endpoint_count;

	u32 defined;			/* Defined in configuration data */

	u32 available;			/* Supported by hardware */

	u32 filter_map;

drivers/net/ipa/ipa_endpoint.c

+5 −3
Original line number Diff line number Diff line
@@ -433,7 +433,7 @@ void ipa_endpoint_modem_pause_all(struct ipa *ipa, bool enable) 
{

	u32 endpoint_id = 0;



	while (endpoint_id < IPA_ENDPOINT_MAX) {

	while (endpoint_id < ipa->endpoint_count) {

		struct ipa_endpoint *endpoint = &ipa->endpoint[endpoint_id++];



		if (endpoint->ee_id != GSI_EE_MODEM)
@@ -1015,7 +1015,7 @@ void ipa_endpoint_modem_hol_block_clear_all(struct ipa *ipa) 
{

	u32 endpoint_id = 0;



	while (endpoint_id < IPA_ENDPOINT_MAX) {

	while (endpoint_id < ipa->endpoint_count) {

		struct ipa_endpoint *endpoint = &ipa->endpoint[endpoint_id++];



		if (endpoint->toward_ipa || endpoint->ee_id != GSI_EE_MODEM)
@@ -1982,7 +1982,9 @@ u32 ipa_endpoint_init(struct ipa *ipa, u32 count, 


	BUILD_BUG_ON(!IPA_REPLENISH_BATCH);



	if (!ipa_endpoint_max(ipa, count, data))

	/* Number of endpoints is one more than the maximum ID */

	ipa->endpoint_count = ipa_endpoint_max(ipa, count, data) + 1;

	if (!ipa->endpoint_count)

		return 0;	/* Error */



	ipa->defined = 0;