net: ipa: expand GSI channel types

IPA v4.5 (GSI v2.5) supports a larger set of channel protocols, and
adds an additional field to hold the most-significant bits of the
protocol identifier on a channel.

Add an inline function that encodes the protocol (including the
extra bits for newer versions of IPA), and define some additional
protocols.  At this point we still use only GPI protocol.

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 6f146288f9e416e93e7b7b3d835f4d987bb04b56..585574af36ecd3c17de692d774125fb11e96c955 100644 (file)
--- a/drivers/net/ipa/gsi.c
+++ b/drivers/net/ipa/gsi.c
@@ -801,7 +801,7 @@ static void gsi_channel_program(struct gsi_channel *channel, bool doorbell)
        channel->tre_ring.index = 0;
 
        /* We program all channels as GPI type/protocol */
-       val = u32_encode_bits(GSI_CHANNEL_TYPE_GPI, CHTYPE_PROTOCOL_FMASK);
+       val = chtype_protocol_encoded(gsi->version, GSI_CHANNEL_TYPE_GPI);
        if (channel->toward_ipa)
                val |= CHTYPE_DIR_FMASK;
        val |= u32_encode_bits(channel->evt_ring_id, ERINDEX_FMASK);

diff --git a/drivers/net/ipa/gsi_reg.h b/drivers/net/ipa/gsi_reg.h
index d964015a4409f284e3d8afb4a587940d51360ab5..b4ac0258d6e1088a4ee15225c6a9f904e04cf365 100644 (file)
--- a/drivers/net/ipa/gsi_reg.h
+++ b/drivers/net/ipa/gsi_reg.h
@@ -64,6 +64,21 @@
                        (0x0000c01c + 0x1000 * (ee))
 
 /* All other register offsets are relative to gsi->virt */
+
+/** enum gsi_channel_type - CHTYPE_PROTOCOL field values in CH_C_CNTXT_0 */
+enum gsi_channel_type {
+       GSI_CHANNEL_TYPE_MHI                    = 0x0,
+       GSI_CHANNEL_TYPE_XHCI                   = 0x1,
+       GSI_CHANNEL_TYPE_GPI                    = 0x2,
+       GSI_CHANNEL_TYPE_XDCI                   = 0x3,
+       GSI_CHANNEL_TYPE_WDI2                   = 0x4,
+       GSI_CHANNEL_TYPE_GCI                    = 0x5,
+       GSI_CHANNEL_TYPE_WDI3                   = 0x6,
+       GSI_CHANNEL_TYPE_MHIP                   = 0x7,
+       GSI_CHANNEL_TYPE_AQC                    = 0x8,
+       GSI_CHANNEL_TYPE_11AD                   = 0x9,
+};
+
 #define GSI_CH_C_CNTXT_0_OFFSET(ch) \
                GSI_EE_N_CH_C_CNTXT_0_OFFSET((ch), GSI_EE_AP)
 #define GSI_EE_N_CH_C_CNTXT_0_OFFSET(ch, ee) \
@@ -78,13 +93,22 @@
 #define CHSTATE_FMASK                  GENMASK(23, 20)
 #define ELEMENT_SIZE_FMASK             GENMASK(31, 24)
 
-/** enum gsi_channel_type - CHTYPE_PROTOCOL field values in CH_C_CNTXT_0 */
-enum gsi_channel_type {
-       GSI_CHANNEL_TYPE_MHI                    = 0x0,
-       GSI_CHANNEL_TYPE_XHCI                   = 0x1,
-       GSI_CHANNEL_TYPE_GPI                    = 0x2,
-       GSI_CHANNEL_TYPE_XDCI                   = 0x3,
-};
+/* Encoded value for CH_C_CNTXT_0 register channel protocol fields */
+static inline u32
+chtype_protocol_encoded(enum ipa_version version, enum gsi_channel_type type)
+{
+       u32 val;
+
+       val = u32_encode_bits(type, CHTYPE_PROTOCOL_FMASK);
+       if (version < IPA_VERSION_4_5)
+               return val;
+
+       /* Encode upper bit(s) as well */
+       type >>= hweight32(CHTYPE_PROTOCOL_FMASK);
+       val |= u32_encode_bits(type, CHTYPE_PROTOCOL_MSB_FMASK);
+
+       return val;
+}
 
 #define GSI_CH_C_CNTXT_1_OFFSET(ch) \
                GSI_EE_N_CH_C_CNTXT_1_OFFSET((ch), GSI_EE_AP)