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: Alex Elder <elder@linaro.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ipa/ipa.h b/drivers/net/ipa/ipa.h
index e975f63271c9629084d8c1c78a897d3d1012a3f4..a44595575d06667c36bffc052191b76b4d575ffa 100644 (file)
--- a/drivers/net/ipa/ipa.h
+++ b/drivers/net/ipa/ipa.h
@@ -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;

diff --git a/drivers/net/ipa/ipa_endpoint.c b/drivers/net/ipa/ipa_endpoint.c
index 9fd72ba149afad4a9cbb92210edb609d47bfe61a..2a6184ea8f5ca9e1d238727e4bbde224225468a3 100644 (file)
--- a/drivers/net/ipa/ipa_endpoint.c
+++ b/drivers/net/ipa/ipa_endpoint.c
@@ -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;