net: ipa: count the number of modem TX endpoints

In ipa_endpoint_modem_exception_reset_all(), a high estimate was
made of the number of endpoints that need their status register
updated.  We only used what was needed, so the high estimate didn't
matter much.

However the next few patches are going to limit the number of
commands in a single transaction, and the overestimate would exceed
that.  So count the number of modem TX endpoints at initialization
time, and use it in ipa_endpoint_modem_exception_reset_all().

Signed-off-by: Alex Elder <elder@linaro.org>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/ipa/ipa.h b/drivers/net/ipa/ipa.h
index 9fc880eb7e3a6a6e7f53277caeca8b69d450d2bb..4fc3c72359f5ef00ee60c04bc0fbbd745a1d38ee 100644 (file)
--- a/drivers/net/ipa/ipa.h
+++ b/drivers/net/ipa/ipa.h
@@ -62,6 +62,7 @@ struct ipa_interrupt;
  * @initialized:       Bit mask indicating endpoints initialized
  * @set_up:            Bit mask indicating endpoints set up
  * @enabled:           Bit mask indicating endpoints enabled
+ * @modem_tx_count:    Number of defined modem TX endoints
  * @endpoint:          Array of endpoint information
  * @channel_map:       Mapping of GSI channel to IPA endpoint
  * @name_map:          Mapping of IPA endpoint name to IPA endpoint
@@ -114,6 +115,7 @@ struct ipa {
        u32 set_up;
        u32 enabled;
 
+       u32 modem_tx_count;
        struct ipa_endpoint endpoint[IPA_ENDPOINT_MAX];
        struct ipa_endpoint *channel_map[GSI_CHANNEL_COUNT_MAX];
        struct ipa_endpoint *name_map[IPA_ENDPOINT_COUNT];

diff --git a/drivers/net/ipa/ipa_endpoint.c b/drivers/net/ipa/ipa_endpoint.c
index 5ed5b8fd3ea36f73b2ca308a4f2ff787cbd59352..385aa63ab4bbc62213db766ab9352774b33443c5 100644 (file)
--- a/drivers/net/ipa/ipa_endpoint.c
+++ b/drivers/net/ipa/ipa_endpoint.c
@@ -442,12 +442,10 @@ int ipa_endpoint_modem_exception_reset_all(struct ipa *ipa)
        struct gsi_trans *trans;
        u32 count;
 
-       /* We need one command per modem TX endpoint.  We can get an upper
-        * bound on that by assuming all initialized endpoints are modem->IPA.
-        * That won't happen, and we could be more precise, but this is fine
-        * for now.  End the transaction with commands to clear the pipeline.
+       /* We need one command per modem TX endpoint, plus the commands
+        * that clear the pipeline.
         */
-       count = hweight32(initialized) + ipa_cmd_pipeline_clear_count();
+       count = ipa->modem_tx_count + ipa_cmd_pipeline_clear_count();
        trans = ipa_cmd_trans_alloc(ipa, count);
        if (!trans) {
                dev_err(&ipa->pdev->dev,
@@ -1924,6 +1922,8 @@ u32 ipa_endpoint_init(struct ipa *ipa, u32 count,
 
                if (data->endpoint.filter_support)
                        filter_map |= BIT(data->endpoint_id);
+               if (data->ee_id == GSI_EE_MODEM && data->toward_ipa)
+                       ipa->modem_tx_count++;
        }
 
        if (!ipa_filter_map_valid(ipa, filter_map))