net: ipa: reduce IPA version assumptions

Modify conditional tests throughout the IPA code so they do not
assume that IPA v3.5.1 is the oldest version supported.  Also remove
assumptions that IPA v4.5 is the newest version of IPA supported.

Augment versions in comments with "+", to be clearer that the
comment applies to a version and subsequent versions.  (E.g.,
"present for IPA v4.2+" instead of just "present for v4.2".)

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

diff --git a/drivers/net/ipa/gsi.c b/drivers/net/ipa/gsi.c
index b6355827bf900c1d843d65e6b0988e22fbd9dfc3..7f2a8fce5e0dbf8528f87950d44485bd03d49d3d 100644 (file)
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -827,14 +827,14 @@ static void gsi_channel_program(struct gsi_channel *channel, bool doorbell)
 
        /* Max prefetch is 1 segment (do not set MAX_PREFETCH_FMASK) */
 
-       /* We enable the doorbell engine for IPA v3.5.1 */
-       if (gsi->version == IPA_VERSION_3_5_1 && doorbell)
+       /* No need to use the doorbell engine starting at IPA v4.0 */
+       if (gsi->version < IPA_VERSION_4_0 && doorbell)
                val |= USE_DB_ENG_FMASK;
 
        /* v4.0 introduces an escape buffer for prefetch.  We use it
         * on all but the AP command channel.
         */
