net: ipa: sequencer type is for TX endpoints only

We only program the sequencer type for TX endpoints.  So move the
definition of the sequencer type fields into the TX-specific portion
of the endpoint configuration data.  There's no need to maintain
this in the IPA structure; we can extract it from the configuration
data it points to in the one spot it's needed.

We previously specified the sequencer type for RX endpoints with
INVALID values.  These are no longer needed, so get rid of them.

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-sc7180.c b/drivers/net/ipa/ipa_data-sc7180.c
index fd2265d032cc89db82b07b9ab2e058d454f9e5e0..621ad15c9e67d890d7a232beee47656133fb1e2b 100644 (file)
--- a/drivers/net/ipa/ipa_data-sc7180.c
+++ b/drivers/net/ipa/ipa_data-sc7180.c
@@ -31,11 +31,13 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = {
                        .tlv_count      = 20,
                },
                .endpoint = {
-                       .seq_type       = IPA_SEQ_DMA,
                        .config = {
                                .resource_group = 0,
                                .dma_mode       = true,
                                .dma_endpoint   = IPA_ENDPOINT_AP_LAN_RX,
+                               .tx = {
+                                       .seq_type = IPA_SEQ_DMA,
+                               },
                        },
                },
        },
@@ -50,8 +52,6 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = {
                        .tlv_count      = 6,
                },
                .endpoint = {
-                       .seq_type       = IPA_SEQ_INVALID,
-                       .seq_rep_type   = IPA_SEQ_REP_INVALID,
                        .config = {
                                .resource_group = 0,
                                .aggregation    = true,
@@ -74,14 +74,14 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = {
                },
                .endpoint = {
                        .filter_support = true,
-                       .seq_type       = IPA_SEQ_1_PASS_SKIP_LAST_UC,
-                       .seq_rep_type   = IPA_SEQ_REP_DMA_PARSER,
                        .config = {
                                .resource_group = 0,
                                .checksum       = true,
                                .qmap           = true,
                                .status_enable  = true,
                                .tx = {
+                                       .seq_type = IPA_SEQ_1_PASS_SKIP_LAST_UC,
+                                       .seq_rep_type = IPA_SEQ_REP_DMA_PARSER,
                                        .status_endpoint =
                                                IPA_ENDPOINT_MODEM_AP_RX,
                                },
@@ -99,8 +99,6 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = {
                        .tlv_count      = 6,
                },
                .endpoint = {
-                       .seq_type       = IPA_SEQ_INVALID,
-                       .seq_rep_type   = IPA_SEQ_REP_INVALID,
                        .config = {
                                .resource_group = 0,
                                .checksum       = true,

diff --git a/drivers/net/ipa/ipa_data-sdm845.c b/drivers/net/ipa/ipa_data-sdm845.c
index 7f7625cd96b0df5f84e7d53a16367a2aad86aff2..6b5173f4744448364326a49bf3a3a6da7596bd75 100644 (file)
--- a/drivers/net/ipa/ipa_data-sdm845.c
+++ b/drivers/net/ipa/ipa_data-sdm845.c
@@ -36,11 +36,13 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = {
                        .tlv_count      = 20,
                },
                .endpoint = {
-                       .seq_type       = IPA_SEQ_DMA,
                        .config = {
                                .resource_group = 1,
                                .dma_mode       = true,
                                .dma_endpoint   = IPA_ENDPOINT_AP_LAN_RX,
+                               .tx = {
+                                       .seq_type = IPA_SEQ_DMA,
+                               },
                        },
                },
        },
@@ -55,8 +57,6 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = {
                        .tlv_count      = 8,
                },
                .endpoint = {
-                       .seq_type       = IPA_SEQ_INVALID,
-                       .seq_rep_type   = IPA_SEQ_REP_INVALID,
                        .config = {
                                .resource_group = 1,
                                .aggregation    = true,
@@ -79,13 +79,13 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = {
                },
                .endpoint = {
                        .filter_support = true,
-                       .seq_type       = IPA_SEQ_2_PASS_SKIP_LAST_UC,
                        .config = {
                                .resource_group = 1,
                                .checksum       = true,
                                .qmap           = true,
                                .status_enable  = true,
                                .tx = {
+                                       .seq_type = IPA_SEQ_2_PASS_SKIP_LAST_UC,
                                        .status_endpoint =
                                                IPA_ENDPOINT_MODEM_AP_RX,
                                },
@@ -103,8 +103,6 @@ static const struct ipa_gsi_endpoint_data ipa_gsi_endpoint_data[] = {
                        .tlv_count      = 8,
                },
                .endpoint = {
-                       .seq_type       = IPA_SEQ_INVALID,
-                       .seq_rep_type   = IPA_SEQ_REP_INVALID,
                        .config = {
                                .resource_group = 1,
                                .checksum       = true,

diff --git a/drivers/net/ipa/ipa_data.h b/drivers/net/ipa/ipa_data.h
index 8808941f44afa9ee0dfef42688367b592ee98ff9..caf9b3f9577eb44cc8872cf3b3717ada7b18bc36 100644 (file)
--- a/drivers/net/ipa/ipa_data.h
+++ b/drivers/net/ipa/ipa_data.h
@@ -97,12 +97,16 @@ struct gsi_channel_data {
 
 /**
  * struct ipa_endpoint_tx_data - configuration data for TX endpoints
+ * @seq_type:          primary packet processing sequencer type
+ * @seq_rep_type:      sequencer type for replication processing
  * @status_endpoint:   endpoint to which status elements are sent
  *
  * The @status_endpoint is only valid if the endpoint's @status_enable
  * flag is set.
  */
 struct ipa_endpoint_tx_data {
+       enum ipa_seq_type seq_type;
+       enum ipa_seq_rep_type seq_rep_type;
        enum ipa_endpoint_name status_endpoint;
 };
 
@@ -154,8 +158,6 @@ struct ipa_endpoint_config_data {
 /**
  * struct ipa_endpoint_data - IPA endpoint configuration data
  * @filter_support:    whether endpoint supports filtering
- * @seq_type:          primary packet processing sequencer type
- * @seq_rep_type:      sequencer type for replication processing
  * @config:            hardware configuration (see above)
  *
  * Not all endpoints support the IPA filtering capability.  A filter table
@@ -165,15 +167,10 @@ struct ipa_endpoint_config_data {
  * in the system, and indicate whether they support filtering.
  *
  * The remaining endpoint configuration data applies only to AP endpoints.
- * The IPA hardware is implemented by sequencers, and the AP must program
- * the type(s) of these sequencers at initialization time.  The remaining
- * endpoint configuration data is defined above.
  */
 struct ipa_endpoint_data {
        bool filter_support;
-       /* The next three are specified only for AP endpoints */
-       enum ipa_seq_type seq_type;
-       enum ipa_seq_rep_type seq_rep_type;
+       /* Everything else is specified only for AP endpoints */
        struct ipa_endpoint_config_data config;
 };
 

diff --git a/drivers/net/ipa/ipa_endpoint.c b/drivers/net/ipa/ipa_endpoint.c
index aab66bc4f2563e97da493197166db74b3d450e5a..88310d35855749ab4f0fe7a892467e3dda384ca9 100644 (file)
--- a/drivers/net/ipa/ipa_endpoint.c
+++ b/drivers/net/ipa/ipa_endpoint.c
@@ -890,10 +890,11 @@ static void ipa_endpoint_init_seq(struct ipa_endpoint *endpoint)
                return;         /* Register not valid for RX endpoints */
 
        /* Low-order byte configures primary packet processing */
-       val |= u32_encode_bits(endpoint->seq_type, SEQ_TYPE_FMASK);
+       val |= u32_encode_bits(endpoint->data->tx.seq_type, SEQ_TYPE_FMASK);
 
        /* Second byte configures replicated packet processing */
-       val |= u32_encode_bits(endpoint->seq_rep_type, SEQ_REP_TYPE_FMASK);
+       val |= u32_encode_bits(endpoint->data->tx.seq_rep_type,
+                              SEQ_REP_TYPE_FMASK);
 
        iowrite32(val, endpoint->ipa->reg_virt + offset);
 }
@@ -1764,8 +1765,6 @@ static void ipa_endpoint_init_one(struct ipa *ipa, enum ipa_endpoint_name name,
 
        endpoint->ipa = ipa;
        endpoint->ee_id = data->ee_id;
-       endpoint->seq_type = data->endpoint.seq_type;
-       endpoint->seq_rep_type = data->endpoint.seq_rep_type;
        endpoint->channel_id = data->channel_id;
        endpoint->endpoint_id = data->endpoint_id;
        endpoint->toward_ipa = data->toward_ipa;

diff --git a/drivers/net/ipa/ipa_endpoint.h b/drivers/net/ipa/ipa_endpoint.h
index c48f5324f83ccec3a9a4d407ebaf074aa1f330a0..c6c55ea35394f7d22b0ab2fd7c10cb3309684b4b 100644 (file)
--- a/drivers/net/ipa/ipa_endpoint.h
+++ b/drivers/net/ipa/ipa_endpoint.h
@@ -46,8 +46,6 @@ enum ipa_endpoint_name {
  */
 struct ipa_endpoint {
        struct ipa *ipa;
-       enum ipa_seq_type seq_type;
-       enum ipa_seq_rep_type seq_rep_type;
        enum gsi_ee_id ee_id;
        u32 channel_id;
        u32 endpoint_id;

diff --git a/drivers/net/ipa/ipa_reg.h b/drivers/net/ipa/ipa_reg.h
index a7ea11a5d225946e1ef646e1cfbf5127c2f6da1c..36fe746575f6ba7cfdc830856db0525a2aec4f4a 100644 (file)
--- a/drivers/net/ipa/ipa_reg.h
+++ b/drivers/net/ipa/ipa_reg.h
@@ -602,7 +602,6 @@ enum ipa_seq_type {
        IPA_SEQ_1_PASS_SKIP_LAST_UC             = 0x06,
        IPA_SEQ_2_PASS                          = 0x0a,
        IPA_SEQ_3_PASS_SKIP_LAST_UC             = 0x0c,
-       IPA_SEQ_INVALID                         = 0x0c,
 };
 
 /**
@@ -615,7 +614,6 @@ enum ipa_seq_type {
  */
 enum ipa_seq_rep_type {
        IPA_SEQ_REP_DMA_PARSER                  = 0x08,
-       IPA_SEQ_REP_INVALID                     = 0x0c,
 };
 
 #define IPA_REG_ENDP_STATUS_N_OFFSET(ep) \