net: ipa: don't define endpoints unnecessarily

We don't typically need much information about modem endpoints.
Normally we need to specify information about modem endpoints in
configuration data in only two cases:
  - When a modem TX endpoint supports filtering
  - When another endpoint's configuration refers to it

For the first case, the AP initializes the filter table, and must
know how many endpoints (AP and modem) support filtering.  An
example of the second case is the AP->modem TX endpoint, which
defines the modem<-AP RX endpoint as its status endpoint.

There is one exception to this, and it's due to a hardware quirk.
For IPA v4.2 (only) there is a problem related to allocating GSI
channels.  And to work around this, the AP allocates *all* GSI
channels at startup time--including those used by the modem.

Get rid of the configuration information for two endpoints not
required for the SDM845.  SC7180 runs IPA v4.2, so we can't
eliminate any modem endpoint definitions there.

Two more minor changes:
  - Reorder the members defined for the ipa_endpoint_name enumerated
    type to match the order used in configuration data files when
    defining endpoints.
  - Add a new name, IPA_ENDPOINT_MODEM_DL_NLO_TX, which can be used
    for IPA v4.5+.

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

diff --git a/drivers/net/ipa/ipa_data-sdm845.c b/drivers/net/ipa/ipa_data-sdm845.c
index 49a18b1047c583bbae3324a89ec4a124271b4c29..ed0bfe0634d98d0dd11f5eb3715e5e31b0cce84a 100644 (file)
--- a/drivers/net/ipa/ipa_data-sdm845.c
+++ b/drivers/net/ipa/ipa_data-sdm845.c
@@ -144,12 +144,6 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = {
                        },
                },
        },
-       [IPA_ENDPOINT_MODEM_COMMAND_TX] = {
-               .ee_id          = GSI_EE_MODEM,
-               .channel_id     = 1,
-               .endpoint_id    = 4,
-               .toward_ipa     = true,
-       },
        [IPA_ENDPOINT_MODEM_LAN_TX] = {
                .ee_id          = GSI_EE_MODEM,
                .channel_id     = 0,
@@ -159,12 +153,6 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = {
                        .filter_support = true,
                },
        },
-       [IPA_ENDPOINT_MODEM_LAN_RX] = {
-               .ee_id          = GSI_EE_MODEM,
-               .channel_id     = 3,
-               .endpoint_id    = 13,
-               .toward_ipa     = false,
-       },
        [IPA_ENDPOINT_MODEM_AP_TX] = {
                .ee_id          = GSI_EE_MODEM,
                .channel_id     = 4,

diff --git a/drivers/net/ipa/ipa_endpoint.h b/drivers/net/ipa/ipa_endpoint.h
index 0d410b050456254c8284223a4214969f91d63787..f034a9e6ef2156ccf9d2489a93d3197626d6a80b 100644 (file)
--- a/drivers/net/ipa/ipa_endpoint.h
+++ b/drivers/net/ipa/ipa_endpoint.h
@@ -25,15 +25,16 @@ struct ipa_gsi_endpoint_data;
 #define IPA_MTU                        ETH_DATA_LEN
 
 enum ipa_endpoint_name {
-       IPA_ENDPOINT_AP_MODEM_TX,
-       IPA_ENDPOINT_MODEM_LAN_TX,
-       IPA_ENDPOINT_MODEM_COMMAND_TX,
        IPA_ENDPOINT_AP_COMMAND_TX,
-       IPA_ENDPOINT_MODEM_AP_TX,
        IPA_ENDPOINT_AP_LAN_RX,
+       IPA_ENDPOINT_AP_MODEM_TX,
        IPA_ENDPOINT_AP_MODEM_RX,
-       IPA_ENDPOINT_MODEM_AP_RX,
+       IPA_ENDPOINT_MODEM_COMMAND_TX,
+       IPA_ENDPOINT_MODEM_LAN_TX,
        IPA_ENDPOINT_MODEM_LAN_RX,
+       IPA_ENDPOINT_MODEM_AP_TX,
+       IPA_ENDPOINT_MODEM_AP_RX,
+       IPA_ENDPOINT_MODEM_DL_NLO_TX,
        IPA_ENDPOINT_COUNT,     /* Number of names (not an index) */
 };