-       if (gsi->version != IPA_VERSION_3_5_1 && !channel->command) {
+       if (gsi->version >= IPA_VERSION_4_0 && !channel->command) {
                /* If not otherwise set, prefetch buffers are used */
                if (gsi->version < IPA_VERSION_4_5)
                        val |= USE_ESCAPE_BUF_ONLY_FMASK;
@@ -973,7 +973,7 @@ void gsi_channel_reset(struct gsi *gsi, u32 channel_id, bool doorbell)
 
        gsi_channel_reset_command(channel);
        /* Due to a hardware quirk we may need to reset RX channels twice. */
-       if (gsi->version == IPA_VERSION_3_5_1 && !channel->toward_ipa)
+       if (gsi->version < IPA_VERSION_4_0 && !channel->toward_ipa)
                gsi_channel_reset_command(channel);
 
        gsi_channel_program(channel, doorbell);

diff --git a/drivers/net/ipa/ipa_cmd.c b/drivers/net/ipa/ipa_cmd.c
index 35e35852c25c50422a9bdb164a4585eb8d5ffeba..a0be25f1f4427ca84b93a6da55617a2aab5445b4 100644 (file)
--- a/drivers/net/ipa/ipa_cmd.c
+++ b/drivers/net/ipa/ipa_cmd.c
@@ -71,13 +71,12 @@ struct ipa_cmd_hw_hdr_init_local {
 
 /* IPA_CMD_REGISTER_WRITE */
 
-/* For IPA v4.0+, this opcode gets modified with pipeline clear options */
-
+/* For IPA v4.0+, the pipeline clear options are encoded in the opcode */
 #define REGISTER_WRITE_OPCODE_SKIP_CLEAR_FMASK         GENMASK(8, 8)
 #define REGISTER_WRITE_OPCODE_CLEAR_OPTION_FMASK       GENMASK(10, 9)
 
 struct ipa_cmd_register_write {
-       __le16 flags;           /* Unused/reserved for IPA v3.5.1 */
+       __le16 flags;           /* Unused/reserved prior to IPA v4.0 */
        __le16 offset;
        __le32 value;
        __le32 value_mask;
@@ -85,12 +84,12 @@ struct ipa_cmd_register_write {
 };
 
 /* Field masks for ipa_cmd_register_write structure fields */
-/* The next field is present for IPA v4.0 and above */
+/* The next field is present for IPA v4.0+ */
 #define REGISTER_WRITE_FLAGS_OFFSET_HIGH_FMASK         GENMASK(14, 11)
-/* The next field is present for IPA v3.5.1 only */
+/* The next field is not present for IPA v4.0+ */
 #define REGISTER_WRITE_FLAGS_SKIP_CLEAR_FMASK          GENMASK(15, 15)
 
-/* The next field and its values are present for IPA v3.5.1 only */
+/* The next field and its values are not present for IPA v4.0+ */
 #define REGISTER_WRITE_CLEAR_OPTIONS_FMASK             GENMASK(1, 0)
 
 /* IPA_CMD_IP_PACKET_INIT */
@@ -123,7 +122,7 @@ struct ipa_cmd_hw_dma_mem_mem {
 
 /* Field masks for ipa_cmd_hw_dma_mem_mem structure fields */
 #define DMA_SHARED_MEM_FLAGS_DIRECTION_FMASK           GENMASK(0, 0)
-/* The next two fields are present for IPA v3.5.1 only. */
+/* The next two fields are not present for IPA v4.0+ */
 #define DMA_SHARED_MEM_FLAGS_SKIP_CLEAR_FMASK          GENMASK(1, 1)
 #define DMA_SHARED_MEM_FLAGS_CLEAR_OPTIONS_FMASK       GENMASK(3, 2)
 
@@ -237,11 +236,12 @@ static bool ipa_cmd_register_write_offset_valid(struct ipa *ipa,
        u32 bit_count;
 
        /* The maximum offset in a register_write immediate command depends
-        * on the version of IPA.  IPA v3.5.1 supports a 16 bit offset, but
-        * newer versions allow some additional high-order bits.
+        * on the version of IPA.  A 16 bit offset is always supported,
+        * but starting with IPA v4.0 some additional high-order bits are
+        * allowed.
         */
        bit_count = BITS_PER_BYTE * sizeof(payload->offset);
-       if (ipa->version != IPA_VERSION_3_5_1)
+       if (ipa->version >= IPA_VERSION_4_0)
                bit_count += hweight32(REGISTER_WRITE_FLAGS_OFFSET_HIGH_FMASK);
        BUILD_BUG_ON(bit_count > 32);
        offset_max = ~0U >> (32 - bit_count);
@@ -440,7 +440,11 @@ void ipa_cmd_register_write_add(struct gsi_trans *trans, u32 offset, u32 value,
        /* pipeline_clear_src_grp is not used */
        clear_option = clear_full ? pipeline_clear_full : pipeline_clear_hps;
 
-       if (ipa->version != IPA_VERSION_3_5_1) {
+       /* IPA v4.0+ represents the pipeline clear options in the opcode.  It
+        * also supports a larger offset by encoding additional high-order
+        * bits in the payload flags field.
+        */
+       if (ipa->version >= IPA_VERSION_4_0) {
                u16 offset_high;
                u32 val;
 

diff --git a/drivers/net/ipa/ipa_endpoint.c b/drivers/net/ipa/ipa_endpoint.c
index 88310d35855749ab4f0fe7a892467e3dda384ca9..5f93bd60c7586b3d0a3655ad5ceb812309a66857 100644 (file)
--- a/drivers/net/ipa/ipa_endpoint.c
+++ b/drivers/net/ipa/ipa_endpoint.c
@@ -266,7 +266,7 @@ ipa_endpoint_init_ctrl(struct ipa_endpoint *endpoint, bool suspend_delay)
         * if (endpoint->toward_ipa)
         *      assert(ipa->version != IPA_VERSION_4.2);
         * else
-        *      assert(ipa->version == IPA_VERSION_3_5_1);
+        *      assert(ipa->version < IPA_VERSION_4_0);
         */
        mask = endpoint->toward_ipa ? ENDP_DELAY_FMASK : ENDP_SUSPEND_FMASK;
 
@@ -347,7 +347,7 @@ ipa_endpoint_program_suspend(struct ipa_endpoint *endpoint, bool enable)
 {
        bool suspended;
 
-       if (endpoint->ipa->version != IPA_VERSION_3_5_1)
+       if (endpoint->ipa->version >= IPA_VERSION_4_0)
                return enable;  /* For IPA v4.0+, no change made */
 
        /* assert(!endpoint->toward_ipa); */
@@ -515,7 +515,7 @@ static void ipa_endpoint_init_hdr(struct ipa_endpoint *endpoint)
                        /* Where IPA will write the length */
                        offset = offsetof(struct rmnet_map_header, pkt_len);
                        /* Upper bits are stored in HDR_EXT with IPA v4.5 */
-                       if (version == IPA_VERSION_4_5)
+                       if (version >= IPA_VERSION_4_5)
                                offset &= field_mask(HDR_OFST_PKT_SIZE_FMASK);
 
                        val |= HDR_OFST_PKT_SIZE_VALID_FMASK;
@@ -562,7 +562,7 @@ static void ipa_endpoint_init_hdr_ext(struct ipa_endpoint *endpoint)
        /* IPA v4.5 adds some most-significant bits to a few fields,
         * two of which are defined in the HDR (not HDR_EXT) register.
         */
-       if (ipa->version == IPA_VERSION_4_5) {
+       if (ipa->version >= IPA_VERSION_4_5) {
                /* HDR_TOTAL_LEN_OR_PAD_OFFSET is 0, so MSB is 0 */
                if (endpoint->data->qmap && !endpoint->toward_ipa) {
                        u32 offset;
@@ -776,7 +776,7 @@ static u32 hol_block_timer_val(struct ipa *ipa, u32 microseconds)
        if (!microseconds)
                return 0;       /* Nothing to compute if timer period is 0 */
 
-       if (ipa->version == IPA_VERSION_4_5)
+       if (ipa->version >= IPA_VERSION_4_5)
                return hol_block_timer_qtime_val(ipa, microseconds);
 
        /* Use 64 bit arithmetic to avoid overflow... */
@@ -1468,8 +1468,7 @@ static void ipa_endpoint_reset(struct ipa_endpoint *endpoint)
         * is active, we need to handle things specially to recover.
         * All other cases just need to reset the underlying GSI channel.
         */
-       special = ipa->version == IPA_VERSION_3_5_1 &&
-                       !endpoint->toward_ipa &&
+       special = ipa->version < IPA_VERSION_4_0 && !endpoint->toward_ipa &&
                        endpoint->data->aggregation;
        if (special && ipa_endpoint_aggr_active(endpoint))
                ret = ipa_endpoint_reset_rx_aggr(endpoint);
@@ -1567,8 +1566,10 @@ void ipa_endpoint_suspend_one(struct ipa_endpoint *endpoint)
                (void)ipa_endpoint_program_suspend(endpoint, true);
        }
 
-       /* IPA v3.5.1 doesn't use channel stop for suspend */
-       stop_channel = endpoint->ipa->version != IPA_VERSION_3_5_1;
+       /* Starting with IPA v4.0, endpoints are suspended by stopping the
+        * underlying GSI channel rather than using endpoint suspend mode.
+        */
+       stop_channel = endpoint->ipa->version >= IPA_VERSION_4_0;
        ret = gsi_channel_suspend(gsi, endpoint->channel_id, stop_channel);
        if (ret)
                dev_err(dev, "error %d suspending channel %u\n", ret,
@@ -1588,8 +1589,10 @@ void ipa_endpoint_resume_one(struct ipa_endpoint *endpoint)
        if (!endpoint->toward_ipa)
                (void)ipa_endpoint_program_suspend(endpoint, false);
 
-       /* IPA v3.5.1 doesn't use channel start for resume */
-       start_channel = endpoint->ipa->version != IPA_VERSION_3_5_1;
+       /* Starting with IPA v4.0, the underlying GSI channel must be
+        * restarted for resume.
+        */
+       start_channel = endpoint->ipa->version >= IPA_VERSION_4_0;
        ret = gsi_channel_resume(gsi, endpoint->channel_id, start_channel);
        if (ret)
                dev_err(dev, "error %d resuming channel %u\n", ret,

diff --git a/drivers/net/ipa/ipa_main.c b/drivers/net/ipa/ipa_main.c
index 64b92dfdd3f5cb4f35fb8de3d3e92e26adb77c1b..62d82d48aed695e12066d5d7b6553dbb2d82e1b1 100644 (file)
--- a/drivers/net/ipa/ipa_main.c
+++ b/drivers/net/ipa/ipa_main.c
@@ -227,8 +227,8 @@ static void ipa_hardware_config_comp(struct ipa *ipa)
 {
        u32 val;
 
-       /* Nothing to configure for IPA v3.5.1 */
-       if (ipa->version == IPA_VERSION_3_5_1)
+       /* Nothing to configure prior to IPA v4.0 */
+       if (ipa->version < IPA_VERSION_4_0)
                return;
 
        val = ioread32(ipa->reg_virt + IPA_REG_COMP_CFG_OFFSET);
@@ -388,7 +388,7 @@ static void ipa_hardware_config(struct ipa *ipa, const struct ipa_data *data)
        }
 
        /* Implement some hardware workarounds */
-       if (version != IPA_VERSION_3_5_1 && version < IPA_VERSION_4_5) {
+       if (version >= IPA_VERSION_4_0 && version < IPA_VERSION_4_5) {
                /* Enable open global clocks (not needed for IPA v4.5) */
                val = GLOBAL_FMASK;
                val |= GLOBAL_2X_CLK_FMASK;

diff --git a/drivers/net/ipa/ipa_qmi.c b/drivers/net/ipa/ipa_qmi.c
index af8666b89b3759490a7d04039d9fdd22992cdb45..7b833e92a0ac76355dd1bb433218f3e3e858ffbe 100644 (file)
--- a/drivers/net/ipa/ipa_qmi.c
+++ b/drivers/net/ipa/ipa_qmi.c
@@ -377,7 +377,7 @@ init_modem_driver_req(struct ipa_qmi *ipa_qmi)
 
        /* None of the stats fields are valid (IPA v4.0 and above) */
 
-       if (ipa->version != IPA_VERSION_3_5_1) {
+       if (ipa->version >= IPA_VERSION_4_0) {
                mem = &ipa->mem[IPA_MEM_STATS_QUOTA_MODEM];
                if (mem->size) {
                        req.hw_stats_quota_base_addr_valid = 1;