net: ipa: mode register is TX only

The INIT_MODE endpoint configuration register is only valid for TX
endpoints.  Rather than writing a zero to that register for RX
endpoints, avoid writing the register at 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_endpoint.c b/drivers/net/ipa/ipa_endpoint.c
index 89878ac3c789aaa01a930c33a2627a1583dafb20..eab8409a8be98b8b03ceb5fe135a7d29053280b6 100644 (file)
--- a/drivers/net/ipa/ipa_endpoint.c
+++ b/drivers/net/ipa/ipa_endpoint.c
@@ -541,7 +541,7 @@ static void ipa_endpoint_init_mode(struct ipa_endpoint *endpoint)
        u32 offset = IPA_REG_ENDP_INIT_MODE_N_OFFSET(endpoint->endpoint_id);
        u32 val;
 
-       if (endpoint->toward_ipa && endpoint->data->dma_mode) {
+       if (endpoint->data->dma_mode) {
                enum ipa_endpoint_name name = endpoint->data->dma_endpoint;
                u32 dma_endpoint_id;
 
@@ -552,7 +552,7 @@ static void ipa_endpoint_init_mode(struct ipa_endpoint *endpoint)
        } else {
                val = u32_encode_bits(IPA_BASIC, MODE_FMASK);
        }
-       /* Other bitfields unspecified (and 0) */
+       /* All other bits unspecified (and 0) */
 
        iowrite32(val, endpoint->ipa->reg_virt + offset);
 }
@@ -1300,6 +1300,7 @@ static void ipa_endpoint_program(struct ipa_endpoint *endpoint)
                ipa_endpoint_init_aggr(endpoint);
                ipa_endpoint_init_deaggr(endpoint);
                ipa_endpoint_init_seq(endpoint);
+               ipa_endpoint_init_mode(endpoint);
        } else {
                if (endpoint->ipa->version == IPA_VERSION_3_5_1)
                        (void)ipa_endpoint_program_suspend(endpoint, false);
@@ -1309,7 +1310,6 @@ static void ipa_endpoint_program(struct ipa_endpoint *endpoint)
        }
        ipa_endpoint_init_cfg(endpoint);
        ipa_endpoint_init_hdr(endpoint);
-       ipa_endpoint_init_mode(endpoint);
        ipa_endpoint_status(endpoint);
 }